Now, make distcheck works AND the html doc is dirstributed...
This commit is contained in:
@@ -9,6 +9,9 @@
|
|||||||
## @license LGPL, see file <a href="license.html">COPYING</a>
|
## @license LGPL, see file <a href="license.html">COPYING</a>
|
||||||
##
|
##
|
||||||
## $Log$
|
## $Log$
|
||||||
|
## 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
|
## Revision 1.28 2005/04/07 22:08:59 marc
|
||||||
## doc/html to EXTRA_DIST
|
## doc/html to EXTRA_DIST
|
||||||
##
|
##
|
||||||
@@ -100,7 +103,7 @@
|
|||||||
## - possibility to compile without stack trace
|
## - possibility to compile without stack trace
|
||||||
##
|
##
|
||||||
|
|
||||||
AM_CPPFLAGS += -I..
|
AM_CPPFLAGS += -I${top_srcdir}
|
||||||
|
|
||||||
if HAVE_STACKTRACE
|
if HAVE_STACKTRACE
|
||||||
AM_CPPFLAGS += -DHAVE_STACKTRACE
|
AM_CPPFLAGS += -DHAVE_STACKTRACE
|
||||||
@@ -112,7 +115,7 @@ CLEANFILES = doxygen.errors functiontrace_test.log \
|
|||||||
examplesdir = ${pkgdatadir}/examples
|
examplesdir = ${pkgdatadir}/examples
|
||||||
dist_examples_DATA = ${top_srcdir}/mrw/examples/*
|
dist_examples_DATA = ${top_srcdir}/mrw/examples/*
|
||||||
htmldir = ${pkgdatadir}/doc/html
|
htmldir = ${pkgdatadir}/doc/html
|
||||||
dist_html_DATA = ${top_builddir}/doc/html/index.html
|
html_DATA = ${top_builddir}/doc/html/index.html
|
||||||
pdfdir = ${pkgdatadir}/doc/pdf
|
pdfdir = ${pkgdatadir}/doc/pdf
|
||||||
dist_pdf_DATA = ${top_builddir}/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
|
dist_pdf_DATA = ${top_builddir}/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
|
||||||
|
|
||||||
@@ -263,7 +266,7 @@ endif
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
auto_test_SOURCES = auto_test.cpp version.cpp
|
auto_test_SOURCES = auto_test.cpp version.cpp
|
||||||
auto_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
auto_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
|
||||||
auto_test_CXXFLAGS = -g3 -O0
|
auto_test_CXXFLAGS = -g3 -O0
|
||||||
auto_test_LDFLAGS = @CPPUNIT_LIBS@
|
auto_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||||
auto_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
auto_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||||
@@ -271,7 +274,7 @@ if HAVE_STACKTRACE
|
|||||||
auto_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
auto_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||||
endif
|
endif
|
||||||
smartpointer_test_SOURCES = smartpointer_test.cpp version.cpp
|
smartpointer_test_SOURCES = smartpointer_test.cpp version.cpp
|
||||||
smartpointer_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
smartpointer_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
|
||||||
smartpointer_test_CXXFLAGS = -g3 -O0
|
smartpointer_test_CXXFLAGS = -g3 -O0
|
||||||
smartpointer_test_LDFLAGS = @CPPUNIT_LIBS@
|
smartpointer_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||||
smartpointer_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
smartpointer_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||||
@@ -279,7 +282,7 @@ if HAVE_STACKTRACE
|
|||||||
smartpointer_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
smartpointer_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||||
endif
|
endif
|
||||||
exec_test_SOURCES = exec_test.cpp version.cpp
|
exec_test_SOURCES = exec_test.cpp version.cpp
|
||||||
exec_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
exec_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
|
||||||
exec_test_CXXFLAGS = -g3 -O0
|
exec_test_CXXFLAGS = -g3 -O0
|
||||||
exec_test_LDFLAGS = @CPPUNIT_LIBS@
|
exec_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||||
exec_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
exec_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||||
@@ -287,7 +290,7 @@ if HAVE_STACKTRACE
|
|||||||
exec_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
exec_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||||
endif
|
endif
|
||||||
stdext_test_SOURCES = stdext_test.cpp version.cpp
|
stdext_test_SOURCES = stdext_test.cpp version.cpp
|
||||||
stdext_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
stdext_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
|
||||||
stdext_test_CXXFLAGS = -g3 -O0
|
stdext_test_CXXFLAGS = -g3 -O0
|
||||||
stdext_test_LDFLAGS = @CPPUNIT_LIBS@
|
stdext_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||||
stdext_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
stdext_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||||
@@ -295,7 +298,7 @@ if HAVE_STACKTRACE
|
|||||||
stdext_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
stdext_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||||
endif
|
endif
|
||||||
regexp_test_SOURCES = regexp_test.cpp version.cpp
|
regexp_test_SOURCES = regexp_test.cpp version.cpp
|
||||||
regexp_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
regexp_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
|
||||||
regexp_test_CXXFLAGS = -g3 -O0
|
regexp_test_CXXFLAGS = -g3 -O0
|
||||||
regexp_test_LDFLAGS = @CPPUNIT_LIBS@
|
regexp_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||||
regexp_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
regexp_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||||
@@ -303,7 +306,7 @@ if HAVE_STACKTRACE
|
|||||||
regexp_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
regexp_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||||
endif
|
endif
|
||||||
tokenizer_test_SOURCES = tokenizer_test.cpp version.cpp
|
tokenizer_test_SOURCES = tokenizer_test.cpp version.cpp
|
||||||
tokenizer_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
tokenizer_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
|
||||||
tokenizer_test_CXXFLAGS = -g3 -O0
|
tokenizer_test_CXXFLAGS = -g3 -O0
|
||||||
tokenizer_test_LDFLAGS = @CPPUNIT_LIBS@
|
tokenizer_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||||
tokenizer_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
tokenizer_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||||
@@ -311,7 +314,7 @@ if HAVE_STACKTRACE
|
|||||||
tokenizer_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
tokenizer_test_LDADD += ${top_builddir}/mrw/libmrwexcstderr.la
|
||||||
endif
|
endif
|
||||||
configfile_test_SOURCES = configfile_test.cpp version.cpp
|
configfile_test_SOURCES = configfile_test.cpp version.cpp
|
||||||
configfile_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
configfile_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
|
||||||
configfile_test_CXXFLAGS = -g3 -O0
|
configfile_test_CXXFLAGS = -g3 -O0
|
||||||
configfile_test_LDFLAGS = @CPPUNIT_LIBS@
|
configfile_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||||
configfile_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
configfile_test_LDADD = ${top_builddir}/mrw/libmrw.la
|
||||||
@@ -323,14 +326,14 @@ if HAVE_LTDL
|
|||||||
libdynamiclibrary_testlib_la_SOURCES = dynamiclibrary_testlib.cpp
|
libdynamiclibrary_testlib_la_SOURCES = dynamiclibrary_testlib.cpp
|
||||||
libdynamiclibrary_testlib_la_LDFLAGS = -module -rpath /bullshit
|
libdynamiclibrary_testlib_la_LDFLAGS = -module -rpath /bullshit
|
||||||
dynamiclibrary_test_SOURCES = dynamiclibrary_test.cpp version.cpp
|
dynamiclibrary_test_SOURCES = dynamiclibrary_test.cpp version.cpp
|
||||||
dynamiclibrary_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
dynamiclibrary_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
|
||||||
dynamiclibrary_test_CXXFLAGS = -g3 -O0
|
dynamiclibrary_test_CXXFLAGS = -g3 -O0
|
||||||
dynamiclibrary_test_LDFLAGS = @CPPUNIT_LIBS@
|
dynamiclibrary_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||||
dynamiclibrary_test_LDADD = ${top_builddir}/mrw/libmrw.la -lltdl
|
dynamiclibrary_test_LDADD = ${top_builddir}/mrw/libmrw.la -lltdl
|
||||||
endif
|
endif
|
||||||
if HAVE_LOG4CXX
|
if HAVE_LOG4CXX
|
||||||
functiontrace_test_SOURCES = functiontrace_test.cpp version.cpp
|
functiontrace_test_SOURCES = functiontrace_test.cpp version.cpp
|
||||||
functiontrace_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
functiontrace_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
|
||||||
functiontrace_test_CXXFLAGS = -g3 -O0
|
functiontrace_test_CXXFLAGS = -g3 -O0
|
||||||
functiontrace_test_LDFLAGS = @CPPUNIT_LIBS@
|
functiontrace_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||||
functiontrace_test_LDADD = ${top_builddir}/mrw/libmrw.la -llog4cxx
|
functiontrace_test_LDADD = ${top_builddir}/mrw/libmrw.la -llog4cxx
|
||||||
@@ -340,18 +343,18 @@ endif
|
|||||||
endif
|
endif
|
||||||
if HAVE_STACKTRACE
|
if HAVE_STACKTRACE
|
||||||
stacktrace_test_SOURCES = stacktrace_test.cpp version.cpp
|
stacktrace_test_SOURCES = stacktrace_test.cpp version.cpp
|
||||||
stacktrace_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
stacktrace_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
|
||||||
stacktrace_test_CXXFLAGS = -g3 -O0
|
stacktrace_test_CXXFLAGS = -g3 -O0
|
||||||
stacktrace_test_LDFLAGS = @CPPUNIT_LIBS@
|
stacktrace_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||||
stacktrace_test_LDADD = ${top_builddir}/mrw/libmrw.la ${top_builddir}/mrw/libmrwexcstderr.la
|
stacktrace_test_LDADD = ${top_builddir}/mrw/libmrw.la ${top_builddir}/mrw/libmrwexcstderr.la
|
||||||
mrwexcstderr_test_SOURCES = mrwexcstderr_test.cpp version.cpp
|
mrwexcstderr_test_SOURCES = mrwexcstderr_test.cpp version.cpp
|
||||||
mrwexcstderr_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
mrwexcstderr_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
|
||||||
mrwexcstderr_test_CXXFLAGS = -g3 -O0
|
mrwexcstderr_test_CXXFLAGS = -g3 -O0
|
||||||
mrwexcstderr_test_LDFLAGS = @CPPUNIT_LIBS@
|
mrwexcstderr_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||||
mrwexcstderr_test_LDADD = ${top_builddir}/mrw/libmrwexcstderr.la
|
mrwexcstderr_test_LDADD = ${top_builddir}/mrw/libmrwexcstderr.la
|
||||||
if HAVE_LOG4CXX
|
if HAVE_LOG4CXX
|
||||||
mrwexclog4cxx_test_SOURCES = mrwexclog4cxx_test.cpp version.cpp
|
mrwexclog4cxx_test_SOURCES = mrwexclog4cxx_test.cpp version.cpp
|
||||||
mrwexclog4cxx_test_CPPFLAGS = -I.. @CPPUNIT_CFLAGS@ -g3 -O0
|
mrwexclog4cxx_test_CPPFLAGS = -I${top_srcdir} @CPPUNIT_CFLAGS@ -g3 -O0
|
||||||
mrwexclog4cxx_test_CXXFLAGS = -g3 -O0
|
mrwexclog4cxx_test_CXXFLAGS = -g3 -O0
|
||||||
mrwexclog4cxx_test_LDFLAGS = @CPPUNIT_LIBS@
|
mrwexclog4cxx_test_LDFLAGS = @CPPUNIT_LIBS@
|
||||||
mrwexclog4cxx_test_LDADD = ${top_builddir}/mrw/libmrwexclog4cxx.la -llog4cxx
|
mrwexclog4cxx_test_LDADD = ${top_builddir}/mrw/libmrwexclog4cxx.la -llog4cxx
|
||||||
@@ -359,7 +362,7 @@ if AUTOFNTRACE
|
|||||||
mrwautofunctiontracelog4cxx_test_SOURCES = \
|
mrwautofunctiontracelog4cxx_test_SOURCES = \
|
||||||
mrwautofunctiontracelog4cxx_test.cpp version.cpp
|
mrwautofunctiontracelog4cxx_test.cpp version.cpp
|
||||||
mrwautofunctiontracelog4cxx_test_CPPFLAGS = \
|
mrwautofunctiontracelog4cxx_test_CPPFLAGS = \
|
||||||
-I.. @CPPUNIT_CFLAGS@ -finstrument-functions -g3 -O0
|
-I${top_srcdir} @CPPUNIT_CFLAGS@ -finstrument-functions -g3 -O0
|
||||||
mrwautofunctiontracelog4cxx_test_CXXFLAGS = -g3 -O0 -finstrument-functions
|
mrwautofunctiontracelog4cxx_test_CXXFLAGS = -g3 -O0 -finstrument-functions
|
||||||
mrwautofunctiontracelog4cxx_test_LDFLAGS = \
|
mrwautofunctiontracelog4cxx_test_LDFLAGS = \
|
||||||
@CPPUNIT_LIBS@ -finstrument-functions
|
@CPPUNIT_LIBS@ -finstrument-functions
|
||||||
@@ -370,7 +373,7 @@ if HAVE_BOOST_THREAD
|
|||||||
mrwautofunctiontracelog4cxx_test_mt_SOURCES = \
|
mrwautofunctiontracelog4cxx_test_mt_SOURCES = \
|
||||||
mrwautofunctiontracelog4cxx_test.cpp version.cpp
|
mrwautofunctiontracelog4cxx_test.cpp version.cpp
|
||||||
mrwautofunctiontracelog4cxx_test_mt_CPPFLAGS = \
|
mrwautofunctiontracelog4cxx_test_mt_CPPFLAGS = \
|
||||||
-I.. @CPPUNIT_CFLAGS@ -finstrument-functions -g3 -O0
|
-I${top_srcdir} @CPPUNIT_CFLAGS@ -finstrument-functions -g3 -O0
|
||||||
mrwautofunctiontracelog4cxx_test_mt_CXXFLAGS = -g3 -O0 \
|
mrwautofunctiontracelog4cxx_test_mt_CXXFLAGS = -g3 -O0 \
|
||||||
-finstrument-functions @THREADS@
|
-finstrument-functions @THREADS@
|
||||||
mrwautofunctiontracelog4cxx_test_mt_LDFLAGS = \
|
mrwautofunctiontracelog4cxx_test_mt_LDFLAGS = \
|
||||||
@@ -384,30 +387,41 @@ endif
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
dist_check_DATA = test.dat configfile.ini configfile.ini.result
|
dist_check_DATA = test.dat configfile.ini configfile.ini.result
|
||||||
EXTRA_DIST = ${top_srcdir}/doc/html head.html foot.html style.css
|
EXTRA_DIST = head.html foot.html style.css
|
||||||
TESTS = ${check_PROGRAMS} ${dist_check_SCRIPTS}
|
TESTS = ${check_PROGRAMS} ${dist_check_SCRIPTS}
|
||||||
|
|
||||||
.PHONY: doc clean-local distclean-local
|
.PHONY: doc clean-local distclean-local
|
||||||
|
|
||||||
deps = ${top_srcdir}/COPYING ${top_srcdir}/README ${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog
|
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
|
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
|
|
||||||
|
${html_DATA}: 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/latex || mkdir -p ${top_builddir}/doc/latex
|
||||||
test -d ${top_builddir}/doc/html || mkdir -p ${top_builddir}/doc/html
|
test -d ${top_builddir}/doc/html || mkdir -p ${top_builddir}/doc/html
|
||||||
@test -f ${top_builddir}/doc/html/hintergrund.png || \
|
@test -f ${top_builddir}/doc/html/hintergrund.png || \
|
||||||
cp ~/www/marc/linux/hintergrund.png \
|
cp ~/www/marc/linux/hintergrund.png \
|
||||||
${top_builddir}/doc/html || \
|
${top_builddir}/doc/html || \
|
||||||
echo "**** sorry, you are missing the html background image" && \
|
\( echo "**** sorry, you are missing the html background image" && \
|
||||||
echo " (after distclean doc/html/hintergrund.png is deleted)"
|
echo " (after distclean doc/html/hintergrund.png is deleted)" \
|
||||||
|
\)
|
||||||
doxygen doxyfile
|
doxygen doxyfile
|
||||||
if PEDANTIC
|
if PEDANTIC
|
||||||
test \! -s doxygen.errors
|
test \! -s doxygen.errors
|
||||||
endif
|
endif
|
||||||
${top_builddir}/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf: doxyfile *.[ch]pp ${deps}
|
|
||||||
|
${top_builddir}/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf: doxyfile *.[ch]pp ${deps} ${html_DATA}
|
||||||
cd ${top_builddir}/doc/latex && make && \
|
cd ${top_builddir}/doc/latex && make && \
|
||||||
mv refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
|
mv refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
|
||||||
|
|
||||||
clean-local:
|
clean-local:
|
||||||
- rm doxygen.err libmrw.doxytag
|
- rm doxygen.err libmrw.doxytag
|
||||||
|
|
||||||
|
dist-hook:
|
||||||
|
test -d ${distdir}/doc/html || \
|
||||||
|
mkdir -p ${distdir}/doc/html
|
||||||
|
cp ${top_builddir}/doc/html/* ${distdir}/doc/html/.
|
||||||
|
|
||||||
distclean-local:
|
distclean-local:
|
||||||
- rm -r ${top_builddir}/doc/html/* ${top_builddir}/doc/latex/*
|
- rm -r ${top_builddir}/doc/html/* ${top_builddir}/doc/latex/*
|
||||||
- rm makefile makefile.in doxygen.err libmrw.doxytag
|
- rm makefile makefile.in doxygen.err libmrw.doxytag
|
||||||
|
Reference in New Issue
Block a user