26 Jun
2009
26 Jun
'09
4:33 p.m.
* doc/Makefile.am
(EXTRA_DEPS)
(USER_REFMAN_PDF, USER_REFMAN_HTML)
(DEVEL_REFMAN_PDF, DEVEL_REFMAN_HTML):
Prepend $(srcdir) to each path.
($(srcdir)/tutorial/tutorial.hh, $(srcdir)/ref_guide/ref_guide.hh)
($(USER_REFMAN_PDF), $(USER_REFMAN_HTML))
($(DEVEL_REFMAN_PDF), $(DEVEL_REFMAN_HTML))
($(srcdir)/figures.stamp, fake-doc)
Adjust actions.
(edit): Substitute @srcdir@ and @builddir@ as well.
(edit_user): Prepend $(srcdir) to each path.
(Doxyfile_user, Doxyfile_user_pdf)
(Doxyfile_devel, Doxyfile_devel_pdf):
Rename targets as...
($(srcdir)/Doxyfile_user, $(srcdir)/Doxyfile_user_pdf)
($(srcdir)/Doxyfile_devel, $(srcdir)/Doxyfile_devel_pdf):
...these.
* doc/doc.mk (DOC_BUILDDIR, OUTPUTS_BUILDDIR)
(SPLIT_OUTPUTS_BUILDDIR, FIGURES_BUILDDIR, EXAMPLES_BUILDDIR)
(SPLIT_EXAMPLES_BUILDDIR):
Remove variables.
Add missing copyright header.
* doc/Doxyfile.in (OUTPUT_DIRECTORY): Set to @srcdir@/devel/.
* doc/examples/Makefile.am (CLEANFILES): New.
Add $(EXTRA_PROGRAMS)
(run-examples, diff-data, split-examples, split-outputs):
Adjust actions to generate products in the source tree.
(clean-local, clean-figures): Disable actions.
* doc/ref_guide/Makefile.am (TEXINPUTS): Remove $(DOC_BUILDDIR).
($(REF_GUIDE_HH)): Adjust the action to generate the target in the
source tree.
* doc/tutorial/Makefile.am (TEXINPUTS): Remove $(DOC_BUILDDIR).
($(TUTORIAL_HH)): Adjust the action to generate the target in the
source tree.
---
milena/ChangeLog | 40 +++++++++++++
milena/doc/Doxyfile.in | 2 +-
milena/doc/Makefile.am | 115 ++++++++++++++++++++-----------------
milena/doc/doc.mk | 32 ++++++++---
milena/doc/examples/Makefile.am | 44 ++++++++-------
milena/doc/ref_guide/Makefile.am | 4 +-
milena/doc/tutorial/Makefile.am | 5 +-
7 files changed, 154 insertions(+), 88 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 6b982e0..577dbac 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,45 @@
2009-06-26 Roland Levillain <roland(a)lrde.epita.fr>
+ Generate the documentation in the source tree.
+
+ * doc/Makefile.am
+ (EXTRA_DEPS)
+ (USER_REFMAN_PDF, USER_REFMAN_HTML)
+ (DEVEL_REFMAN_PDF, DEVEL_REFMAN_HTML):
+ Prepend $(srcdir) to each path.
+ ($(srcdir)/tutorial/tutorial.hh, $(srcdir)/ref_guide/ref_guide.hh)
+ ($(USER_REFMAN_PDF), $(USER_REFMAN_HTML))
+ ($(DEVEL_REFMAN_PDF), $(DEVEL_REFMAN_HTML))
+ ($(srcdir)/figures.stamp, fake-doc)
+ Adjust actions.
+ (edit): Substitute @srcdir@ and @builddir@ as well.
+ (edit_user): Prepend $(srcdir) to each path.
+ (Doxyfile_user, Doxyfile_user_pdf)
+ (Doxyfile_devel, Doxyfile_devel_pdf):
+ Rename targets as...
+ ($(srcdir)/Doxyfile_user, $(srcdir)/Doxyfile_user_pdf)
+ ($(srcdir)/Doxyfile_devel, $(srcdir)/Doxyfile_devel_pdf):
+ ...these.
+ * doc/doc.mk (DOC_BUILDDIR, OUTPUTS_BUILDDIR)
+ (SPLIT_OUTPUTS_BUILDDIR, FIGURES_BUILDDIR, EXAMPLES_BUILDDIR)
+ (SPLIT_EXAMPLES_BUILDDIR):
+ Remove variables.
+ Add missing copyright header.
+ * doc/Doxyfile.in (OUTPUT_DIRECTORY): Set to @srcdir@/devel/.
+ * doc/examples/Makefile.am (CLEANFILES): New.
+ Add $(EXTRA_PROGRAMS)
+ (run-examples, diff-data, split-examples, split-outputs):
+ Adjust actions to generate products in the source tree.
+ (clean-local, clean-figures): Disable actions.
+ * doc/ref_guide/Makefile.am (TEXINPUTS): Remove $(DOC_BUILDDIR).
+ ($(REF_GUIDE_HH)): Adjust the action to generate the target in the
+ source tree.
+ * doc/tutorial/Makefile.am (TEXINPUTS): Remove $(DOC_BUILDDIR).
+ ($(TUTORIAL_HH)): Adjust the action to generate the target in the
+ source tree.
+
+2009-06-26 Roland Levillain <roland(a)lrde.epita.fr>
+
Help make to regen doc/figures.stamp from subdirectories of doc/.
* doc/tutorial/Makefile.am ($(srcdir)/../figures.stamp)
diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in
index 32f8e42..3fb38d3 100644
--- a/milena/doc/Doxyfile.in
+++ b/milena/doc/Doxyfile.in
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
PROJECT_NAME = "Milena (@PACKAGE_NAME@)"
PROJECT_NUMBER = "@PACKAGE_VERSION@ @ID@"
-OUTPUT_DIRECTORY = ./devel/
+OUTPUT_DIRECTORY = @srcdir@/devel/
CREATE_SUBDIRS = YES
OUTPUT_LANGUAGE = English
BRIEF_MEMBER_DESC = YES
diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am
index 47064b3..56ba551 100644
--- a/milena/doc/Makefile.am
+++ b/milena/doc/Makefile.am
@@ -57,61 +57,82 @@ doc-devel-html: tutorial-html ref-guide-html white-paper-html \
ref-doc-devel-html
+## ----------------------------------------------------------------- ##
+## Shared dependencies on the products of tutorial/ and ref_guide/. ##
+## ----------------------------------------------------------------- ##
+
# FIXME: Maintaining dependencies across directories is too
# complicated. Simplify.
-# Shared dependencies on the products of tutorial/ and ref_guide/.
-EXTRA_DEPS = tutorial/tutorial.hh ref_guide/ref_guide.hh
-tutorial/tutorial.hh: fig-convert
- cd tutorial && $(MAKE) $(AM_MAKEFLAGS) tutorial.hh
-ref_guide/ref_guide.hh: fig-convert
- cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) ref_guide.hh
+EXTRA_DEPS = $(srcdir)/tutorial/tutorial.hh $(srcdir)/ref_guide/ref_guide.hh
+$(srcdir)/tutorial/tutorial.hh: fig-convert
+ cd tutorial && $(MAKE) $(AM_MAKEFLAGS) tutorial-html
+$(srcdir)/ref_guide/ref_guide.hh: fig-convert
+ cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) ref-guide-html
+
+## ----------------------- ##
+## Doxygen documentation. ##
+## ----------------------- ##
+
+## FIXME: We should use a stamp file and generate the documentation in
+## a temporary directory in the _build_ tree, then copy it into a
+## directory of the _source_ tree. See how this is implemented in
+## Vaucanson's doc build system. (Do not forget to adjust Doxyfiles.)
# Doxygen PDF documentation outputs.
-USER_REFMAN_PDF = user/latex/refman.pdf
+USER_REFMAN_PDF = $(srcdir)/user/latex/refman.pdf
ref-doc-pdf: $(USER_REFMAN_PDF)
# FIXME: Split in two rules: one generating the LaTeX file from the
# Doxyfile, and another one generating the PDF from the LaTeX source.
# Moreover, the LaTeX to PDF rule could be factored using a suffix
# rule (as in LRDE's share/).
-$(USER_REFMAN_PDF): Doxyfile_user_pdf $(srcdir)/figures.stamp $(EXTRA_DEPS)
+$(USER_REFMAN_PDF): $(srcdir)/Doxyfile_user_pdf $(srcdir)/figures.stamp $(EXTRA_DEPS)
$(DOXYGEN) $<
- cd user/latex && make pdf
+ cd $(srcdir)/user/latex && $(MAKE) pdf
-USER_REFMAN_HTML = user/html
+USER_REFMAN_HTML = $(srcdir)/user/html
ref-doc-html: $(USER_REFMAN_HTML)
-$(USER_REFMAN_HTML): Doxyfile_user $(srcdir)/figures.stamp $(EXTRA_DEPS)
+$(USER_REFMAN_HTML): $(srcdir)/Doxyfile_user $(srcdir)/figures.stamp $(EXTRA_DEPS)
$(DOXYGEN) $<
# Doxygen HTML documentation output directories.
-DEVEL_REFMAN_PDF = devel/latex/refman.pdf
+DEVEL_REFMAN_PDF = $(srcdir)/devel/latex/refman.pdf
ref-doc-devel-pdf: $(DEVEL_REFMAN_PDF)
# FIXME: Split in two rules: one generating the LaTeX file from the
# Doxyfile, and another one generating the PDF from the LaTeX source.
# Moreover, the LaTeX to PDF rule could be factored using a suffix
# rule (as in LRDE's share/).
-$(DEVEL_REFMAN_PDF): Doxyfile_devel_pdf $(srcdir)/figures.stamp $(EXTRA_DEPS)
+$(DEVEL_REFMAN_PDF): $(srcdir)/Doxyfile_devel_pdf $(srcdir)/figures.stamp $(EXTRA_DEPS)
$(DOXYGEN) $<
- cd devel/latex && make $(AM_MAKEFLAGS)
+ cd $(srcdir)/devel/latex && $(MAKE) $(AM_MAKEFLAGS)
-DEVEL_REFMAN_HTML = devel/html
+DEVEL_REFMAN_HTML = $(srcdir)/devel/html
ref-doc-devel-html: $(DEVEL_REFMAN_HTML)
-$(DEVEL_REFMAN_HTML): Doxyfile_devel $(srcdir)/figures.stamp $(EXTRA_DEPS)
+$(DEVEL_REFMAN_HTML): $(srcdir)/Doxyfile_devel $(srcdir)/figures.stamp $(EXTRA_DEPS)
$(DOXYGEN) $<
-# Tutorial.
+## ---------- ##
+## Tutorial. ##
+## ---------- ##
+
tutorial-pdf: fig-convert
cd tutorial && $(MAKE) $(AM_MAKEFLAGS) $@
tutorial-html: fig-convert
cd tutorial && $(MAKE) $(AM_MAKEFLAGS) $@
-# White Paper.
+## ------------- ##
+## White Paper. ##
+## ------------- ##
+
white-paper-pdf:
cd white_paper && $(MAKE) $(AM_MAKEFLAGS) $@
white-paper-html:
cd white_paper && $(MAKE) $(AM_MAKEFLAGS) $@
-# Reference Guide.
+## ----------------- ##
+## Reference Guide. ##
+## ----------------- ##
+
ref-guide-pdf: fig-convert
cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) $@
@@ -130,28 +151,29 @@ fix-refdata:
fig-convert: $(srcdir)/figures.stamp
-EXTRA_DIST = $(srcdir)/figures.stamp
+EXTRA_DIST = figures.stamp
$(srcdir)/figures.stamp: $(FIGURES_SRCDIR)/*.p*m
rm -f $@.tmp
touch $@.tmp
- test -d $(FIGURES_BUILDDIR) || mkdir $(FIGURES_BUILDDIR) && \
failcom='exit 1'; \
list="$(FIGURES_SRCDIR)/*.p*m"; for img in $$list; do \
echo "Converting $$img to PNG"; \
name=`basename $$img` \
ext=`echo $$name | cut -d '.' -f 2`; \
convert -scale 250 $$img \
- $(FIGURES_BUILDDIR)/`basename $$img $$ext`png \
+ $(FIGURES_SRCDIR)/`basename $$img $$ext`png \
|| eval $$failcom; \
done
mv -f $@.tmp $@
-edit = sed -e "s|@ID@|$$Id|" \
- -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
- -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
- -e 's,@top_builddir\@,$(top_builddir),g' \
- -e 's,@top_srcdir\@,$(top_srcdir),g'
+edit = sed -e "s|@ID@|$$Id|" \
+ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ -e 's,@top_srcdir\@,$(top_srcdir),g' \
+ -e 's,@top_builddir\@,$(top_builddir),g' \
+ -e 's,@srcdir\@,$(srcdir),g' \
+ -e 's,@builddir\@,$(builddir),g'
edit_pdf = sed -e 's,GENERATE_LATEX = NO,GENERATE_LATEX = YES,g' \
-e 's,GENERATE_HTML = YES,GENERATE_HTML = NO,g'
@@ -161,7 +183,7 @@ edit_pdf = sed -e 's,GENERATE_LATEX = NO,GENERATE_LATEX =
YES,g' \
# Doxyfile_user from Doxyfile_devel! Both should be a product
# derived from a single source, Doxyfile.in.
edit_user = sed \
- -e 's,OUTPUT_DIRECTORY = ./devel/,OUTPUT_DIRECTORY = ./user/,g' \
+ -e 's,OUTPUT_DIRECTORY = @srcdir@/devel/,OUTPUT_DIRECTORY =
@srcdir@/user/,g' \
-e 's,EXTRACT_ALL = YES,EXTRACT_ALL = NO,g' \
-e 's,EXTRACT_PRIVATE = YES,EXTRACT_PRIVATE = NO,g' \
-e 's,EXTRACT_STATIC = YES,EXTRACT_STATIC = NO,g' \
@@ -244,18 +266,18 @@ CLEANFILES = \
# Sed is used to generate Doxyfile from Doxyfile.in instead of
# configure, because the former is way faster than the latter.
-Doxyfile_user: Doxyfile_devel
+$(srcdir)/Doxyfile_user: Doxyfile_devel
$(edit_user) $< >$@
-Doxyfile_user_pdf: Doxyfile_user
+$(srcdir)/Doxyfile_user_pdf: Doxyfile_user
$(edit_pdf) $< >$@
-Doxyfile_devel: $(srcdir)/Doxyfile.in
+$(srcdir)/Doxyfile_devel: $(srcdir)/Doxyfile.in
Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \
| sed -e 's/\\\$$//g'`; \
$(edit) $< >$@
-Doxyfile_devel_pdf: Doxyfile_devel
+$(srcdir)/Doxyfile_devel_pdf: Doxyfile_devel
$(edit_pdf) $< >$@
@@ -264,35 +286,22 @@ Doxyfile_devel_pdf: Doxyfile_devel
# developers who want to check the distribution mechanism, for
# generating the Doxygen documentation make take up to 1 hour.
#
-# A few remarks. Refreshing the contents of EXTRA_DIST using
-#
-# touch $(EXTRA_DIST)
-#
-# just does not work, as EXTRA_DIST lists source and built files
-# (resp. in srcdir and buidldir). Cheat: go to srcdir and strip the
-# srcdir prefix from path of every file listed in EXTRA_DIST. And we
-# have to prune the built files (e.g. `Doxyfile_user_pdf').
-#
-# We also selectively refresh files by hand in a certain order (some
+# We selectively refresh files by hand in a certain order (some
# of them being already listed in EXTRA_DIST), to satisfy the
# dependencies.
.PHONY: fake-doc
fake-doc:
- cd $(srcdir) \
- && touch `echo $(EXTRA_DIST) \
- | sed -e 's!$(srcdir)/!!g' \
- -e 's/Doxyfile_user_pdf//g' \
- -e 's/Doxyfile_user//g' `
+ cd $(srcdir) && touch $(EXTRA_DIST)
cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) $@
cd tutorial && $(MAKE) $(AM_MAKEFLAGS) $@
cd white_paper && $(MAKE) $(AM_MAKEFLAGS) $@
touch $(EXTRA_DEPS)
- touch Doxyfile_devel
- touch Doxyfile_devel_pdf
- touch Doxyfile_user
- touch Doxyfile_user_pdf
- test -d user || mkdir user
- for d in $(USER_REFMAN_HTML) user/latex; do \
+ touch $(srcdir)/Doxyfile_devel
+ touch $(srcdir)/Doxyfile_devel_pdf
+ touch $(srcdir)/Doxyfile_user
+ touch $(srcdir)/Doxyfile_user_pdf
+ cd $(srcdir) && test -d user || mkdir user
+ for d in $(USER_REFMAN_HTML) $(srcdir)/user/latex; do \
if test -d $$d; then touch $$d; else mkdir $$d; fi; \
done
touch $(USER_REFMAN_PDF)
diff --git a/milena/doc/doc.mk b/milena/doc/doc.mk
index 822717e..abc1c12 100644
--- a/milena/doc/doc.mk
+++ b/milena/doc/doc.mk
@@ -1,10 +1,31 @@
-## FIXME: Revamp (see Olena 0.11's test suite). -*- Automake -*-
+# -*- Automake -*-
+
+# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+#
+# This file is part of Olena.
+#
+# Olena is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, version 2 of the License.
+#
+# Olena is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Olena. If not, see <http://www.gnu.org/licenses/>.
include $(top_srcdir)/milena/tests/tests.mk
AM_CPPFLAGS += -I$(top_srcdir)/milena/doc/tutorial/tools
-
+## FIXME: Upercase variables should be reserved for special names:
+## classical Make variables (e.g. `CXXFLAGS') Automake variables
+## (e.g. `SUBDIRS'), etc.
+##
+## Moreover, do we really need all these variables? See how things
+## evolve during the refurbishing of the build system in doc/.
DOC_SRCDIR = $(top_srcdir)/milena/doc
OUTPUTS_SRCDIR = $(DOC_SRCDIR)/outputs
SPLIT_OUTPUTS_SRCDIR = $(OUTPUTS_SRCDIR)/split
@@ -12,10 +33,3 @@ FIGURES_SRCDIR = $(DOC_SRCDIR)/figures
EXAMPLES_SRCDIR = $(DOC_SRCDIR)/examples
SPLIT_EXAMPLES_SRCDIR = $(EXAMPLES_SRCDIR)/split
IMG_SRCDIR = $(DOC_SRCDIR)/img
-
-DOC_BUILDDIR = $(top_builddir)/milena/doc
-OUTPUTS_BUILDDIR = $(DOC_BUILDDIR)/outputs
-SPLIT_OUTPUTS_BUILDDIR = $(OUTPUTS_BUILDDIR)/split
-FIGURES_BUILDDIR = $(DOC_BUILDDIR)/figures
-EXAMPLES_BUILDDIR = $(DOC_BUILDDIR)/examples
-SPLIT_EXAMPLES_BUILDDIR = $(EXAMPLES_BUILDDIR)/split
diff --git a/milena/doc/examples/Makefile.am b/milena/doc/examples/Makefile.am
index 3ba5630..a0d812a 100644
--- a/milena/doc/examples/Makefile.am
+++ b/milena/doc/examples/Makefile.am
@@ -79,6 +79,7 @@ EXTRA_PROGRAMS += \
tuto4_point2d \
tuto4_site_set_create
+CLEANFILES = $(EXTRA_PROGRAMS)
accu_right_instanciation_SOURCES = accu-right-instanciation.cc
borderthickness_SOURCES = borderthickness.cc
@@ -142,40 +143,39 @@ tuto4_point2d_SOURCES = tuto4/point2d.cc
examples: $(EXTRA_PROGRAMS)
run-examples: examples
- mkdir -p $(OUTPUTS_BUILDDIR)
- mkdir -p $(FIGURES_BUILDDIR)
@failcom='exit 1'; \
list='$(noinst_PROGRAMS)'; for bin in $$list; do \
echo "Running $$bin"; \
- ./$$bin > $(OUTPUTS_BUILDDIR)/$$bin.txt || eval $$failcom; \
+ ./$$bin > $(OUTPUTS_SRCDIR)/$$bin.txt || eval $$failcom; \
done
-
+## FIXME: This is wrong. Make is not an imperative language, and this
+## rule probably does not work as expected.
data-regen: examples run-examples split-examples split-outputs diff-data
diff-data: run-examples split-examples
@failcom='exit 1'; \
has_txt_diff=""; \
- txtlist="$(OUTPUTS_BUILDDIR)/*.txt"; for txt in $$txtlist; do \
+ txtlist="$(OUTPUTS_SRCDIR)/*.txt"; for txt in $$txtlist; do \
echo "Diff `basename $$txt`"; \
diff $$txt $(OUTPUTS_SRCDIR)/`basename $$txt` >/dev/null 2>&1 \
|| has_txt_diff="$$has_txt_diff `basename $$txt`"; \
done; \
has_fig_diff=""; \
- figlist="$(FIGURES_BUILDDIR)/*.p*m"; for fig in $$figlist; do \
+ figlist="$(FIGURES_SRCDIR)/*.p*m"; for fig in $$figlist; do \
echo "Diff `basename $$fig`"; \
diff $$fig $(FIGURES_SRCDIR)/`basename $$fig` >/dev/null 2>&1 \
|| has_fig_diff="$$has_fig_diff `basename $$fig`"; \
done; \
has_split_out_diff=""; \
- split_outlist="$(SPLIT_OUTPUTS_BUILDDIR)/*"; for split_out in $$split_outlist;
do \
+ split_outlist="$(SPLIT_OUTPUTS_SRCDIR)/*"; for split_out in $$split_outlist;
do \
echo "Diff `basename $$split_out`"; \
diff $$split_out $(SPLIT_OUTPUTS_SRCDIR)/`basename $$split_out` >/dev/null
2>&1 \
|| has_split_out_diff="$$has_split_out_diff `basename $$split_out`"; \
done; \
has_split_ex_diff=""; \
- split_exlist="$(SPLIT_EXAMPLES_BUILDDIR)/*"; for split_ex in $$split_exlist;
do \
+ split_exlist="$(SPLIT_EXAMPLES_SRCDIR)/*"; for split_ex in $$split_exlist; do
\
echo "Diff `basename $$split_ex`"; \
diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null
2>&1 \
|| has_split_ex_diff="$$has_split_ex_diff `basename $$split_ex`"; \
@@ -222,22 +222,22 @@ reference or their reference file does not exist:"; \
fix-refdata:
@failcom='exit 1'; \
- txtlist="$(OUTPUTS_BUILDDIR)/*.txt"; for txt in $$txtlist; do \
+ txtlist="$(OUTPUTS_SRCDIR)/*.txt"; for txt in $$txtlist; do \
diff $$txt $(OUTPUTS_SRCDIR)/`basename $$txt` >/dev/null 2>&1 \
|| echo "Updating reference file for $$txt"; \
cp $$txt $(OUTPUTS_SRCDIR); \
done; \
- figlist="$(FIGURES_BUILDDIR)/*.p*m"; for fig in $$figlist; do \
+ figlist="$(FIGURES_SRCDIR)/*.p*m"; for fig in $$figlist; do \
diff $$fig $(FIGURES_SRCDIR)/`basename $$fig` >/dev/null 2>&1 \
|| echo "Updating reference file for $$fig"; \
cp $$fig $(FIGURES_SRCDIR); \
done; \
- split_outlist="$(SPLIT_OUTPUTS_BUILDDIR)/*.txt"; for split_out in
$$split_outlist; do \
+ split_outlist="$(SPLIT_OUTPUTS_SRCDIR)/*.txt"; for split_out in
$$split_outlist; do \
diff $$split_out $(SPLIT_OUTPUTS_SRCDIR)/`basename $$split_out` >/dev/null
2>&1 \
|| echo "Updating reference file for $$split_out"; \
cp $$split_out $(SPLIT_OUTPUTS_SRCDIR); \
done; \
- split_exlist="$(SPLIT_EXAMPLES_BUILDDIR)/*.cc"; for split_ex in
$$split_exlist; do \
+ split_exlist="$(SPLIT_EXAMPLES_SRCDIR)/*.cc"; for split_ex in $$split_exlist;
do \
diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null
2>&1 \
|| echo "Updating reference file for $$split_ex"; \
cp $$split_ex $(SPLIT_EXAMPLES_SRCDIR); \
@@ -245,24 +245,28 @@ fix-refdata:
split-examples:
- test -d $(SPLIT_EXAMPLES_BUILDDIR) || mkdir $(SPLIT_EXAMPLES_BUILDDIR)
+ test -d $(SPLIT_EXAMPLES_SRCDIR) || mkdir $(SPLIT_EXAMPLES_SRCDIR)
@failcom='exit 1'; \
list=`find $(EXAMPLES_SRCDIR) -type f -name '*.cc'`; for file in $$list; do \
- $(DOC_SRCDIR)/tools/split_sample.sh $$file cc $(SPLIT_EXAMPLES_BUILDDIR)\
+ $(DOC_SRCDIR)/tools/split_sample.sh $$file cc $(SPLIT_EXAMPLES_SRCDIR)\
|| eval $$failcom; \
done
split-outputs:
- test -d $(SPLIT_OUTPUTS_BUILDDIR) || mkdir $(SPLIT_OUTPUTS_BUILDDIR)
+ test -d $(SPLIT_OUTPUTS_SRCDIR) || mkdir $(SPLIT_OUTPUTS_SRCDIR)
@failcom='exit 1'; \
- list='$(OUTPUTS_BUILDDIR)/*.txt'; for file in $$list; do \
- $(DOC_SRCDIR)/tools/split_sample.sh $$file txt $(SPLIT_OUTPUTS_BUILDDIR)\
+ list='$(OUTPUTS_SRCDIR)/*.txt'; for file in $$list; do \
+ $(DOC_SRCDIR)/tools/split_sample.sh $$file txt $(SPLIT_OUTPUTS_SRCDIR)\
|| eval $$failcom; \
done
+## FIXME: Generated products recored in the repository should be
+## listed in MAINTAINERCLEANFILES.
clean-local: clean-figures
- rm -Rf $(OUTPUTS_BUILDDIR)
- rm -f $(EXAMPLES_BUILDDIR)/*.cc
+## rm -Rf $(OUTPUTS_BUILDDIR)
+## rm -f $(EXAMPLES_BUILDDIR)/*.cc
+## FIXME: Generated products recored in the repository should be
+## listed in MAINTAINERCLEANFILES.
clean-figures:
- rm -Rf $(FIGURES_BUILDDIR)
+## rm -Rf $(FIGURES_BUILDDIR)
diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am
index 6564d5c..5e19d99 100644
--- a/milena/doc/ref_guide/Makefile.am
+++ b/milena/doc/ref_guide/Makefile.am
@@ -19,7 +19,7 @@
include $(top_srcdir)/milena/doc/doc.mk
-TEXINPUTS ="$(DOC_SRCDIR):$(DOC_BUILDDIR):$(OUTPUTS_SRCDIR):\
+TEXINPUTS ="$(DOC_SRCDIR):$(OUTPUTS_SRCDIR):\
$(SPLIT_OUTPUTS_SRCDIR):$(IMG_SRCDIR):$(SPLIT_EXAMPLES_SRCDIR):"
@@ -36,7 +36,7 @@ REF_GUIDE_HH = ref_guide.hh
ref-guide-html: $(REF_GUIDE_HH)
$(REF_GUIDE_HH): ref_guide.tex $(srcdir)/../figures.stamp
$(DOC_SRCDIR)/tools/todoxygen.sh \
- $< $(DOC_BUILDDIR)/ref_guide $(DOC_SRCDIR)
+ $< $(DOC_SRCDIR)/ref_guide $(DOC_SRCDIR)
# Final product.
diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am
index 0fb2333..e49f201 100644
--- a/milena/doc/tutorial/Makefile.am
+++ b/milena/doc/tutorial/Makefile.am
@@ -19,7 +19,7 @@
include $(top_srcdir)/milena/doc/doc.mk
-TEXINPUTS = $(DOC_SRCDIR):$(DOC_BUILDDIR):$(OUTPUTS_SRCDIR):$(IMG_SRCDIR):
+TEXINPUTS = $(DOC_SRCDIR):$(OUTPUTS_SRCDIR):$(IMG_SRCDIR):
tutorial: tutorial-html tutorial-pdf
@@ -34,8 +34,7 @@ TUTORIAL_HH = tutorial.hh
tutorial-html: $(TUTORIAL_HH)
$(TUTORIAL_HH): tutorial.tex $(srcdir)/../figures.stamp
$(DOC_SRCDIR)/tools/todoxygen.sh \
- $< $(DOC_BUILDDIR)/tutorial $(DOC_SRCDIR)
-
+ $< $(DOC_SRCDIR)/tutorial $(DOC_SRCDIR)
# Final product.
TUTORIAL_PDF = tutorial.pdf
--
1.6.3.1