Date: Monday, January 8, 2007 @ 21:04:33
Author: marc
Path: /cvsroot/carob/carob
Modified: GNUmakefile (1.17 -> 1.18) make-includes/libmysequoia.mk (1.1 ->
1.2) make-includes/main.mk (1.4 -> 1.5) test/GNUmakefile (1.34
-> 1.35)
Renamed TEST_LDLIBS to CLIENT_LDLIBS
-------------------------------+
GNUmakefile | 4 ++--
make-includes/libmysequoia.mk | 2 +-
make-includes/main.mk | 2 +-
test/GNUmakefile | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
Index: carob/GNUmakefile
diff -u carob/GNUmakefile:1.17 carob/GNUmakefile:1.18
--- carob/GNUmakefile:1.17 Mon Jan 8 20:55:52 2007
+++ carob/GNUmakefile Mon Jan 8 21:04:33 2007
@@ -144,11 +144,11 @@
# Link a empty executable to our lib
# Useful to detect unresolved symbols in our lib
checklib: ${LIB_CAROB_LIB}
- - ${CXX} ${CXXFLAGS} ${CPPFLAGS} dummymain.cpp $< ${TEST_LDLIBS} -o $@
+ - ${CXX} ${CXXFLAGS} ${CPPFLAGS} dummymain.cpp $< ${CLIENT_LDLIBS} -o $@
ldd ./$<
checkstatic: ${LIB_CAROB_STATIC}
- ${CXX} ${CXXFLAGS} ${CPPFLAGS} dummymain.cpp $< ${LDFLAGS} ${LDLIBS}
${TEST_LDLIBS} -o $@
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} dummymain.cpp $< ${LDFLAGS} ${LDLIBS}
${CLIENT_LDLIBS} -o $@
ldd ./$@
Index: carob/make-includes/libmysequoia.mk
diff -u carob/make-includes/libmysequoia.mk:1.1
carob/make-includes/libmysequoia.mk:1.2
--- carob/make-includes/libmysequoia.mk:1.1 Mon Jan 8 20:57:14 2007
+++ carob/make-includes/libmysequoia.mk Mon Jan 8 21:04:33 2007
@@ -2,5 +2,5 @@
# untested, just an example
CXXFLAGS=-g -DCAROB_LOG4CXX_NAME=LibMySequoia.CarobCommons
-TEST_LDLIBS += -lpthread -llog4cxx
+CLIENT_LDLIBS += -lpthread -llog4cxx
Index: carob/make-includes/main.mk
diff -u carob/make-includes/main.mk:1.4 carob/make-includes/main.mk:1.5
--- carob/make-includes/main.mk:1.4 Mon Jan 8 20:55:52 2007
+++ carob/make-includes/main.mk Mon Jan 8 21:04:33 2007
@@ -15,7 +15,7 @@
# one thread library is needed, check CAROB-117
# provide a default
-TEST_LDLIBS = -lpthread
+CLIENT_LDLIBS = -lpthread
include ${MKINCLUDES}/${COMPILER}-compiler.mk
Index: carob/test/GNUmakefile
diff -u carob/test/GNUmakefile:1.34 carob/test/GNUmakefile:1.35
--- carob/test/GNUmakefile:1.34 Mon Jan 8 20:55:52 2007
+++ carob/test/GNUmakefile Mon Jan 8 21:04:33 2007
@@ -52,11 +52,11 @@
override CPPFLAGS += -I${INCDIR}
-override TEST_LDLIBS += -l${LIB_CPPUNIT}
+override CLIENT_LDLIBS += -l${LIB_CPPUNIT}
# cppunit is sometimes not linked to libdl while using dlopen() & co
ifeq (${OS}, linux)
-override TEST_LDLIBS += -ldl
+override CLIENT_LDLIBS += -ldl
endif
@@ -67,7 +67,7 @@
# Uncomment these 2 lines to use log4cxx instead of internal logger
#CXXFLAGS += -DCAROB_USE_LOG4CXX
-#TEST_LDLIBS += -llog4cxx
+#CLIENT_LDLIBS += -llog4cxx
# to run against a mysql cluster (changes user/pass and requests)
# see 20-Write/TestExecWriteRequest.cpp
@@ -75,14 +75,14 @@
# Do not use LDLIBS here since it is already used for libcarob.so
${EXE}: ${TESTOBJS} CarobTestLauncher.o ${LIB_CAROB_SO}
- ${CXX} ${CXXFLAGS} $^ ${LDFLAGS} ${TEST_LDFLAGS} ${TEST_LDLIBS} -o $@
+ ${CXX} ${CXXFLAGS} $^ ${LDFLAGS} ${TEST_LDFLAGS} ${CLIENT_LDLIBS} -o $@
${LIB_CAROB_SO} ${LIB_CAROB_A}:
${MAKE} -C ${CAROB_ROOT}
# use this when compiling with mingw
static: ${TESTOBJS} CarobTestLauncher.o ${LIB_CAROB_A}
- ${CXX} ${CXXFLAGS} $^ ${LDFLAGS} -lgmp ${LDLIBS} ${TEST_LDLIBS} -o $@
+ ${CXX} ${CXXFLAGS} $^ ${LDFLAGS} -lgmp ${LDLIBS} ${CLIENT_LDLIBS} -o $@
clean:
${RM} ${TESTOBJS} CarobTestLauncher.o ${EXE}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
