blob: 8d06f7edfaccf4add116df3f75129d23a412f463 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
Description: 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.
Author: Vasudev Kamath <vasudev@copyninja.info>
Last-Update: 2016-02-08
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile
+++ b/Makefile
@@ -162,17 +162,13 @@
@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 @@
$(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_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)
|
