* doc/white_paper/Makefile.am: Rename as... * doc/white_paper/white_paper.mk: ...this. Adjust. * doc/Makefile.am: Include $(srcdir)/white_paper/white_paper.mk. (SUBDIRS): Remove white_paper. (white-paper-pdf, white-paper-html): Remove (phony) targets. --- milena/ChangeLog | 11 ++++ milena/doc/Makefile.am | 10 +--- .../white_paper/{Makefile.am => white_paper.mk} | 57 +++++++++++--------- 3 files changed, 44 insertions(+), 34 deletions(-) rename milena/doc/white_paper/{Makefile.am => white_paper.mk} (62%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4d4db05..89fa68f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2010-03-03 Roland Levillain <roland@lrde.epita.fr> + Stop make from recurring in doc/white_paper. + + * doc/white_paper/Makefile.am: Rename as... + * doc/white_paper/white_paper.mk: ...this. + Adjust. + * doc/Makefile.am: Include $(srcdir)/white_paper/white_paper.mk. + (SUBDIRS): Remove white_paper. + (white-paper-pdf, white-paper-html): Remove (phony) targets. + +2010-03-03 Roland Levillain <roland@lrde.epita.fr> + Stop make from recurring in doc/technical. * doc/technical/Makefile.am: Rename as... diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index d3a94cd..c0d53f0 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -21,8 +21,7 @@ include $(top_srcdir)/milena/doc/doc.mk SUBDIRS = \ - examples \ - white_paper + examples DOXYGEN = doxygen @@ -37,7 +36,6 @@ CLEANFILES = doc-pdf doc-html doc-devel-pdf doc-devel-html \ ref-doc-pdf ref-doc-html \ ref-doc-devel-pdf ref-doc-devel-html \ - white-paper-pdf white-paper-html \ examples data-regen fig-convert @@ -129,11 +127,7 @@ include $(srcdir)/tutorial/tutorial.mk ## White Paper. ## ## ------------- ## -white-paper-pdf: - cd white_paper && $(MAKE) $(AM_MAKEFLAGS) $@ - -white-paper-html: - cd white_paper && $(MAKE) $(AM_MAKEFLAGS) $@ +include $(srcdir)/white_paper/white_paper.mk ## ----------------- ## ## Reference Guide. ## diff --git a/milena/doc/white_paper/Makefile.am b/milena/doc/white_paper/white_paper.mk similarity index 62% rename from milena/doc/white_paper/Makefile.am rename to milena/doc/white_paper/white_paper.mk index 24d619d..0b75c44 100644 --- a/milena/doc/white_paper/Makefile.am +++ b/milena/doc/white_paper/white_paper.mk @@ -1,3 +1,5 @@ +# -*- Automake -*- + # Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. @@ -15,15 +17,17 @@ # along with Olena. If not, see <http://www.gnu.org/licenses/>. # -include $(top_srcdir)/milena/doc/doc.mk +.PHONY: white-paper white-paper-html white-paper-pdf + +white_paper_dir = $(doc_dir)/white_paper -TEXINPUTS=$(DOC_SRCDIR):$(srcdir): +white_paper_TEXINPUTS = $(DOC_SRCDIR):$(white_paper_dir): -PNGS = \ - figures/house.png \ - figures/house_rag.png \ - figures/house_wshed.png \ - figures/house_wshed_mean_colors.png +PNGS = \ + $(white_paper_dir)/figures/house.png \ + $(white_paper_dir)/figures/house_rag.png \ + $(white_paper_dir)/figures/house_wshed.png \ + $(white_paper_dir)/figures/house_wshed_mean_colors.png EPSS = $(PNGS:png=eps) @@ -33,11 +37,8 @@ EPSS = $(PNGS:png=eps) convert $< $@ -.PHONY: white-paper white-paper-html white-paper-pdf - white-paper: white-paper-pdf white-paper-html - # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: # @@ -62,37 +63,41 @@ white-paper: white-paper-pdf white-paper-html # product is a directory, also refresh a timestamp (in the source # dir). -WHITE_PAPER_HTML = $(srcdir)/white_paper_html/index.html +# FIXME: Use texi2dvi/TeX4ht instead of plain hevea. +WHITE_PAPER_HTML = $(white_paper_dir)/white_paper_html/index.html white-paper-html: $(WHITE_PAPER_HTML) -$(WHITE_PAPER_HTML): white_paper.tex $(EPSS) - test -d $(srcdir)/white_paper_html || mkdir $(srcdir)/white_paper_html - TEXINPUTS=$(TEXINPUTS) hevea -O -fix $< -o $@ - $(top_srcdir)/milena/doc/tools/clearbanner.sh $@ +$(WHITE_PAPER_HTML): $(white_paper_dir)/white_paper.tex $(EPSS) + test -d $(white_paper_dir)/white_paper_html \ + || mkdir $(white_paper_dir)/white_paper_html + TEXINPUTS=$(white_paper_TEXINPUTS) hevea -O -fix $< -o $@ + $(doc_dir)/tools/clearbanner.sh $@ -WHITE_PAPER_PDF = $(srcdir)/white_paper.pdf +WHITE_PAPER_PDF = $(white_paper_dir)/white_paper.pdf white-paper-pdf: $(WHITE_PAPER_PDF) -$(WHITE_PAPER_PDF): white_paper.tex $(PNGS) - TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - test "$(top_srcdir)" == "$(top_builddir)" \ - || mv -f white_paper.pdf $(srcdir) +$(WHITE_PAPER_PDF): $(white_paper_dir)/white_paper.tex $(PNGS) + TEXINPUTS=$(white_paper_TEXINPUTS) pdflatex $< + TEXINPUTS=$(white_paper_TEXINPUTS) pdflatex $< + TEXINPUTS=$(white_paper_TEXINPUTS) pdflatex $< \ + test "x$(white_paper_dir)" != x. \ + && mv -f white_paper.pdf $(white_paper_dir) -dist_doc_DATA = \ +dist_doc_DATA += \ $(WHITE_PAPER_HTML) \ $(WHITE_PAPER_PDF) -EXTRA_DIST = \ - white_paper.tex \ +EXTRA_DIST += \ + $(white_paper_dir)/white_paper.tex \ $(PNGS) \ $(EPSS) -CLEANFILES = \ +# FIXME: Remove unnecessary patterns. +CLEANFILES += \ white_paper_image.* \ white_paper.pdf \ *.log *.idx *.out *.aux +# FIXME: Likewise. clean-local: -rm -rf white_paper_html figures -- 1.5.6.5