Date: Friday, December 1, 2006 @ 15:10:42
Author: gilles
Path: /cvsroot/carob/carob/test
Modified: GNUmakefile (1.24 -> 1.25)
(no change) fixed formatting by replacing tabs by spaces where possible
-------------+
GNUmakefile | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
Index: carob/test/GNUmakefile
diff -u carob/test/GNUmakefile:1.24 carob/test/GNUmakefile:1.25
--- carob/test/GNUmakefile:1.24 Tue Nov 28 17:07:55 2006
+++ carob/test/GNUmakefile Fri Dec 1 15:10:42 2006
@@ -23,17 +23,17 @@
#
# Put an absolute path in here to be able to run from any directory
-CAROB_ROOT = ..
+CAROB_ROOT = ..
-LIB_CAROB = carob
-LIB_CAROB_SO = ${CAROB_ROOT}/lib${LIB_CAROB}.so
-LIB_CAROB_A = ${CAROB_ROOT}/lib${LIB_CAROB}.a
+LIB_CAROB = carob
+LIB_CAROB_SO = ${CAROB_ROOT}/lib${LIB_CAROB}.so.1
+LIB_CAROB_A = ${CAROB_ROOT}/lib${LIB_CAROB}.a
-INCDIR = ${CAROB_ROOT}/include
+INCDIR = ${CAROB_ROOT}/include
-LIB_CPPUNIT = cppunit
-LIB_CPPUNIT_QTUI = qttestrunner
+LIB_CPPUNIT = cppunit
+LIB_CPPUNIT_QTUI = qttestrunner
# TESTSRCS. Please leave one blank line after include
include testslist
@@ -42,20 +42,20 @@
TESTOBJS = ${TESTSRCS:%.cpp=%.o}
# for GCC
-CXXFLAGS = -g3 -Wall -fPIC -I${INCDIR}
-LDFLAGS = -fPIC -Wl,-rpath,${CAROB_ROOT} -L${CAROB_ROOT}
-l${LIB_CAROB} -ldl -l${LIB_CPPUNIT} -rdynamic
+CXXFLAGS = -g3 -Wall -fPIC -I${INCDIR}
+LDFLAGS = -fPIC -Wl,-rpath,${CAROB_ROOT} -L${CAROB_ROOT}
-l${LIB_CAROB} -ldl -l${LIB_CPPUNIT} -rdynamic
# For QT ui, uncomment this
-#LDFLAGS += -l${LIB_CPPUNIT_QTUI}
-EXE = carobTestLauncher
+#LDFLAGS += -l${LIB_CPPUNIT_QTUI}
+EXE = carobTestLauncher
# Uncomment these 2 lines to use log4cxx instead of internal logger
-#CXXFLAGS += -DCAROB_USE_LOG4CXX
-#LDFLAGS += -llog4cxx
+#CXXFLAGS += -DCAROB_USE_LOG4CXX
+#LDFLAGS += -llog4cxx
# to run against a mysql cluster (changes user/pass and requests)
# see 20-Write/TestExecWriteRequest.cpp
-#CXXFLAGS += -DCAROB_TEST_USE_MYSQL
+#CXXFLAGS += -DCAROB_TEST_USE_MYSQL
${EXE}: ${TESTOBJS} CarobTestLauncher.o ${LIB_CAROB_SO}
${CXX} $^ ${LDFLAGS} -o $@
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
