mcatan 2004/04/10 14:50:28
Modified: tests/src Makefile.am
Log:
improved cppunit detection algo
Revision Changes Path
1.6 +5 -3 logging-log4cxx/tests/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am 2 Apr 2004 09:02:22 -0000 1.5
+++ Makefile.am 10 Apr 2004 21:50:28 -0000 1.6
@@ -31,7 +31,9 @@
-Wl,--whole-archive,util/libutil.a,--no-whole-archive\
-Wl,--whole-archive,varia/libvaria.a,--no-whole-archive\
-Wl,--whole-archive,xml/libxml.a,--no-whole-archive\
- -lcppunit -ldl -lboost_regex
+ @LIBS_CPPUNIT@ -lboost_regex
+
+AM_CPPFLAGS = @CPPFLAGS_CPPUNIT@
testsuite_DEPENDENCIES = \
customlogger/libcustomlogger.a\
@@ -53,8 +55,8 @@
shortsocketserver_LDFLAGS = \
-Wl,--whole-archive,util/libutil.a,--no-whole-archive\
-Wl,--whole-archive,xml/libxml.a,--no-whole-archive\
- -lcppunit -ldl
-
+ @LIBS_CPPUNIT@ -lboost_regex
+
shortsocketserver_DEPENDENCIES = \
util/libutil.a\
xml/libxml.a\
