diff options
| author | Vasudev Kamath <vasudev@copyninja.info> | 2018-01-08 22:22:59 +0530 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2018-01-08 22:22:59 +0530 |
| commit | f55ecebeead135c2159ea0b89bd1887c789802ca (patch) | |
| tree | e02eb2d4ca58711204fef15a2797c6c51431cff4 | |
| parent | 669eb2471cdc5e51c3401f4d13d513806083637a (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-- | Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -162,17 +162,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 $@" @@ -202,7 +198,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 @@ -213,7 +209,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) |