From a6f7ca1a3a6086a238207ff995de9767408b5c3f Mon Sep 17 00:00:00 2001 From: zwelch Date: Sun, 24 May 2009 01:08:16 +0000 Subject: [PATCH] Properly fix doxygen out-of-tree build process: - move Doxyfile to Doxyfile.in: type 'make Doxyfile' to recreate it - create Doxyfile from Doxyfile.in with make rule: - use sed substitution of $(srcdir) to location directories - delete all doxygen created files with 'make distclean' - include all required files (including logger.pl) in distribution git-svn-id: svn://svn.berlios.de/openocd/trunk@1901 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- Doxyfile => Doxyfile.in | 12 ++++++------ Makefile.am | 18 +++++++++++++----- 2 files changed, 19 insertions(+), 11 deletions(-) rename Doxyfile => Doxyfile.in (99%) diff --git a/Doxyfile b/Doxyfile.in similarity index 99% rename from Doxyfile rename to Doxyfile.in index 7762386ef..0b204a096 100644 --- a/Doxyfile +++ b/Doxyfile.in @@ -564,12 +564,12 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = doc/manual \ - TODO \ - BUGS \ - PATCHES \ - src \ - config.h +INPUT = @srcdir@/doc/manual \ + @srcdir@/TODO \ + @srcdir@/BUGS \ + @srcdir@/PATCHES \ + @srcdir@/src \ + @srcdir@/config.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/Makefile.am b/Makefile.am index cb5277b76..10735f345 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,15 +11,23 @@ nobase_dist_pkgdata_DATA = \ SUBDIRS = src doc -EXTRA_DIST = Doxyfile +EXTRA_DIST = \ + Doxyfile.in \ + tools/logger.pl docs: pdf html doxygen -doxygen:: - (cd $(srcdir) && doxygen Doxyfile 2>&1 | perl tools/logger.pl ) > doxygen.log +Doxyfile: $(srcdir)/Doxyfile.in + sed -e 's,@srcdir\@,$(srcdir),' $< > $@ -doxygen-clean: - rm -f -r doxygen doxygen.log +doxygen:: + $(MAKE) Doxyfile + doxygen Doxyfile 2>&1 | perl $(srcdir)/tools/logger.pl > doxygen.log + +distclean-local: + rm -rf Doxyfile doxygen + +DISTCLEANFILES = doxygen.log MAINTAINERCLEANFILES = \ configure \