- updated LIBS and DEFS variables, making them consistent with
the rest of modules;
- removed predefined CXX and LD variables.
(cherry picked from commit c4b280bd5b5b0cfb8d34ecef296972f2a043791e)
... | ... |
@@ -5,13 +5,11 @@ include ../../Makefile.defs |
5 | 5 |
auto_gen= |
6 | 6 |
NAME=phonenum.so |
7 | 7 |
|
8 |
-CXX=g++ |
|
9 |
-LD=g++ |
|
10 |
-LIB_DIR = /opt/local/lib |
|
8 |
+CXX?=g++ |
|
9 |
+LD?=g++ |
|
11 | 10 |
|
12 |
-LIBS= -L${LIB_DIR} cphonenumber.o -lphonenumber -lgeocoding |
|
13 |
- |
|
14 |
-DEFS+= -I/opt/local/include |
|
11 |
+LIBS+=-L$(LOCALBASE)/lib cphonenumber.o -lphonenumber -lgeocoding |
|
12 |
+DEFS+=-I$(LOCALBASE)/include |
|
15 | 13 |
|
16 | 14 |
CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) |
17 | 15 |
CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing |