Date: Thursday, January 4, 2007 @ 16:41:11
Author: marc
Path: /cvsroot/carob/carob
Modified: GNUmakefile (1.6 -> 1.7)
Replaced LIBRARIES by the more standard LDLIBS
-------------+
GNUmakefile | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
Index: carob/GNUmakefile
diff -u carob/GNUmakefile:1.6 carob/GNUmakefile:1.7
--- carob/GNUmakefile:1.6 Wed Dec 27 16:21:49 2006
+++ carob/GNUmakefile Thu Jan 4 16:41:11 2007
@@ -78,10 +78,9 @@
# LDFLAGS is not used for _static_ libcarob.a
-LIBRARIES = -lgmp -lpthread
+LDLIBS = -lgmp -lpthread
# mandatory LDFLAGS
-override LDFLAGS += ${LIBRARIES}
override LDFLAGS += -fPIC -shared -Wl,-soname,${LIB_CAROB_LIB}
@@ -107,7 +106,7 @@
$(MAKE) -C test
${LIB_CAROB_LIB}: ${OBJS}
- ${CXX} ${OBJS} ${LDFLAGS} -o ${LIB_CAROB_LIB}
+ ${CXX} ${OBJS} ${LDFLAGS} ${LDLIBS} -o ${LIB_CAROB_LIB}
- ${LN} -f ${LIB_CAROB_LIB} ${LIB_CAROB_LIB_SHORT}
${LIB_CAROB_STATIC}: ${OBJS}
@@ -148,7 +147,7 @@
ldd ./$<
checkstatic: ${LIB_CAROB_STATIC}
- ${CXX} -Iinclude ${LIBRARIES} dummymain.cpp $< -o $@
+ ${CXX} -Iinclude ${LDLIBS} dummymain.cpp $< -o $@
ldd $@
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
