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
This commit is contained in:
120
mrw/makefile.am
120
mrw/makefile.am
@@ -9,6 +9,13 @@
|
||||
## @license LGPL, see file <a href="license.html">COPYING</a>
|
||||
##
|
||||
## $Log$
|
||||
## 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
|
||||
@@ -96,12 +103,12 @@ endif
|
||||
CLEANFILES = doxygen.errors functiontrace_test.log \
|
||||
mrwautofunctiontracelog4cxx_test.log \
|
||||
mrwautofunctiontracelog4cxx_test-mt.log
|
||||
examplesdir = ${pkgdatadir}/examples
|
||||
examples_DATA = examples/*
|
||||
examplesdir = ${pkgdatadir}/mrw/examples
|
||||
dist_examples_DATA = ${top_srcdir}/mrw/examples/*
|
||||
htmldir = ${pkgdatadir}/doc/html
|
||||
html_DATA = doc/html/index.html doc/html/*
|
||||
dist_html_DATA = ${top_builddir}/doc/html/index.html
|
||||
pdfdir = ${pkgdatadir}/doc/pdf
|
||||
pdf_DATA = doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
|
||||
dist_pdf_DATA = ${top_builddir}/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
|
||||
|
||||
lib_LTLIBRARIES = libmrw.la
|
||||
if HAVE_BOOST_THREAD
|
||||
@@ -115,8 +122,10 @@ if HAVE_BOOST_THREAD
|
||||
endif
|
||||
endif
|
||||
if HAVE_LOG4CXX
|
||||
lib_LTLIBRARIES += libmrwexclog4cxx.la
|
||||
lib_LTLIBRARIES += libmrwexclog4cxx.la \
|
||||
libmrwlog4cxxconfiguration.la
|
||||
if HAVE_THREADS
|
||||
lib_LTLIBRARIES += libmrwlog4cxxconfiguration-mt.la
|
||||
if HAVE_BOOST_THREAD
|
||||
lib_LTLIBRARIES += libmrwexclog4cxx-mt.la
|
||||
endif
|
||||
@@ -171,26 +180,35 @@ endif
|
||||
if HAVE_STACKTRACE
|
||||
libmrwexcstderr_la_SOURCES = autostacktracestderr.cpp version.cpp
|
||||
libmrwexcstderr_la_LDFLAGS = -version-info @LIB_VERSION@
|
||||
libmrwexcstderr_la_LIBADD = -lmrw
|
||||
libmrwexcstderr_la_LIBADD = ${top_builddir}/mrw/libmrw.la
|
||||
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
|
||||
libmrwexcstderr_mt_la_LIBADD = ${top_builddir}/mrw/libmrw-mt.la
|
||||
endif
|
||||
endif
|
||||
|
||||
if HAVE_LOG4CXX
|
||||
libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cpp version.cpp
|
||||
libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
|
||||
libmrwexclog4cxx_la_LIBADD = -lmrw -llog4cxx
|
||||
libmrwexclog4cxx_la_LIBADD = ${top_builddir}/mrw/libmrw.la -llog4cxx
|
||||
libmrwlog4cxxconfiguration_la_SOURCES = log4cxxconfiguration.cpp version.cpp
|
||||
libmrwlog4cxxconfiguration_la_LDFLAGS = -version-info @LIB_VERSION@
|
||||
libmrwlog4cxxconfiguration_la_LIBADD = -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
|
||||
libmrwexclog4cxx_mt_la_LIBADD = ${top_builddir}/mrw/libmrw-mt.la -llog4cxx
|
||||
libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cpp \
|
||||
version.cpp
|
||||
libmrwlog4cxxconfiguration_mt_la_CXXFLAGS = @THREADS@
|
||||
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_VERSION@ \
|
||||
@THREADS@
|
||||
libmrwlog4cxxconfiguration_mt_la_LIBADD = -llog4cxx
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -199,7 +217,7 @@ if AUTOFNTRACE
|
||||
version.cpp
|
||||
libmrwautofunctiontracelog4cxx_la_CXXFLAGS = -w
|
||||
libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
|
||||
libmrwautofunctiontracelog4cxx_la_LIBADD = -lmrw -llog4cxx
|
||||
libmrwautofunctiontracelog4cxx_la_LIBADD = ${top_builddir}/mrw/libmrw.la -llog4cxx
|
||||
if HAVE_THREADS
|
||||
if HAVE_BOOST_THREAD
|
||||
libmrwautofunctiontracelog4cxx_mt_la_SOURCES = \
|
||||
@@ -208,7 +226,7 @@ if HAVE_BOOST_THREAD
|
||||
libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \
|
||||
-version-info @LIB_VERSION@ @THREADS@
|
||||
libmrwautofunctiontracelog4cxx_mt_la_LIBADD = \
|
||||
-lmrw-mt -llog4cxx
|
||||
${top_builddir}/mrw/libmrw-mt.la -llog4cxx
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@@ -223,7 +241,7 @@ endif
|
||||
if HAVE_LOG4CXX
|
||||
check_PROGRAMS += functiontrace_test
|
||||
endif
|
||||
check_SCRIPTS = configfile_check.sh
|
||||
dist_check_SCRIPTS = configfile_check.sh
|
||||
if HAVE_STACKTRACE
|
||||
check_PROGRAMS += stacktrace_test mrwexcstderr_test
|
||||
if HAVE_LOG4CXX
|
||||
@@ -242,57 +260,57 @@ auto_test_SOURCES = auto_test.cpp version.cpp
|
||||
auto_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
auto_test_CXXFLAGS = -g3 -O0
|
||||
auto_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
auto_test_LDADD = -lmrw
|
||||
auto_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||
if HAVE_STACKTRACE
|
||||
auto_test_LDADD += -lmrwexcstderr
|
||||
auto_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||
endif
|
||||
smartpointer_test_SOURCES = smartpointer_test.cpp version.cpp
|
||||
smartpointer_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
smartpointer_test_CXXFLAGS = -g3 -O0
|
||||
smartpointer_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
smartpointer_test_LDADD = -lmrw
|
||||
smartpointer_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||
if HAVE_STACKTRACE
|
||||
smartpointer_test_LDADD += -lmrwexcstderr
|
||||
smartpointer_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||
endif
|
||||
exec_test_SOURCES = exec_test.cpp version.cpp
|
||||
exec_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
exec_test_CXXFLAGS = -g3 -O0
|
||||
exec_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
exec_test_LDADD = -lmrw
|
||||
exec_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||
if HAVE_STACKTRACE
|
||||
exec_test_LDADD += -lmrwexcstderr
|
||||
exec_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||
endif
|
||||
stdext_test_SOURCES = stdext_test.cpp version.cpp
|
||||
stdext_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
stdext_test_CXXFLAGS = -g3 -O0
|
||||
stdext_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
stdext_test_LDADD = -lmrw
|
||||
stdext_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||
if HAVE_STACKTRACE
|
||||
stdext_test_LDADD += -lmrwexcstderr
|
||||
stdext_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||
endif
|
||||
regexp_test_SOURCES = regexp_test.cpp version.cpp
|
||||
regexp_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
regexp_test_CXXFLAGS = -g3 -O0
|
||||
regexp_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
regexp_test_LDADD = -lmrw
|
||||
regexp_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||
if HAVE_STACKTRACE
|
||||
regexp_test_LDADD += -lmrwexcstderr
|
||||
regexp_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||
endif
|
||||
tokenizer_test_SOURCES = tokenizer_test.cpp version.cpp
|
||||
tokenizer_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
tokenizer_test_CXXFLAGS = -g3 -O0
|
||||
tokenizer_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
tokenizer_test_LDADD = -lmrw
|
||||
tokenizer_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||
if HAVE_STACKTRACE
|
||||
tokenizer_test_LDADD += -lmrwexcstderr
|
||||
tokenizer_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||
endif
|
||||
configfile_test_SOURCES = configfile_test.cpp version.cpp
|
||||
configfile_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
configfile_test_CXXFLAGS = -g3 -O0
|
||||
configfile_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
configfile_test_LDADD = -lmrw
|
||||
configfile_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||
if HAVE_STACKTRACE
|
||||
configfile_test_LDADD += -lmrwexcstderr
|
||||
configfile_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||
endif
|
||||
if HAVE_LTDL
|
||||
check_LTLIBRARIES = libdynamiclibrary_testlib.la
|
||||
@@ -302,16 +320,16 @@ if HAVE_LTDL
|
||||
dynamiclibrary_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
dynamiclibrary_test_CXXFLAGS = -g3 -O0
|
||||
dynamiclibrary_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
dynamiclibrary_test_LDADD = -lmrw -lltdl
|
||||
dynamiclibrary_test_LDADD = ${top_builddir}/mrw/libmrw.la -lltdl
|
||||
endif
|
||||
if HAVE_LOG4CXX
|
||||
functiontrace_test_SOURCES = functiontrace_test.cpp version.cpp
|
||||
functiontrace_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
functiontrace_test_CXXFLAGS = -g3 -O0
|
||||
functiontrace_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
functiontrace_test_LDADD = -lmrw -llog4cxx
|
||||
functiontrace_test_LDADD = ${top_builddir}/mrw/libmrw.la -llog4cxx
|
||||
if HAVE_STACKTRACE
|
||||
functiontrace_test_LDADD += -lmrwexcstderr
|
||||
functiontrace_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||
endif
|
||||
endif
|
||||
if HAVE_STACKTRACE
|
||||
@@ -319,18 +337,18 @@ if HAVE_STACKTRACE
|
||||
stacktrace_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
stacktrace_test_CXXFLAGS = -g3 -O0
|
||||
stacktrace_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
stacktrace_test_LDADD = -lmrw -lmrwexcstderr
|
||||
stacktrace_test_LDADD = ${top_builddir}/mrw/libmrw.la ${top_builddir}/mrw/libmrwexcstderr.la
|
||||
mrwexcstderr_test_SOURCES = mrwexcstderr_test.cpp version.cpp
|
||||
mrwexcstderr_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
mrwexcstderr_test_CXXFLAGS = -g3 -O0
|
||||
mrwexcstderr_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
mrwexcstderr_test_LDADD = -lmrwexcstderr
|
||||
mrwexcstderr_test_LDADD = ${top_builddir}/mrw/libmrwexcstderr.la
|
||||
if HAVE_LOG4CXX
|
||||
mrwexclog4cxx_test_SOURCES = mrwexclog4cxx_test.cpp version.cpp
|
||||
mrwexclog4cxx_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
||||
mrwexclog4cxx_test_CXXFLAGS = -g3 -O0
|
||||
mrwexclog4cxx_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||
mrwexclog4cxx_test_LDADD = -lmrwexclog4cxx -llog4cxx
|
||||
mrwexclog4cxx_test_LDADD = ${top_builddir}/mrw/libmrwexclog4cxx.la -llog4cxx
|
||||
if AUTOFNTRACE
|
||||
mrwautofunctiontracelog4cxx_test_SOURCES = \
|
||||
mrwautofunctiontracelog4cxx_test.cpp version.cpp
|
||||
@@ -340,7 +358,7 @@ if AUTOFNTRACE
|
||||
mrwautofunctiontracelog4cxx_test_LDFLAGS = \
|
||||
@CPPUNIT_LIBS@ -finstrument-functions
|
||||
mrwautofunctiontracelog4cxx_test_LDADD = \
|
||||
-llog4cxx -lmrwautofunctiontracelog4cxx
|
||||
-llog4cxx ${top_builddir}/mrw/libmrwautofunctiontracelog4cxx.la
|
||||
if HAVE_THREADS
|
||||
if HAVE_BOOST_THREAD
|
||||
mrwautofunctiontracelog4cxx_test_mt_SOURCES = \
|
||||
@@ -352,30 +370,46 @@ if HAVE_BOOST_THREAD
|
||||
mrwautofunctiontracelog4cxx_test_mt_LDFLAGS = \
|
||||
@CPPUNIT_LIBS@ @THREADS@ -finstrument-functions
|
||||
mrwautofunctiontracelog4cxx_test_mt_LDADD = \
|
||||
-llog4cxx -lmrwautofunctiontracelog4cxx-mt @BOOST_THREAD_LIB@
|
||||
-llog4cxx ${top_builddir}/mrw/libmrwautofunctiontracelog4cxx-mt.la @BOOST_THREAD_LIB@
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
EXTRA_DIST = test.dat configfile.ini configfile.ini.result \
|
||||
${examples_DATA} ${html_DATA} ${pdf_DATA} ${check_SCRIPTS}
|
||||
TESTS = ${check_PROGRAMS} ${check_SCRIPTS}
|
||||
|
||||
dist_check_DATA = test.dat configfile.ini configfile.ini.result
|
||||
EXTRA_DIST = head.html foot.html style.css
|
||||
TESTS = ${check_PROGRAMS} ${dist_check_SCRIPTS}
|
||||
|
||||
.PHONY: doc clean-local distclean-local
|
||||
|
||||
deps = ../COPYING ../README ../INSTALL ../NEWS ../ChangeLog
|
||||
doc: doc/html/index.html doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
|
||||
doc/html/index.html: doxyfile *.[ch]pp ${deps}
|
||||
deps = ${top_srcdir}/COPYING ${top_srcdir}/README ${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog
|
||||
doc: ${top_builddir}/doc/html/index.html ${top_builddir}/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
|
||||
${top_builddir}/doc/html/index.html: doxyfile *.[ch]pp ${deps} style.css head.html foot.html
|
||||
test -d ${top_builddir}/doc/latex || mkdir -p ${top_builddir}/doc/latex
|
||||
test -d ${top_builddir}/doc/html || mkdir -p ${top_builddir}/doc/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)"
|
||||
doxygen doxyfile
|
||||
if PEDANTIC
|
||||
test \! -s doxygen.errors
|
||||
endif
|
||||
doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf: doxyfile *.[ch]pp ${deps}
|
||||
cd doc/latex && make && \
|
||||
${top_builddir}/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf: doxyfile *.[ch]pp ${deps}
|
||||
cd ${top_builddir}/doc/latex && make && \
|
||||
mv refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
|
||||
clean-local:
|
||||
- rm doxygen.err libmrw.doxytag
|
||||
distclean-local:
|
||||
- rm -r doc/html/* doc/latex/*
|
||||
- rm -r ${top_builddir}/doc/html/* ${top_builddir}/doc/latex/*
|
||||
- rm makefile makefile.in doxygen.err libmrw.doxytag
|
||||
|
||||
install-data-hook:
|
||||
chmod -R u+w ${pkgdatadir}/doc
|
||||
cp -rf ${top_builddir}/doc/html ${pkgdatadir}/doc/
|
||||
|
||||
uninstall-hook:
|
||||
chmod -R u+w ${pkgdatadir}/doc
|
||||
rm -rf ${pkgdatadir}/doc/html
|
||||
|
Reference in New Issue
Block a user