Date: Thursday, January 4, 2007 @ 17:45:43
Author: marc
Path: /cvsroot/carob/carob/test
Modified: GNUmakefile (1.28 -> 1.29)
Propagated changes from main GNUmakefile: extracted CPPFLAGS and LDLIBS, always
using CXXFLAGS
-------------+
GNUmakefile | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
Index: carob/test/GNUmakefile
diff -u carob/test/GNUmakefile:1.28 carob/test/GNUmakefile:1.29
--- carob/test/GNUmakefile:1.28 Tue Dec 19 17:14:03 2006
+++ carob/test/GNUmakefile Thu Jan 4 17:45:43 2007
@@ -44,18 +44,18 @@
# optional CXXFLAGS
CXXFLAGS = -g3 -Wall
# mandatory CXXFLAGS (gcc)
-override CXXFLAGS += -I${INCDIR}
+override CPPFLAGS += -I${INCDIR}
# optional LDFLAGS
# cppunit is sometimes not linked to libdl while using dlopen() & co
-LDFLAGS = -ldl
+LDLIBS = -ldl
## mandatory LDFLAGS
# for libcarob
override LDFLAGS += -Wl,-rpath,${CAROB_ROOT} -L${CAROB_ROOT}
-l${LIB_CAROB} -rdynamic
# for libcppunit
-override LDFLAGS += -l${LIB_CPPUNIT}
+override LDLIBS += -l${LIB_CPPUNIT}
# For QT ui, uncomment this
#LDFLAGS += -l${LIB_CPPUNIT_QTUI}
@@ -64,21 +64,21 @@
# Uncomment these 2 lines to use log4cxx instead of internal logger
#CXXFLAGS += -DCAROB_USE_LOG4CXX
-#LDFLAGS += -llog4cxx
+#LDLIBS += -llog4cxx
# to run against a mysql cluster (changes user/pass and requests)
# see 20-Write/TestExecWriteRequest.cpp
#CXXFLAGS += -DCAROB_TEST_USE_MYSQL
${EXE}: ${TESTOBJS} CarobTestLauncher.o ${LIB_CAROB_SO}
- ${CXX} $^ ${LDFLAGS} -o $@
+ ${CXX} ${CXXFLAGS} $^ ${LDFLAGS} ${LDLIBS} -o $@
${LIB_CAROB_FILE}:
${MAKE} -C ${CAROB_ROOT}
# use this when compiling with mingw
static: ${TESTOBJS} CarobTestLauncher.o ${LIB_CAROB_A}
- ${CXX} $^ ${LDFLAGS} -o $@
+ ${CXX} ${CXXFLAGS} $^ ${LDFLAGS} ${LDLIBS} -o $@
clean:
${RM} ${TESTOBJS} CarobTestLauncher.o ${EXE}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
