From 2e0aec1d9f375805b54ce460b94dde0f9ff04eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Mon, 28 Feb 2005 07:14:58 +0000
Subject: [PATCH] new functiontrace, removed simpletrace

---
 mrw/makefile.am | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/mrw/makefile.am b/mrw/makefile.am
index e184a6d..5627fcf 100644
--- a/mrw/makefile.am
+++ b/mrw/makefile.am
@@ -9,6 +9,9 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## 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
@@ -81,7 +84,7 @@ if HAVE_STACKTRACE
   AM_CPPFLAGS += -DHAVE_STACKTRACE
 endif
 
-CLEANFILES = doxygen.errors
+CLEANFILES = doxygen.errors functiontrace_test.log
 examplesdir = ${pkgdatadir}/examples
 examples_DATA = examples/*
 htmldir = ${pkgdatadir}/doc/html
@@ -104,11 +107,12 @@ endif
 #                    exception.cpp exception.hpp \
 #                    exec.cpp exec.hpp list.hpp \
 #                    map.hpp multimap.hpp multiset.hpp \
-#                    set.hpp simpletrace.hpp \
+#                    set.hpp \
 #                    smartpointer.hpp stdext.cpp stdext.hpp \
 #                    string.hpp unistd.hpp vector.hpp regexp.hpp regexp.cpp \
 #                    tokenizer.hpp configfile.hpp configfile.cpp file.hpp \
-#                    errno.hpp errno.cpp dynamiclibrary.hpp
+#                    errno.hpp errno.cpp dynamiclibrary.hpp \
+#                    functiontrace.cpp functiontrace.hpp
 #else
   libmrw_la_SOURCES = \
                     mrw.hpp version.cpp \
@@ -116,11 +120,14 @@ endif
                     exception.cpp exception.hpp \
                     exec.cpp exec.hpp list.hpp \
                     map.hpp multimap.hpp multiset.hpp \
-                    set.hpp simpletrace.hpp \
+                    set.hpp \
                     smartpointer.hpp stdext.cpp stdext.hpp \
                     string.hpp unistd.hpp vector.hpp regexp.hpp regexp.cpp \
 		    tokenizer.hpp configfile.hpp configfile.cpp file.hpp \
 		    errno.hpp errno.cpp dynamiclibrary.hpp
+if HAVE_LOG4CXX
+  libmrw_la_SOURCES += functiontrace.cpp functiontrace.hpp
+endif
 #endif
 if HAVE_STACKTRACE
 #if TRACER
@@ -132,7 +139,9 @@ if HAVE_STACKTRACE
 #endif
 endif
 libmrw_la_LDFLAGS = -version-info @LIB_VERSION@
+if HAVE_STACKTRACE
 libmrw_la_LIBADD = -lltdl
+endif
 
 #if TRACER
 #  BUILT_SOURCES = ${tmp_src:.cpp=.ii}
@@ -153,6 +162,9 @@ endif
 
 check_PROGRAMS = auto_test smartpointer_test exec_test stdext_test regexp_test \
                  tokenizer_test configfile_test dynamiclibrary_test
+if HAVE_LOG4CXX
+  check_PROGRAMS += functiontrace_test
+endif
 check_SCRIPTS = configfile_check.sh
 if HAVE_STACKTRACE
   check_PROGRAMS += stacktrace_test mrwexcstderr_test
@@ -165,49 +177,49 @@ auto_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 auto_test_LDFLAGS = @CPPUNIT_LIBS@
 auto_test_LDADD = -lmrw
 if HAVE_STACKTRACE
- auto_test_LDADD += -lmrwexcstderr
+  auto_test_LDADD += -lmrwexcstderr
 endif
 smartpointer_test_SOURCES = smartpointer_test.cpp version.cpp
 smartpointer_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 smartpointer_test_LDFLAGS = @CPPUNIT_LIBS@
 smartpointer_test_LDADD = -lmrw
 if HAVE_STACKTRACE
- smartpointer_test_LDADD += -lmrwexcstderr
+  smartpointer_test_LDADD += -lmrwexcstderr
 endif
 exec_test_SOURCES = exec_test.cpp version.cpp
 exec_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 exec_test_LDFLAGS = @CPPUNIT_LIBS@
 exec_test_LDADD = -lmrw
 if HAVE_STACKTRACE
- exec_test_LDADD += -lmrwexcstderr
+  exec_test_LDADD += -lmrwexcstderr
 endif
 stdext_test_SOURCES = stdext_test.cpp version.cpp
 stdext_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 stdext_test_LDFLAGS = @CPPUNIT_LIBS@
 stdext_test_LDADD = -lmrw
 if HAVE_STACKTRACE
- stdext_test_LDADD += -lmrwexcstderr
+  stdext_test_LDADD += -lmrwexcstderr
 endif
 regexp_test_SOURCES = regexp_test.cpp version.cpp
 regexp_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 regexp_test_LDFLAGS = @CPPUNIT_LIBS@
 regexp_test_LDADD = -lmrw
 if HAVE_STACKTRACE
- regexp_test_LDADD += -lmrwexcstderr
+  regexp_test_LDADD += -lmrwexcstderr
 endif
 tokenizer_test_SOURCES = tokenizer_test.cpp version.cpp
 tokenizer_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 tokenizer_test_LDFLAGS = @CPPUNIT_LIBS@
 tokenizer_test_LDADD = -lmrw
 if HAVE_STACKTRACE
- tokenizer_test_LDADD += -lmrwexcstderr
+  tokenizer_test_LDADD += -lmrwexcstderr
 endif
 configfile_test_SOURCES = configfile_test.cpp version.cpp
 configfile_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 configfile_test_LDFLAGS = @CPPUNIT_LIBS@
 configfile_test_LDADD = -lmrw
 if HAVE_STACKTRACE
- configfile_test_LDADD += -lmrwexcstderr
+  configfile_test_LDADD += -lmrwexcstderr
 endif
 check_LTLIBRARIES = libdynamiclibrary_testlib.la
 libdynamiclibrary_testlib_la_SOURCES = dynamiclibrary_testlib.cpp
@@ -216,8 +228,14 @@ dynamiclibrary_test_SOURCES = dynamiclibrary_test.cpp version.cpp
 dynamiclibrary_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 dynamiclibrary_test_LDFLAGS = @CPPUNIT_LIBS@
 dynamiclibrary_test_LDADD = -lmrw -lltdl
+if HAVE_LOG4CXX
+  functiontrace_test_SOURCES = functiontrace_test.cpp version.cpp
+  functiontrace_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
+  functiontrace_test_LDFLAGS = @CPPUNIT_LIBS@
+  functiontrace_test_LDADD = -lmrw -llog4cxx
 if HAVE_STACKTRACE
- dynamiclibrary_test_LDADD += -lmrwexcstderr
+  functiontrace_test_LDADD += -lmrwexcstderr
+endif
 endif
 if HAVE_STACKTRACE
   stacktrace_test_SOURCES = stacktrace_test.cpp version.cpp