https://svn.lrde.epita.fr/svn/oln/trunk/milena

This is just a fix. There's still some work to do there (see https://trac.lrde.org/olena/ticket/134).

Index: ChangeLog from Roland Levillain roland@lrde.epita.fr

Have the documentation compile again with parallel builds.

* doc/Makefile.am (html-local, html_user): Fix paths. (Doxyfile): Likewise. Use information from Milena's ChangeLog, not from the top-most ChangeLog.

Makefile.am | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)

Index: doc/Makefile.am --- doc/Makefile.am (revision 1701) +++ doc/Makefile.am (working copy) @@ -1,3 +1,5 @@ +# FIXME: To be overhauled! (See ticket #134). + DOXYGEN = doxygen

.PHONY: doc user-doc internal-doc html html_user @@ -10,10 +12,10 @@

html-local: Doxyfile - $(DOXYGEN) $(srcdir)/Doxyfile_internal + $(DOXYGEN) Doxyfile_internal

-html_user:: Doxyfile - $(DOXYGEN) $(srcdir)/Doxyfile_user +html_user: Doxyfile + $(DOXYGEN) Doxyfile_user

edit = sed -e "s|@ID@|$$Id|" \ @@ -22,6 +24,10 @@ -e 's,@top_builddir@,$(top_builddir),g' \ -e 's,@top_srcdir@,$(top_srcdir),g'

+# FIXME: This is not good. We should set these parameters for both +# documentation (internal and user) using @VARIABLES@. Don't generate +# Doxyfile_user from Doxyfile_internal! Both should be a product +# derived from a single source, Doxyfile.in. edit_user = sed -e 's,OUTPUT_DIRECTORY = ./internal/,OUTPUT_DIRECTORY = ./user/,g' \ -e 's,EXTRACT_ALL = YES,EXTRACT_ALL = NO,g' \ -e 's,EXTRACT_PRIVATE = YES,EXTRACT_PRIVATE = NO,g' \ @@ -44,10 +50,10 @@ # configure, because the former is way faster than the latter. # Moreover, this file is updated whenever ChangeLog is touched: using # sed instead of configure saves us a lot of time. -Doxyfile: $(top_srcdir)/ChangeLog $(srcdir)/Doxyfile.in - Id=`grep '^$$Id' $(top_srcdir)/ChangeLog`; \ - $(edit) $(srcdir)/Doxyfile.in >Doxyfile_internal; \ - $(edit_user) $(srcdir)/Doxyfile_internal >Doxyfile_user +Doxyfile: $(top_srcdir)/milena/ChangeLog $(srcdir)/Doxyfile.in + Id=`grep '^$$Id' $(top_srcdir)/milena/ChangeLog`; \ + $(edit) $(srcdir)/Doxyfile.in >Doxyfile_internal && \ + $(edit_user) Doxyfile_internal >Doxyfile_user

clean-local: rm -rf internal user