From b1ed21e4589848bfc9604a6fac83a572853cc849 Mon Sep 17 00:00:00 2001 From: Carsten Schoenert Date: Sun, 15 Mar 2015 09:57:44 +0100 Subject: [PATCH] doc/Makefile.am: fix up broken 'make dist' The make target for creating the distribution tarball (make dist) was broken some commits ago within the changes in the doc/ subdirectory. The reason for this is that simple Doxygen has to be runs ones before the automatism can pick up the files. automake uses dist_pkgdist_DATA as trigger. So we have to use that variable. Changing up the makefile template so the call for 'dist_pkgdist_DATA' *and* 'all-local' is calling 'doxfile.stamp' so fist Doxygen is running. By doing this also clean up a little bit and prepare the build for be able to run out of the tree. --- doc/Makefile.am | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index b568ef05..af754ac4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -9,25 +9,26 @@ # We can only perfom the targets in this directory if doxygen is present. if HAVE_DOXYGEN -directory = $(builddir)/html -dist_man_MANS = $(directory)/html -$(directory)/html: doxyfile.stamp - $(directory): doxyfile.stamp +dist_pkgdata_DATA = doxyfile.stamp + +CLEANFILES = \ + doxyfile.stamp \ + doxygen_sqlite3.db doxyfile.stamp: $(DOXYGEN) Doxyfile echo Timestamp > doxyfile.stamp -CLEANFILES = doxyfile.stamp doxygen_sqlite3.db - all-local: doxyfile.stamp clean-local: - rm -rf $(directory) + rm -rf $(srcdir)/html -install-exec-am: all-local +install-data-am: all-local $(MKDIR_P) $(htmldir)/html || exit 1 - cp -a $(directory) $(htmldir) + cp -a $(srcdir)/html $(htmldir) + +.PHONY: doxyfile.stamp endif # HAVE_DOXYGEN