summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasudev Kamath <vasudev@copyninja.info>2018-06-03 20:28:56 +0530
committerVasudev Kamath <vasudev@copyninja.info>2018-06-03 20:28:56 +0530
commit310061b6c7305400010f862c6ff5f6cbe94747be (patch)
treeb6db75a93aebc0a756b7b0190f12dfb40cf3d9ac
parent5311b43ef71ce604a492483d6f84e9afcddb0240 (diff)
Drop checking for LIBRE_SO for empty
LIBRE_SO variable holds path for libre.so library. This is not really required for package builds as ld will search system paths for library. This patch might not be suitable for upstream though. Last-Update: 2016-02-08 Gbp-Pq: Name 2001_drop_libre_so_check.patch
-rw-r--r--Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 31e2f4a..a1a9d1e 100644
--- a/Makefile
+++ b/Makefile
@@ -167,17 +167,13 @@ ifeq ($(LIBRE_INC),)
@echo "ERROR: Missing header files for libre. Check LIBRE_INC"
@exit 2
endif
-ifeq ($(LIBRE_SO),)
- @echo "ERROR: Missing library files for libre. Check LIBRE_SO"
- @exit 2
-endif
Makefile: mk/*.mk $(MOD_MK) $(LIBRE_MK)
$(SHARED): $(LIB_OBJS)
@echo " LD $@"
- $(HIDE)$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
+ $(HIDE)$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -lre $(LIBS) -o $@
$(STATICLIB): $(LIB_OBJS)
@echo " AR $@"
@@ -207,7 +203,7 @@ ifneq ($(GPROF),)
$(HIDE)$(LD) $(LFLAGS) $(APP_LFLAGS) $^ ../re/libre.a $(LIBS) -o $@
else
$(HIDE)$(LD) $(LFLAGS) $(APP_LFLAGS) $^ \
- -L$(LIBRE_SO) -lre $(LIBS) -o $@
+ -lre $(LIBS) -o $@
endif
@@ -218,7 +214,7 @@ test: $(TEST_BIN)
$(TEST_BIN): $(STATICLIB) $(TEST_OBJS)
@echo " LD $@"
$(HIDE)$(CXX) $(LFLAGS) $(TEST_OBJS) \
- -L$(LIBRE_SO) -L. \
+ -L. \
-l$(PROJECT) -lre $(LIBS) $(TEST_LIBS) -o $@
$(BUILD)/%.o: %.c $(BUILD) Makefile $(APP_MK)