- removed old TRACER
- new autofunctiontrace library, new function trace - new multithreaded targets - corrected build flags for not optimized tests
This commit is contained in:
Marc Wäckerlin
177
mrw/makefile.am
177
mrw/makefile.am
@@ -9,6 +9,12 @@
|
||||
## @license LGPL, see file <a href="license.html">COPYING</a>
|
||||
##
|
||||
## $Log$
|
||||
## 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
|
||||
##
|
||||
@@ -87,7 +93,9 @@ if HAVE_STACKTRACE
|
||||
AM_CPPFLAGS += -DHAVE_STACKTRACE
|
||||
endif
|
||||
|
||||
CLEANFILES = doxygen.errors functiontrace_test.log
|
||||
CLEANFILES = doxygen.errors functiontrace_test.log \
|
||||
mrwautofunctiontracelog4cxx_test.log \
|
||||
mrwautofunctiontracelog4cxx_test-mt.log
|
||||
examplesdir = ${pkgdatadir}/examples
|
||||
examples_DATA = examples/*
|
||||
htmldir = ${pkgdatadir}/doc/html
|
||||
@@ -96,27 +104,34 @@ pdfdir = ${pkgdatadir}/doc/pdf
|
||||
pdf_DATA = doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
|
||||
|
||||
lib_LTLIBRARIES = libmrw.la
|
||||
if HAVE_BOOST_THREAD
|
||||
lib_LTLIBRARIES += libmrw-mt.la
|
||||
endif
|
||||
if HAVE_STACKTRACE
|
||||
lib_LTLIBRARIES += libmrwexcstderr.la
|
||||
if HAVE_THREADS
|
||||
if HAVE_BOOST_THREAD
|
||||
lib_LTLIBRARIES += libmrwexcstderr-mt.la
|
||||
endif
|
||||
endif
|
||||
if HAVE_LOG4CXX
|
||||
lib_LTLIBRARIES += libmrwexclog4cxx.la
|
||||
if HAVE_THREADS
|
||||
if HAVE_BOOST_THREAD
|
||||
lib_LTLIBRARIES += libmrwexclog4cxx-mt.la
|
||||
endif
|
||||
endif
|
||||
if AUTOFNTRACE
|
||||
lib_LTLIBRARIES += libmrwautofunctiontracelog4cxx.la
|
||||
if HAVE_THREADS
|
||||
if HAVE_BOOST_THREAD
|
||||
lib_LTLIBRARIES += libmrwautofunctiontracelog4cxx-mt.la
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
#if TRACER
|
||||
# tmp_src = \
|
||||
# mrw.hpp version.cpp \
|
||||
# arg.cpp arg.hpp auto.hpp deque.hpp \
|
||||
# exception.cpp exception.hpp \
|
||||
# exec.cpp exec.hpp list.hpp \
|
||||
# map.hpp multimap.hpp multiset.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 \
|
||||
# functiontrace.cpp functiontrace.hpp
|
||||
#else
|
||||
libmrw_la_SOURCES = \
|
||||
mrw.hpp version.cpp \
|
||||
arg.cpp arg.hpp auto.hpp deque.hpp \
|
||||
@@ -134,35 +149,69 @@ endif
|
||||
if HAVE_LOG4CXX
|
||||
libmrw_la_SOURCES += functiontrace.cpp functiontrace.hpp
|
||||
endif
|
||||
#endif
|
||||
if HAVE_STACKTRACE
|
||||
#if TRACER
|
||||
# tmp_src += \
|
||||
# stacktrace.hpp stacktrace.cpp
|
||||
#else
|
||||
libmrw_la_SOURCES += \
|
||||
stacktrace.hpp stacktrace.cpp
|
||||
#endif
|
||||
endif
|
||||
libmrw_la_LDFLAGS = -version-info @LIB_VERSION@
|
||||
libmrw_la_LIBADD =
|
||||
if HAVE_STACKTRACE
|
||||
libmrw_la_LIBADD = -lltdl
|
||||
libmrw_la_LIBADD += -lltdl
|
||||
endif
|
||||
|
||||
#if TRACER
|
||||
# BUILT_SOURCES = ${tmp_src:.cpp=.ii}
|
||||
# libmrw_la_SOURCES = ${BUILT_SOURCES}
|
||||
#endif
|
||||
if HAVE_THREADS
|
||||
if HAVE_BOOST_THREAD
|
||||
libmrw_mt_la_SOURCES = ${libmrw_la_SOURCES}
|
||||
libmrw_mt_la_CXXFLAGS = @THREADS@
|
||||
libmrw_mt_la_LDFLAGS = ${libmrw_la_LDFLAGS} @THREADS@
|
||||
libmrw_mt_la_LIBADD = ${libmrw_la_LIBADD} @BOOST_THREAD_LIB@
|
||||
endif
|
||||
endif
|
||||
|
||||
if HAVE_STACKTRACE
|
||||
libmrwexcstderr_la_SOURCES = autostacktracestderr.cpp version.cpp
|
||||
libmrwexcstderr_la_LDFLAGS = -version-info @LIB_VERSION@
|
||||
libmrwexcstderr_la_LIBADD = -lmrw
|
||||
if HAVE_THREADS
|
||||
if HAVE_BOOST_THREAD
|
||||
libmrwexcstderr_mt_la_SOURCES = autostacktracestderr.cpp version.cpp
|
||||
libmrwexcstderr_mt_la_CXXFLAGS = @THREADS@
|
||||
libmrwexcstderr_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@
|
||||
libmrwexcstderr_mt_la_LIBADD = -lmrw-mt
|
||||
endif
|
||||
endif
|
||||
|
||||
if HAVE_LOG4CXX
|
||||
libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cpp version.cpp
|
||||
libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
|
||||
libmrwexclog4cxx_la_LIBADD = -lmrw
|
||||
libmrwexclog4cxx_la_LIBADD = -lmrw -llog4cxx
|
||||
if HAVE_THREADS
|
||||
if HAVE_BOOST_THREAD
|
||||
libmrwexclog4cxx_mt_la_SOURCES = autostacktracelog4cxx.cpp version.cpp
|
||||
libmrwexclog4cxx_mt_la_CXXFLAGS = @THREADS@
|
||||
libmrwexclog4cxx_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@
|
||||
libmrwexclog4cxx_mt_la_LIBADD = -lmrw-mt -llog4cxx
|
||||
endif
|
||||
endif
|
||||
|
||||
if AUTOFNTRACE
|
||||
libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cpp \
|
||||
version.cpp
|
||||
libmrwautofunctiontracelog4cxx_la_CXXFLAGS = -w
|
||||
libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
|
||||
libmrwautofunctiontracelog4cxx_la_LIBADD = -lmrw -llog4cxx
|
||||
if HAVE_THREADS
|
||||
if HAVE_BOOST_THREAD
|
||||
libmrwautofunctiontracelog4cxx_mt_la_SOURCES = \
|
||||
autofunctiontracelog4cxx.cpp version.cpp
|
||||
libmrwautofunctiontracelog4cxx_mt_la_CXXFLAGS = @THREADS@ -w
|
||||
libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \
|
||||
-version-info @LIB_VERSION@ @THREADS@
|
||||
libmrwautofunctiontracelog4cxx_mt_la_LIBADD = \
|
||||
-lmrw-mt -llog4cxx
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -179,52 +228,67 @@ if HAVE_STACKTRACE
|
||||
check_PROGRAMS += stacktrace_test mrwexcstderr_test
|
||||
if HAVE_LOG4CXX
|
||||
check_PROGRAMS += mrwexclog4cxx_test
|
||||
if AUTOFNTRACE
|
||||
check_PROGRAMS += mrwautofunctiontracelog4cxx_test
|
||||
if HAVE_THREADS
|
||||
if HAVE_BOOST_THREAD
|
||||
check_PROGRAMS += mrwautofunctiontracelog4cxx_test-mt
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
auto_test_SOURCES = auto_test.cpp version.cpp
|
||||
auto_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
|
||||
auto_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
auto_test_CXXFLAGS = -g3 -O0
|
||||
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 -O0 @CPPUNIT_CFLAGS@
|
||||
smartpointer_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
smartpointer_test_CXXFLAGS = -g3 -O0
|
||||
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 -O0 @CPPUNIT_CFLAGS@
|
||||
exec_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
exec_test_CXXFLAGS = -g3 -O0
|
||||
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 -O0 @CPPUNIT_CFLAGS@
|
||||
stdext_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
stdext_test_CXXFLAGS = -g3 -O0
|
||||
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 -O0 @CPPUNIT_CFLAGS@
|
||||
regexp_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
regexp_test_CXXFLAGS = -g3 -O0
|
||||
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 -O0 @CPPUNIT_CFLAGS@
|
||||
tokenizer_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
tokenizer_test_CXXFLAGS = -g3 -O0
|
||||
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 -O0 @CPPUNIT_CFLAGS@
|
||||
configfile_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
configfile_test_CXXFLAGS = -g3 -O0
|
||||
configfile_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
configfile_test_LDADD = -lmrw
|
||||
if HAVE_STACKTRACE
|
||||
@@ -235,13 +299,15 @@ if HAVE_LTDL
|
||||
libdynamiclibrary_testlib_la_SOURCES = dynamiclibrary_testlib.cpp
|
||||
libdynamiclibrary_testlib_la_LDFLAGS = -module -rpath /bullshit
|
||||
dynamiclibrary_test_SOURCES = dynamiclibrary_test.cpp version.cpp
|
||||
dynamiclibrary_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
|
||||
dynamiclibrary_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
dynamiclibrary_test_CXXFLAGS = -g3 -O0
|
||||
dynamiclibrary_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
dynamiclibrary_test_LDADD = -lmrw -lltdl
|
||||
endif
|
||||
if HAVE_LOG4CXX
|
||||
functiontrace_test_SOURCES = functiontrace_test.cpp version.cpp
|
||||
functiontrace_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
|
||||
functiontrace_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
functiontrace_test_CXXFLAGS = -g3 -O0
|
||||
functiontrace_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
functiontrace_test_LDADD = -lmrw -llog4cxx
|
||||
if HAVE_STACKTRACE
|
||||
@@ -250,18 +316,46 @@ endif
|
||||
endif
|
||||
if HAVE_STACKTRACE
|
||||
stacktrace_test_SOURCES = stacktrace_test.cpp version.cpp
|
||||
stacktrace_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
|
||||
stacktrace_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
stacktrace_test_CXXFLAGS = -g3 -O0
|
||||
stacktrace_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
stacktrace_test_LDADD = -lmrw -lmrwexcstderr
|
||||
mrwexcstderr_test_SOURCES = mrwexcstderr_test.cpp version.cpp
|
||||
mrwexcstderr_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
|
||||
mrwexcstderr_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
mrwexcstderr_test_CXXFLAGS = -g3 -O0
|
||||
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 -O0 @CPPUNIT_CFLAGS@
|
||||
mrwexclog4cxx_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
mrwexclog4cxx_test_CXXFLAGS = -g3 -O0
|
||||
mrwexclog4cxx_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
mrwexclog4cxx_test_LDADD = -lmrwexclog4cxx -llog4cxx
|
||||
if AUTOFNTRACE
|
||||
mrwautofunctiontracelog4cxx_test_SOURCES = \
|
||||
mrwautofunctiontracelog4cxx_test.cpp version.cpp
|
||||
mrwautofunctiontracelog4cxx_test_CPPFLAGS = \
|
||||
-I.. @CPPUNIT_CFLAGS@ -finstrument-functions -g3 -O0
|
||||
mrwautofunctiontracelog4cxx_test_CXXFLAGS = -g3 -O0 -finstrument-functions
|
||||
mrwautofunctiontracelog4cxx_test_LDFLAGS = \
|
||||
@CPPUNIT_LIBS@ -finstrument-functions
|
||||
mrwautofunctiontracelog4cxx_test_LDADD = \
|
||||
-llog4cxx -lmrwautofunctiontracelog4cxx
|
||||
if HAVE_THREADS
|
||||
if HAVE_BOOST_THREAD
|
||||
mrwautofunctiontracelog4cxx_test_mt_SOURCES = \
|
||||
mrwautofunctiontracelog4cxx_test.cpp version.cpp
|
||||
mrwautofunctiontracelog4cxx_test_mt_CPPFLAGS = \
|
||||
-I.. @CPPUNIT_CFLAGS@ -finstrument-functions -g3 -O0
|
||||
mrwautofunctiontracelog4cxx_test_mt_CXXFLAGS = -g3 -O0 \
|
||||
-finstrument-functions @THREADS@
|
||||
mrwautofunctiontracelog4cxx_test_mt_LDFLAGS = \
|
||||
@CPPUNIT_LIBS@ @THREADS@ -finstrument-functions
|
||||
mrwautofunctiontracelog4cxx_test_mt_LDADD = \
|
||||
-llog4cxx -lmrwautofunctiontracelog4cxx-mt @BOOST_THREAD_LIB@
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
EXTRA_DIST = test.dat configfile.ini configfile.ini.result \
|
||||
@@ -285,8 +379,3 @@ clean-local:
|
||||
distclean-local:
|
||||
- rm -r doc/html/* doc/latex/*
|
||||
- rm makefile makefile.in doxygen.err libmrw.doxytag
|
||||
|
||||
#if TRACER
|
||||
#%.ii: %.cpp; ${TRACE} -E -- $<
|
||||
#%.o: %.ii; ${CXX} -c ${CPPFLAGS} ${CXXFLAGS} -o $@ $<
|
||||
#endif
|
||||
Reference in New Issue
Block a user