Stefano Lattarini <[email protected]> wrote: > Hi Tim. Just a minor nit w.r.t. make portability ...
>> --- a/doc/local.mk >> +++ b/doc/local.mk >> @@ -124,7 +124,7 @@ DOXYGEN = doxygen >> doc: html >> html-local: doc/Doxyfile >> - $(AM_V_GEN) cd doc && $(DOXYGEN) >> + $(AM_V_GEN) $(DOXYGEN) $< > My understanding is that currently the bison build system strives to > be portable to non-GNU make implementations as well, in which case the > '$<' automatic variable should be considered unusable outside suffix > rules; you should spell out the target name explicitly. > [...] I don't know about Bison, but it wasn't my intention :-). Attached a new version. I thought about whether autoconf/automake could warn about these instances, but are included makefiles parsed at all? Tim
>From a6bcd1a4e8cb1d5137c174b87817cb786c645d44 Mon Sep 17 00:00:00 2001 From: Tim Landscheidt <[email protected]> Date: Tue, 27 Mar 2012 19:28:02 +0000 Subject: [PATCH] Fix Doxygen generation and clean-up. * doc/Doxyfile.in: Amend OUTPUT_DIRECTORY. * doc/local.mk (html-local): Amend working directory. (CLEANDIRS): Fix "html", remove "latex". --- doc/Doxyfile.in | 2 +- doc/local.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index b813d80..1fa2e2b 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -30,7 +30,7 @@ PROJECT_NUMBER = "@PACKAGE_VERSION@" # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = . +OUTPUT_DIRECTORY = @top_builddir@/doc # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this diff --git a/doc/local.mk b/doc/local.mk index 09c387a..513e548 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -124,7 +124,7 @@ DOXYGEN = doxygen doc: html html-local: doc/Doxyfile - $(AM_V_GEN) cd doc && $(DOXYGEN) + $(AM_V_GEN) $(DOXYGEN) doc/Doxyfile edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ @@ -138,4 +138,4 @@ CLEANFILES += doc/Doxyfile doc/Doxyfile: $(top_srcdir)/doc/Doxyfile.in $(AM_V_GEN) $(edit) $(top_srcdir)/doc/Doxyfile.in >doc/Doxyfile -CLEANDIRS += html latex +CLEANDIRS += doc/html -- 1.6.2.5
