diff --git a/mrw/makefile.am b/mrw/makefile.am
index 6308377..18a8c65 100644
--- a/mrw/makefile.am
+++ b/mrw/makefile.am
@@ -8,103 +8,6 @@
## @copy © Marc Wäckerlin
## @license LGPL, see file COPYING
##
-## $Log$
-## Revision 1.30 2005/04/14 15:56:07 marc
-## phony updated, clean rearranged
-##
-## Revision 1.29 2005/04/10 15:01:28 marc
-## Now, make distcheck works AND the html doc is dirstributed...
-##
-## Revision 1.28 2005/04/07 22:08:59 marc
-## doc/html to EXTRA_DIST
-##
-## Revision 1.27 2005/04/07 21:26:28 marc
-## wrong examplesdir
-##
-## Revision 1.26 2005/04/07 20:58:57 marc
-## Oops, there's a make distcheck...? Now it works.
-## documentation is now generated in root dir, no more in mrw subdir
-## HTML documentation now with stylesheet, footer and header
-## RPM/libtool: .la files with wrong path!
-## New feature: library libmrwlog4cxxconfiguration configures log4cxx
-##
-## Revision 1.25 2005/03/11 23:20:54 marc
-## - removed old TRACER
-## - new autofunctiontrace library, new function trace
-## - new multithreaded targets
-## - corrected build flags for not optimized tests
-##
-## Revision 1.24 2005/02/28 08:10:24 marc
-## dynamic library is conditional
-##
-## Revision 1.23 2005/02/28 07:14:58 marc
-## new functiontrace, removed simpletrace
-##
-## Revision 1.22 2005/02/18 15:51:08 marc
-## new dynamiclibrary.hpp
-## tests are now compiled with option -O0
-##
-## Revision 1.21 2005/02/08 12:34:14 marc
-## added errno / unix_error
-##
-## 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
-##
-## Revision 1.18 2005/01/07 00:57:55 marc
-## the test script was not distributed
-##
-## Revision 1.17 2005/01/07 00:33:51 marc
-## added config file and file
-##
-## Revision 1.16 2004/12/17 16:30:06 marc
-## added tokenizer
-##
-## Revision 1.15 2004/12/14 20:20:06 marc
-## added regexp
-##
-## Revision 1.14 2004/12/08 13:48:20 marc
-## forget TRACE
-##
-## Revision 1.13 2004/11/25 18:33:18 marc
-## support for function tracing which does not yet work (bug in OpenC++)
-##
-## Revision 1.12 2004/10/13 11:17:21 marc
-## new file stdext.cpp
-##
-## Revision 1.11 2004/10/11 18:33:02 marc
-## add stdext.hpp
-##
-## Revision 1.10 2004/10/07 16:16:34 marc
-## forgotten to save before last checkin...
-##
-## Revision 1.9 2004/10/07 09:29:17 marc
-## new classes
-## new versioning
-## link tests with unexpected handler
-## check doxygen.error
-##
-## Revision 1.8 2004/09/09 20:09:06 marc
-## library versioning now works how i want it
-##
-## Revision 1.7 2004/08/31 16:23:57 marc
-## added .PHONY
-##
-## Revision 1.6 2004/08/28 16:21:25 marc
-## mrw-c++-0.92 (mrw)
-## - new file: version.cpp
-## - new file header for all sources
-## - work around warning in mrw::auto
-## - possibility to compile without log4cxx
-## - work around bugs in demangle.h and libiberty.h
-## - corrections in documentation
-## - added simple tracing mechanism
-## - more warnings
-## - small corrections in Auto<>::Free and a new test for it
-## - possibility to compile without stack trace
-##
AM_CPPFLAGS += -I${top_srcdir}
@@ -133,6 +36,14 @@ if HAVE_BOOST_THREAD
lib_LTLIBRARIES += libmrwexcstderr-mt.la
endif
endif
+if AUTOFNTRACE
+ lib_LTLIBRARIES += libmrwautofunctiontracestdlog.la
+if HAVE_THREADS
+if HAVE_BOOST_THREAD
+ lib_LTLIBRARIES += libmrwautofunctiontracestdlog-mt.la
+endif
+endif
+endif
if HAVE_LOG4CXX
lib_LTLIBRARIES += libmrwexclog4cxx.la \
libmrwlog4cxxconfiguration.la
@@ -202,6 +113,24 @@ if HAVE_BOOST_THREAD
endif
endif
+if AUTOFNTRACE
+ libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cpp \
+ version.cpp
+ libmrwautofunctiontracestdlog_la_CXXFLAGS = -w
+ libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_VERSION@
+ libmrwautofunctiontracestdlog_la_LIBADD = ${top_builddir}/mrw/libmrw.la
+if HAVE_THREADS
+if HAVE_BOOST_THREAD
+ libmrwautofunctiontracestdlog_mt_la_SOURCES = \
+ autofunctiontracelog4cxx.cpp version.cpp
+ libmrwautofunctiontracestdlog_mt_la_CXXFLAGS = @THREADS@ -w
+ libmrwautofunctiontracestdlog_mt_la_LDFLAGS = \
+ -version-info @LIB_VERSION@ @THREADS@
+ libmrwautofunctiontracestdlog_mt_la_LIBADD = \
+ ${top_builddir}/mrw/libmrw-mt.la
+endif
+endif
+endif
if HAVE_LOG4CXX
libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cpp version.cpp
libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
@@ -246,7 +175,7 @@ endif
endif
check_PROGRAMS = auto_test smartpointer_test exec_test stdext_test regexp_test \
- tokenizer_test configfile_test
+ tokenizer_test configfile_test string_test
if HAVE_LTDL
check_PROGRAMS += dynamiclibrary_test
endif
@@ -300,6 +229,14 @@ stdext_test_LDADD = ${top_builddir}/mrw/libmrw.la
if HAVE_STACKTRACE
stdext_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
endif
+string_test_SOURCES = string_test.cpp version.cpp
+string_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
+string_test_CXXFLAGS = -g3 -O0
+string_test_LDFLAGS = @CPPUNIT_LIBS@
+string_test_LDADD = ${top_builddir}/mrw/libmrw.la
+if HAVE_STACKTRACE
+ string_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
+endif
regexp_test_SOURCES = regexp_test.cpp version.cpp
regexp_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
regexp_test_CXXFLAGS = -g3 -O0
@@ -406,9 +343,10 @@ ${html_DATA}: doxyfile *.[ch]pp ${deps} style.css head.html foot.html
@test -f ${top_builddir}/doc/html/hintergrund.png || \
cp ~/www/marc/linux/hintergrund.png \
${top_builddir}/doc/html || \
- \( echo "**** sorry, you are missing the html background image" && \
- echo " (after distclean doc/html/hintergrund.png is deleted)" \
- \)
+ ( \
+ echo "**** sorry, you are missing the html background image"; \
+ echo " (after distclean doc/html/hintergrund.png is deleted)" \
+ )
doxygen doxyfile
if PEDANTIC
test \! -s doxygen.errors