Date: Tuesday, December 19, 2006 @ 18:42:35
Author: marc
Path: /cvsroot/carob/carob
Modified: GNUmakefile (1.3 -> 1.4)
Extracted "LIBRARIES" from LDFLAGS
-------------+
GNUmakefile | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
Index: carob/GNUmakefile
diff -u carob/GNUmakefile:1.3 carob/GNUmakefile:1.4
--- carob/GNUmakefile:1.3 Tue Dec 19 18:31:09 2006
+++ carob/GNUmakefile Tue Dec 19 18:42:35 2006
@@ -76,13 +76,16 @@
LIB_CAROB_STATIC = lib${LIB_CAROB}.a
# LDFLAGS is not used for _static_ libcarob.a
-# optional LDFLAGS
-LDFLAGS = -lpthread
+
+LIBRARIES = -lgmp -lpthread
# mandatory LDFLAGS
+override LDFLAGS += ${LIBRARIES}
+
override LDFLAGS += -fPIC -shared -Wl,-soname,${LIB_CAROB_LIB}
-# for GMP
-override LDFLAGS += -lgmp
+
+
+
ARFLAGS = rcs
# Uncomment these 2 lines to use log4cxx instead of internal logger
@@ -109,7 +112,7 @@
${LIB_CAROB_STATIC}: ${OBJS}
ar ${ARFLAGS} ${LIB_CAROB_STATIC} ${OBJS}
-clean: clean-lib clean-test clean-doc clean-checks
+clean: clean-lib clean-test clean-doc clean-check
clean-lib:
${RM} ${SRCDIR}/*.o ${LIB_CAROB_LIB} ${LIB_CAROB_LIB_SHORT}
${LIB_CAROB_STATIC}
clean-test:
@@ -143,10 +146,8 @@
- ${CXX} -Iinclude dummymain.cpp $< -o $@
ldd ./$<
-STATIC_DEPS = -lgmp -lpthread
-
checkstatic: ${LIB_CAROB_STATIC}
- ${CXX} -Iinclude ${STATIC_DEPS} dummymain.cpp $< -o $@
+ ${CXX} -Iinclude ${LIBRARIES} dummymain.cpp $< -o $@
ldd $@
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
