diff --git a/mrw/makefile.am b/mrw/makefile.am index 0edc734..3192ccd 100644 --- a/mrw/makefile.am +++ b/mrw/makefile.am @@ -9,6 +9,9 @@ ## @license LGPL, see file COPYING ## ## $Log$ +## Revision 1.20 2005/01/28 11:22:32 marc +## cppunit flags +## ## Revision 1.19 2005/01/07 01:07:39 marc ## added configuration files for test ## @@ -148,58 +151,68 @@ if HAVE_LOG4CXX endif endif auto_test_SOURCES = auto_test.cpp version.cpp -auto_test_CPPFLAGS = -I.. -g3 -auto_test_LDADD = -lmrw -lcppunit +auto_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@ +auto_test_LDFLAGS = @CPPUNIT_LIBS@ +auto_test_LDADD = -lmrw if HAVE_STACKTRACE auto_test_LDADD += -lmrwexcstderr endif smartpointer_test_SOURCES = smartpointer_test.cpp version.cpp -smartpointer_test_CPPFLAGS = -I.. -g3 -smartpointer_test_LDADD = -lmrw -lcppunit +smartpointer_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@ +smartpointer_test_LDFLAGS = @CPPUNIT_LIBS@ +smartpointer_test_LDADD = -lmrw if HAVE_STACKTRACE smartpointer_test_LDADD += -lmrwexcstderr endif exec_test_SOURCES = exec_test.cpp version.cpp -exec_test_CPPFLAGS = -I.. -g3 -exec_test_LDADD = -lmrw -lcppunit +exec_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@ +exec_test_LDFLAGS = @CPPUNIT_LIBS@ +exec_test_LDADD = -lmrw if HAVE_STACKTRACE exec_test_LDADD += -lmrwexcstderr endif stdext_test_SOURCES = stdext_test.cpp version.cpp -stdext_test_CPPFLAGS = -I.. -g3 -stdext_test_LDADD = -lmrw -lcppunit +stdext_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@ +stdext_test_LDFLAGS = @CPPUNIT_LIBS@ +stdext_test_LDADD = -lmrw if HAVE_STACKTRACE stdext_test_LDADD += -lmrwexcstderr endif regexp_test_SOURCES = regexp_test.cpp version.cpp -regexp_test_CPPFLAGS = -I.. -g3 -regexp_test_LDADD = -lmrw -lcppunit +regexp_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@ +regexp_test_LDFLAGS = @CPPUNIT_LIBS@ +regexp_test_LDADD = -lmrw if HAVE_STACKTRACE regexp_test_LDADD += -lmrwexcstderr endif tokenizer_test_SOURCES = tokenizer_test.cpp version.cpp -tokenizer_test_CPPFLAGS = -I.. -g3 -tokenizer_test_LDADD = -lmrw -lcppunit +tokenizer_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@ +tokenizer_test_LDFLAGS = @CPPUNIT_LIBS@ +tokenizer_test_LDADD = -lmrw if HAVE_STACKTRACE tokenizer_test_LDADD += -lmrwexcstderr endif configfile_test_SOURCES = configfile_test.cpp version.cpp -configfile_test_CPPFLAGS = -I.. -g3 -configfile_test_LDADD = -lmrw -lcppunit +configfile_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@ +configfile_test_LDFLAGS = @CPPUNIT_LIBS@ +configfile_test_LDADD = -lmrw if HAVE_STACKTRACE configfile_test_LDADD += -lmrwexcstderr endif if HAVE_STACKTRACE stacktrace_test_SOURCES = stacktrace_test.cpp version.cpp - stacktrace_test_CPPFLAGS = -I.. -g3 - stacktrace_test_LDADD = -lmrw -lcppunit -lmrwexcstderr + stacktrace_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@ + stacktrace_test_LDFLAGS = @CPPUNIT_LIBS@ + stacktrace_test_LDADD = -lmrw -lmrwexcstderr mrwexcstderr_test_SOURCES = mrwexcstderr_test.cpp version.cpp - mrwexcstderr_test_CPPFLAGS = -I.. -g3 - mrwexcstderr_test_LDADD = -lmrwexcstderr -lcppunit + mrwexcstderr_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@ + mrwexcstderr_test_LDFLAGS = @CPPUNIT_LIBS@ + mrwexcstderr_test_LDADD = -lmrwexcstderr if HAVE_LOG4CXX mrwexclog4cxx_test_SOURCES = mrwexclog4cxx_test.cpp version.cpp - mrwexclog4cxx_test_CPPFLAGS = -I.. -g3 - mrwexclog4cxx_test_LDADD = -lmrwexclog4cxx -lcppunit -llog4cxx + mrwexclog4cxx_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@ + mrwexclog4cxx_test_LDFLAGS = @CPPUNIT_LIBS@ + mrwexclog4cxx_test_LDADD = -lmrwexclog4cxx -llog4cxx endif endif EXTRA_DIST = test.dat configfile.ini configfile.ini.result \