From 79515680cf4848bab12c05f4e9c753ea4fbbf440 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Mar 2009 04:26:47 -0400 Subject: [PATCH] Doxygen is no longer being used Since I'm going to focus on the man page and manual, there is no time to work on code comments that may only rarely be seen in the 3.0 version. --- Makefile.am | 38 ++++++++++++++++++++++++++++++-------- configure.ac | 10 ++++++++++ 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4669d8d1..98768520 100644 --- a/Makefile.am +++ b/Makefile.am @@ -418,28 +418,47 @@ fullcheck: cppunittests ###################################################################### -EXTRA_DIST += doc/README doc/LICENSE doc/NEWS -EXTRA_DIST += doc/Doxyfile doc/ledger.pdf doc/refman.pdf +EXTRA_DIST += doc/README doc/LICENSE doc/NEWS doc/ledger.pdf +if USE_DOXYGEN +EXTRA_DIST += doc/Doxyfile doc/refman.pdf +endif -DISTCLEANFILES += doc/ledger.info doc/ledger.pdf \ - Doxyfile.gen doc/Doxyfile.bak doc/refman.pdf +DISTCLEANFILES += doc/ledger.info doc/ledger.pdf +if USE_DOXYGEN +DISTCLEANFILES += Doxyfile.gen doc/Doxyfile.bak doc/refman.pdf +endif -dist-hook: - find $(distdir) -name .DS_Store -delete - find $(distdir) -name .localized -delete +if USE_DOXYGEN +dist-hook-doxygen: find $(distdir)/doc -name .dirstamp -delete rm -fr $(distdir)/doc/latex \ $(distdir)/doc/Doxyfile.bak \ $(distdir)/doc/Doxyfile.gen cp -pR doc/html $(distdir)/doc +else +dist-hook-doxygen: + @test 1 -eq 1 +endif + +dist-hook: dist-hook-doxygen + find $(distdir) -name .DS_Store -delete + find $(distdir) -name .localized -delete rm -f $(distdir)/README.textile cp -p $(srcdir)/doc/README $(distdir)/README -distclean-local: +if USE_DOXYGEN +distclean-local-doxygen: rm -fr doc/html doc/latex rm -f doc/refman.pdf +else +distclean-local-doxygen: + @test 1 -eq 1 +endif + +distclean-local: distclean-local-doxygen rm -fr test/python +if USE_DOXYGEN ESC_top_builddir=`cd $(top_builddir); pwd | sed 's/\//\\\\\//g'` $(top_builddir)/Doxyfile.gen: $(srcdir)/doc/Doxyfile @@ -461,6 +480,9 @@ $(top_builddir)/doc/refman.pdf: $(top_builddir)/doc/html/index.html cp $(top_builddir)/doc/latex/refman.pdf $@ docs: pdf $(top_builddir)/doc/refman.pdf +else +docs: pdf +endif libs: @echo Building dependency libs and installing in /usr/local/stow ... diff --git a/configure.ac b/configure.ac index f68289f0..3513d322 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,16 @@ if [ test x$pch = xtrue ]; then fi AM_CONDITIONAL(USE_PCH, test x$pch = xtrue) +AC_ARG_ENABLE(doxygen, + [ --enable-doxygen Turns on generation of code documentation], + [case "${enableval}" in + yes) doxygen=true ;; + no) doxygen=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-doxygen) ;; + esac],[doxygen=false]) + +AM_CONDITIONAL(USE_DOXYGEN, test x$doxygen = xtrue) + AC_ARG_WITH(boost-suffix, [ --with-boost-suffix=X Append X to the Boost library names], [BOOST_SUFFIX="${withval}"],