March 2010 - Olena-patches

last-svn-commit-15-gcde21c2 Tell Git to ignore files generated in milena/doc/white_paper/figures/.
by Roland Levillain 03 Mar '10

03 Mar '10

--- milena/doc/.gitignore | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/milena/doc/.gitignore b/milena/doc/.gitignore index 3f4a603..8670dd7 100644 --- a/milena/doc/.gitignore +++ b/milena/doc/.gitignore @@ -23,6 +23,10 @@ /tutorial/tutorial.pdf /user-refman-html /user-refman.pdf +/white_paper/figures/house.eps +/white_paper/figures/house_rag.eps +/white_paper/figures/house_wshed.eps +/white_paper/figures/house_wshed_mean_colors.eps /white_paper/white_paper_html/index.haux /white_paper/white_paper_html/index.html /white_paper/white_paper_html/index.html-e -- 1.5.6.5

1 0

last-svn-commit-14-g32e9532 configure.ac: Do not configure milena/doc/white_paper/Makefile.
by Roland Levillain 03 Mar '10

03 Mar '10

--- ChangeLog | 4 ++++ configure.ac | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 500a0d0..77ea1a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Do not configure milena/doc/white_paper/Makefile. + +2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Do not configure milena/doc/technical/Makefile. 2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index a15dd72..a41372c 100644 --- a/configure.ac +++ b/configure.ac @@ -252,7 +252,6 @@ AC_CONFIG_FILES([ milena/Makefile milena/doc/Makefile milena/doc/examples/Makefile - milena/doc/white_paper/Makefile milena/mesh/Makefile ]) -- 1.5.6.5

1 0

last-svn-commit-13-g3fbbba2 Stop make from recurring in doc/white_paper.
by Roland Levillain 03 Mar '10

03 Mar '10

* 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(a)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(a)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

1 0

last-svn-commit-12-g203f31e Tell Git to ignore files generated in milena/doc/technical/.
by Roland Levillain 03 Mar '10

03 Mar '10

--- milena/doc/.gitignore | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/milena/doc/.gitignore b/milena/doc/.gitignore index c0b9abd..3f4a603 100644 --- a/milena/doc/.gitignore +++ b/milena/doc/.gitignore @@ -11,6 +11,11 @@ /ref_guide/ref_guide.html /ref_guide/ref_guide.htoc /ref_guide/ref_guide.pdf +/technical/technical.haux +/technical/technical.hh +/technical/technical.hh-e +/technical/technical.html +/technical/technical.pdf /tutorial/tutorial.haux /tutorial/tutorial.hh /tutorial/tutorial.hh-e -- 1.5.6.5

1 0

last-svn-commit-11-g8c6dd29 configure.ac: Do not configure milena/doc/technical/Makefile.
by Roland Levillain 03 Mar '10

03 Mar '10

--- ChangeLog | 4 ++++ configure.ac | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9abc589..500a0d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Do not configure milena/doc/technical/Makefile. + +2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Do not configure milena/doc/tutorial/Makefile. 2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index 1770b65..a15dd72 100644 --- a/configure.ac +++ b/configure.ac @@ -252,7 +252,6 @@ AC_CONFIG_FILES([ milena/Makefile milena/doc/Makefile milena/doc/examples/Makefile - milena/doc/technical/Makefile milena/doc/white_paper/Makefile milena/mesh/Makefile ]) -- 1.5.6.5

1 0

last-svn-commit-10-g7ef9ac2 Stop make from recurring in doc/technical.
by Roland Levillain 03 Mar '10

03 Mar '10

* doc/technical/Makefile.am: Rename as... * doc/technical/technical.mk: ...this. Adjust. * doc/Makefile.am: Include $(srcdir)/technical/technical.mk. (SUBDIRS): Remove technical. --- milena/ChangeLog | 10 ++++ milena/doc/Makefile.am | 7 ++- milena/doc/technical/{Makefile.am => technical.mk} | 55 +++++++++---------- 3 files changed, 42 insertions(+), 30 deletions(-) rename milena/doc/technical/{Makefile.am => technical.mk} (64%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2961cb9..4d4db05 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> + Stop make from recurring in doc/technical. + + * doc/technical/Makefile.am: Rename as... + * doc/technical/technical.mk: ...this. + Adjust. + * doc/Makefile.am: Include $(srcdir)/technical/technical.mk. + (SUBDIRS): Remove technical. + +2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> + Stop make from recurring in doc/tutorial. * doc/tutorial/Makefile.am: Rename as... diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 5482e39..d3a94cd 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -22,7 +22,6 @@ include $(top_srcdir)/milena/doc/doc.mk SUBDIRS = \ examples \ - technical \ white_paper DOXYGEN = doxygen @@ -114,6 +113,12 @@ ref-doc-devel-html: $(srcdir)/$(DEVEL_REFMAN_HTML) $(srcdir)/$(DEVEL_REFMAN_HTML): $(srcdir)/Doxyfile_devel $(srcdir)/figures.stamp $(EXTRA_DEPS) $(DOXYGEN) $< +## ------------------------- ## +## Technical Documentation. ## +## ------------------------- ## + +include $(srcdir)/technical/technical.mk + ## ---------- ## ## Tutorial. ## ## ---------- ## diff --git a/milena/doc/technical/Makefile.am b/milena/doc/technical/technical.mk similarity index 64% rename from milena/doc/technical/Makefile.am rename to milena/doc/technical/technical.mk index 3789b91..56fcf71 100644 --- a/milena/doc/technical/Makefile.am +++ b/milena/doc/technical/technical.mk @@ -1,3 +1,5 @@ +# -*- Automake -*- + # Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. @@ -15,16 +17,16 @@ # along with Olena. If not, see <http://www.gnu.org/licenses/>. # -.PHONY: technical technical-html - -include $(top_srcdir)/milena/doc/doc.mk +.PHONY: technical technical-html technical-pdf -TEXINPUTS ="$(DOC_SRCDIR):$(OUTPUTS_SRCDIR):$(srcdir):\ +technical_TEXINPUTS ="$(DOC_SRCDIR):$(OUTPUTS_SRCDIR):$(srcdir):\ $(SPLIT_OUTPUTS_SRCDIR):$(IMG_SRCDIR):$(SPLIT_EXAMPLES_SRCDIR):" technical: technical-html technical-pdf +technical_dir = $(doc_dir)/technical + # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: # @@ -55,40 +57,35 @@ technical: technical-html technical-pdf # This is not a bug: TECHNICAL_HH is meant to have a `.hh' # extension, since it is later parsed by Doxygen, which complains # about `.html' files. -TECHNICAL_HH = $(srcdir)/technical.hh +TECHNICAL_HH = $(technical_dir)/technical.hh technical-html: $(TECHNICAL_HH) -$(TECHNICAL_HH): technical.tex $(srcdir)/../figures.stamp - $(DOC_SRCDIR)/tools/todoxygen.sh \ - $< $(DOC_SRCDIR)/technical $(DOC_SRCDIR) +$(TECHNICAL_HH): $(technical_dir)/technical.tex $(doc_dir)/figures.stamp + $(doc_dir)/tools/todoxygen.sh $< $(technical_dir) $(doc_dir) # Final product. -TECHNICAL_PDF = $(srcdir)/technical.pdf +TECHNICAL_PDF = $(technical_dir)/technical.pdf technical-pdf: $(TECHNICAL_PDF) -$(TECHNICAL_PDF): technical.tex $(srcdir)/../figures.stamp - TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - test "$(top_srcdir)" == "$(top_builddir)" \ - || mv -f $(builddir)/technical.pdf $(srcdir) +$(TECHNICAL_PDF): $(technical_dir)/technical.tex $(doc_dir)/figures.stamp + TEXINPUTS=$(technical_TEXINPUTS) pdflatex $< + TEXINPUTS=$(technical_TEXINPUTS) pdflatex $< + TEXINPUTS=$(technical_TEXINPUTS) pdflatex $< \ + test "x$(technical_dir)" != x. \ + && mv -f technical.pdf $(technical_dir) -# FIXME: Regenerating figures.stamp requires make to go back to the -# parent directory. We already do the opposite (descending from -# milena/doc/ to milena/doc/tutorial/Makefile in milena/doc/ to update -# tutorial.hh). This is not sound. We probably want to put together -# somes of these files, and maybe get rid of some directories, or at -# least move most of the Makefile machinery into -# milena/doc/Makefile.am. -$(srcdir)/../figures.stamp: - cd .. && $(MAKE) $(AM_MAKEFLAGS) fig-convert +dist_doc_DATA += $(TECHNICAL_PDF) -dist_doc_DATA = $(TECHNICAL_PDF) - -EXTRA_DIST = \ - technical.tex \ +EXTRA_DIST += \ + $(technical_dir)/technical.tex \ $(TECHNICAL_HH) -CLEANFILES = \ +# FIXME: Remove `tutorial.aux tutorial.toc tutorial.log tutorial.bbl +# tutorial.out *blg *.lot' when texi2dvi is used. +# +# FIXME: Why is $(TUTORIAL_PDF) listed here? It should be +# automatically cleaned. I'm not sure either about the rest of +# CLEANFILES. +CLEANFILES += \ technical.aux technical.toc technical.log technical.bbl technical.out \ *blg *.lot \ $(TECHNICAL_PDF) \ -- 1.5.6.5

1 0

last-svn-commit-9-g1b2886b configure.ac: Do not configure milena/doc/tutorial/Makefile.
by Roland Levillain 03 Mar '10

03 Mar '10

--- ChangeLog | 4 ++++ configure.ac | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index addc2c5..9abc589 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> + + * configure.ac: Do not configure milena/doc/tutorial/Makefile. + 2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Do not configure milena/doc/ref_guide/Makefile. diff --git a/configure.ac b/configure.ac index 4608585..1770b65 100644 --- a/configure.ac +++ b/configure.ac @@ -253,7 +253,6 @@ AC_CONFIG_FILES([ milena/doc/Makefile milena/doc/examples/Makefile milena/doc/technical/Makefile - milena/doc/tutorial/Makefile milena/doc/white_paper/Makefile milena/mesh/Makefile ]) -- 1.5.6.5

1 0

last-svn-commit-8-g37fc180 Stop make from recurring in doc/tutorial.
by Roland Levillain 03 Mar '10

03 Mar '10

* doc/tutorial/Makefile.am: Rename as... * doc/tutorial/tutorial.mk: ...this. Adjust. * doc/Makefile.am: Include $(srcdir)/tutorial/tutorial.mk. (SUBDIRS): Remove tutorial. ($(srcdir)/tutorial/tutorial.hh): Remove target. (tutorial-pdf, tutorial-html): Remove (phony) targets. --- milena/ChangeLog | 12 +++++ milena/doc/Makefile.am | 9 +--- milena/doc/tutorial/{Makefile.am => tutorial.mk} | 57 ++++++++++----------- 3 files changed, 40 insertions(+), 38 deletions(-) rename milena/doc/tutorial/{Makefile.am => tutorial.mk} (63%) diff --git a/milena/ChangeLog b/milena/ChangeLog index b340b00..2961cb9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> + + Stop make from recurring in doc/tutorial. + + * doc/tutorial/Makefile.am: Rename as... + * doc/tutorial/tutorial.mk: ...this. + Adjust. + * doc/Makefile.am: Include $(srcdir)/tutorial/tutorial.mk. + (SUBDIRS): Remove tutorial. + ($(srcdir)/tutorial/tutorial.hh): Remove target. + (tutorial-pdf, tutorial-html): Remove (phony) targets. + 2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> Stop make from recurring in doc/ref_guide. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index e79129a..5482e39 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -23,7 +23,6 @@ include $(top_srcdir)/milena/doc/doc.mk SUBDIRS = \ examples \ technical \ - tutorial \ white_paper DOXYGEN = doxygen @@ -39,7 +38,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 \ - tutorial-pdf tutorial-html \ white-paper-pdf white-paper-html \ examples data-regen fig-convert @@ -66,8 +64,6 @@ doc-devel-html: tutorial-html ref-guide-html white-paper-html \ # FIXME: Maintaining dependencies across directories is too # complicated. Simplify. 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 ## ----------------------- ## ## Doxygen documentation. ## @@ -122,10 +118,7 @@ $(srcdir)/$(DEVEL_REFMAN_HTML): $(srcdir)/Doxyfile_devel $(srcdir)/figures.stamp ## Tutorial. ## ## ---------- ## -tutorial-pdf: fig-convert - cd tutorial && $(MAKE) $(AM_MAKEFLAGS) $@ -tutorial-html: fig-convert - cd tutorial && $(MAKE) $(AM_MAKEFLAGS) $@ +include $(srcdir)/tutorial/tutorial.mk ## ------------- ## ## White Paper. ## diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/tutorial.mk similarity index 63% rename from milena/doc/tutorial/Makefile.am rename to milena/doc/tutorial/tutorial.mk index 5085633..6cc6ef4 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/tutorial.mk @@ -1,3 +1,5 @@ +# -*- Automake -*- + # Copyright (C) 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # @@ -16,15 +18,15 @@ # along with Olena. If not, see <http://www.gnu.org/licenses/>. # -.PHONY: tutorial tutorial-html - -include $(top_srcdir)/milena/doc/doc.mk +.PHONY: tutorial tutorial-html tutorial-pdf -TEXINPUTS = $(DOC_SRCDIR):$(OUTPUTS_SRCDIR):$(IMG_SRCDIR): +tutorial_TEXINPUTS = $(DOC_SRCDIR):$(OUTPUTS_SRCDIR):$(IMG_SRCDIR): tutorial: tutorial-html tutorial-pdf +tutorial_dir = $(doc_dir)/tutorial + # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: # @@ -55,44 +57,39 @@ tutorial: tutorial-html tutorial-pdf # This is not a bug: TUTORIAL_HH is meant to have a `.hh' extension, # since it is later parsed by Doxygen, which complains about `.html' # files. -TUTORIAL_HH = $(srcdir)/tutorial.hh +TUTORIAL_HH = $(tutorial_dir)/tutorial.hh tutorial-html: $(TUTORIAL_HH) -$(TUTORIAL_HH): tutorial.tex $(srcdir)/../figures.stamp - $(DOC_SRCDIR)/tools/todoxygen.sh \ - $< $(DOC_SRCDIR)/tutorial $(DOC_SRCDIR) +$(TUTORIAL_HH): $(tutorial_dir)/tutorial.tex $(doc_dir)/figures.stamp + $(doc_dir)/tools/todoxygen.sh $< $(tutorial_dir) $(doc_dir) + # Final product. -TUTORIAL_PDF = $(srcdir)/tutorial.pdf +TUTORIAL_PDF = $(tutorial_dir)/tutorial.pdf tutorial-pdf: $(TUTORIAL_PDF) -$(TUTORIAL_PDF): tutorial.tex $(srcdir)/../figures.stamp - TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - test "$(top_srcdir)" == "$(top_builddir)" \ - || mv -f tutorial.pdf $(srcdir) - -# FIXME: Regenerating figures.stamp requires make to go back to the -# parent directory. We already do the opposite (descending from -# milena/doc/ to milena/doc/tutorial/Makefile in milena/doc/ to update -# tutorial.hh). This is not sound. We probably want to put together -# somes of these files, and maybe get rid of some directories, or at -# least move most of the Makefile machinery into -# milena/doc/Makefile.am. -$(srcdir)/../figures.stamp: - cd .. && $(MAKE) $(AM_MAKEFLAGS) fig-convert +$(TUTORIAL_PDF): $(tutorial_dir)/tutorial.tex $(doc_dir)/figures.stamp + TEXINPUTS=$(tutorial_TEXINPUTS) pdflatex $< + TEXINPUTS=$(tutorial_TEXINPUTS) pdflatex $< + TEXINPUTS=$(tutorial_TEXINPUTS) pdflatex $< \ + test x"$(tutorial_dir)" != x. \ + && mv -f tutorial.pdf $(tutorial_dir) -dist_doc_DATA = $(TUTORIAL_PDF) +dist_doc_DATA += $(TUTORIAL_PDF) -EXTRA_DIST = \ - tutorial.tex \ +EXTRA_DIST += \ + $(tutorial_dir)/tutorial.tex \ $(TUTORIAL_HH) -CLEANFILES = \ +# FIXME: Remove `tutorial.aux tutorial.toc tutorial.log tutorial.bbl +# tutorial.out *blg *.lot' when texi2dvi is used. +# +# FIXME: Why is $(TUTORIAL_PDF) listed here? It should be +# automatically cleaned. I'm not sure either about the rest of +# CLEANFILES. +CLEANFILES += \ tutorial.aux tutorial.toc tutorial.log tutorial.bbl tutorial.out \ *blg *.lot \ $(TUTORIAL_PDF) \ *.haux *.hh *.html *.htoc \ - tutorial.haux \ tutorial.html \ tutorial.idx \ $(TUTORIAL_HH) -- 1.5.6.5

1 0

last-svn-commit-7-gd52b4eb configure.ac: Do not configure milena/doc/ref_guide/Makefile.
by Roland Levillain 02 Mar '10

02 Mar '10

--- ChangeLog | 4 ++++ configure.ac | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 500750c..addc2c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Do not configure milena/doc/ref_guide/Makefile. + +2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> + Stop pruning Makefiles under milena/doc/. * Makefile.am (LRDE_STRIPPED_DIST_FILES): Remove diff --git a/configure.ac b/configure.ac index f46a22d..4608585 100644 --- a/configure.ac +++ b/configure.ac @@ -252,7 +252,6 @@ AC_CONFIG_FILES([ milena/Makefile milena/doc/Makefile milena/doc/examples/Makefile - milena/doc/ref_guide/Makefile milena/doc/technical/Makefile milena/doc/tutorial/Makefile milena/doc/white_paper/Makefile -- 1.5.6.5

1 0

last-svn-commit-6-ge4a2af5 Stop make from recurring in doc/ref_guide.
by Roland Levillain 02 Mar '10

02 Mar '10

* doc/ref_guide/Makefile.am: Rename as... * doc/ref_guide/ref_guide.mk: ...this. Adjust. * doc/doc.mk (doc_dir): New variable. * doc/Makefile.am: Include doc/ref_guide/ref_guide.mk. (SUBDIRS): Remove ref_guide. ($(srcdir)/ref_guide/ref_guide.hh): Remove target. (ref-guide-pdf, ref-guide-html): Remove (phony) targets. --- milena/ChangeLog | 13 ++++ milena/doc/Makefile.am | 29 ++++------ milena/doc/doc.mk | 10 +++- milena/doc/ref_guide/{Makefile.am => ref_guide.mk} | 61 +++++++++---------- 4 files changed, 62 insertions(+), 51 deletions(-) rename milena/doc/ref_guide/{Makefile.am => ref_guide.mk} (60%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9c4f57f..b340b00 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> + Stop make from recurring in doc/ref_guide. + + * doc/ref_guide/Makefile.am: Rename as... + * doc/ref_guide/ref_guide.mk: ...this. + Adjust. + * doc/doc.mk (doc_dir): New variable. + * doc/Makefile.am: Include doc/ref_guide/ref_guide.mk. + (SUBDIRS): Remove ref_guide. + ($(srcdir)/ref_guide/ref_guide.hh): Remove target. + (ref-guide-pdf, ref-guide-html): Remove (phony) targets. + +2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> + Get rid of Make targets `fake-doc' and `void-doc'. * doc/Makefile.am, diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 5d80a1c..e79129a 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -22,14 +22,16 @@ include $(top_srcdir)/milena/doc/doc.mk SUBDIRS = \ examples \ - ref_guide \ technical \ tutorial \ white_paper - DOXYGEN = doxygen +# Initialiaze variables. +EXTRA_DIST = +dist_doc_DATA = +CLEANFILES = .PHONY: doc \ @@ -39,7 +41,6 @@ DOXYGEN = doxygen ref-doc-devel-pdf ref-doc-devel-html \ tutorial-pdf tutorial-html \ white-paper-pdf white-paper-html \ - ref-guide-pdf ref-guide-html \ examples data-regen fig-convert @@ -58,17 +59,15 @@ 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/. ## -## ----------------------------------------------------------------- ## +## -------------------------------------------------- ## +## Shared dependencies on the products of tutorial/. ## +## -------------------------------------------------- ## # FIXME: Maintaining dependencies across directories is too # complicated. Simplify. 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. ## @@ -142,14 +141,10 @@ white-paper-html: ## Reference Guide. ## ## ----------------- ## -ref-guide-pdf: fig-convert - cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) $@ +include $(srcdir)/ref_guide/ref_guide.mk -ref-guide-html: fig-convert - cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) $@ - -# FIXME: Adresse the construction of examples (see examples/Makefile.am). +# FIXME: Adress the construction of examples (see examples/Makefile.am). data-regen: cd examples && $(MAKE) $(AM_MAKEFLAGS) $@ @@ -160,7 +155,7 @@ fix-refdata: # Make sure the figures are the first files in EXTRA_DIST. # Make the 'fake-doc' rule works correctly. -EXTRA_DIST = +EXTRA_DIST += $(srcdir)/figures/figures.mk: $(srcdir)/headers.stamp include $(srcdir)/figures/figures.mk @@ -244,7 +239,7 @@ include $(srcdir)/examples/examples.mk include $(srcdir)/outputs/outputs.mk -dist_doc_DATA = $(USER_REFMAN_PDF) +dist_doc_DATA += $(USER_REFMAN_PDF) # Installing a directory located in the source dir is not supported by # Automake by default, so we cannot add `USER_REFMAN_HTML' to @@ -293,7 +288,7 @@ EXTRA_DIST += \ tools/split_sample.sh \ tools/todoxygen.sh -CLEANFILES = \ +CLEANFILES += \ Doxyfile_user \ Doxyfile_user_pdf \ Doxyfile_devel \ diff --git a/milena/doc/doc.mk b/milena/doc/doc.mk index eb9290a..161d893 100644 --- a/milena/doc/doc.mk +++ b/milena/doc/doc.mk @@ -1,6 +1,6 @@ -# -*- Automake -*- +# -*- Automake -*- -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory # (LRDE). # # This file is part of Olena. @@ -34,3 +34,9 @@ FIGURES_SRCDIR = $(DOC_SRCDIR)/figures EXAMPLES_SRCDIR = $(DOC_SRCDIR)/examples SPLIT_EXAMPLES_SRCDIR = $(EXAMPLES_SRCDIR)/split IMG_SRCDIR = $(DOC_SRCDIR)/img + +# FIXME: Adjust when $(DOC_SRCDIR) is renamed or removed. +# +# FIXME: Careful, `doc_dir' is close to `docdir', which is reserved by +# Automake. Change this name? +doc_dir = $(DOC_SRCDIR) diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/ref_guide.mk similarity index 60% rename from milena/doc/ref_guide/Makefile.am rename to milena/doc/ref_guide/ref_guide.mk index fa953e4..1a9ff12 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/ref_guide.mk @@ -1,3 +1,5 @@ +# -*- Automake -*- + # Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. @@ -15,16 +17,16 @@ # along with Olena. If not, see <http://www.gnu.org/licenses/>. # -.PHONY: ref-guide ref-guide-html - -include $(top_srcdir)/milena/doc/doc.mk +.PHONY: ref-guide ref-guide-html ref-guide-pdf -TEXINPUTS ="$(DOC_SRCDIR):$(OUTPUTS_SRCDIR):\ +ref_guide_TEXINPUTS = "$(DOC_SRCDIR):$(OUTPUTS_SRCDIR):\ $(SPLIT_OUTPUTS_SRCDIR):$(IMG_SRCDIR):$(SPLIT_EXAMPLES_SRCDIR):" ref-guide: ref-guide-html ref-guide-pdf +ref_guide_dir = $(doc_dir)/ref_guide + # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: # @@ -52,43 +54,38 @@ ref-guide: ref-guide-html ref-guide-pdf # Intermediate product for the various doc targets of the parent # directory. # -# This is not a bug: REF_GUIDE_HH is meant to have a `.hh' -# extension, since it is later parsed by Doxygen, which complains -# about `.html' files. -REF_GUIDE_HH = $(srcdir)/ref_guide.hh +# This is not a bug: REF_GUIDE_HH is meant to have a `.hh' extension, +# since it is later parsed by Doxygen, which complains about `.html' +# files. +REF_GUIDE_HH = $(ref_guide_dir)/ref_guide.hh ref-guide-html: $(REF_GUIDE_HH) -$(REF_GUIDE_HH): ref_guide.tex $(srcdir)/../figures.stamp - $(DOC_SRCDIR)/tools/todoxygen.sh \ - $< $(DOC_SRCDIR)/ref_guide $(DOC_SRCDIR) +$(REF_GUIDE_HH): $(ref_guide_dir)/ref_guide.tex $(doc_dir)/figures.stamp + $(doc_dir)/tools/todoxygen.sh $< $(ref_guide_dir) $(doc_dir) # Final product. -REF_GUIDE_PDF = $(srcdir)/ref_guide.pdf +REF_GUIDE_PDF = $(ref_guide_dir)/ref_guide.pdf ref-guide-pdf: $(REF_GUIDE_PDF) -$(REF_GUIDE_PDF): ref_guide.tex $(srcdir)/../figures.stamp - TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - test "$(top_srcdir)" == "$(top_builddir)" \ - || mv -f $(builddir)/ref_guide.pdf $(srcdir) +$(REF_GUIDE_PDF): $(ref_guide_dir)/ref_guide.tex $(doc_dir)/figures.stamp + TEXINPUTS=$(ref_guide_TEXINPUTS) pdflatex $< + TEXINPUTS=$(ref_guide_TEXINPUTS) pdflatex $< + TEXINPUTS=$(ref_guide_TEXINPUTS) pdflatex $< \ + test x"$(ref_guide_dir)" != x. \ + && mv -f ref_guide.pdf $(ref_guide_dir) -# FIXME: Regenerating figures.stamp requires make to go back to the -# parent directory. We already do the opposite (descending from -# milena/doc/ to milena/doc/tutorial/Makefile in milena/doc/ to update -# tutorial.hh). This is not sound. We probably want to put together -# somes of these files, and maybe get rid of some directories, or at -# least move most of the Makefile machinery into -# milena/doc/Makefile.am. -$(srcdir)/../figures.stamp: - cd .. && $(MAKE) $(AM_MAKEFLAGS) fig-convert +dist_doc_DATA += $(REF_GUIDE_PDF) -dist_doc_DATA = $(REF_GUIDE_PDF) - -EXTRA_DIST = \ - ref_guide.tex \ +EXTRA_DIST += \ + $(ref_guide_dir)/ref_guide.tex \ $(REF_GUIDE_HH) -CLEANFILES = \ +# FIXME: Remove `ref_guide.aux ref_guide.toc ref_guide.log +# ref_guide.bbl ref_guide.out *blg *.lot' when texi2dvi is used. +# +# FIXME: Why is $(REF_GUIDE_PDF) listed here? It should be +# automatically cleaned. I'm not sure either about the rest of +# CLEANFILES. +CLEANFILES += \ ref_guide.aux ref_guide.toc ref_guide.log ref_guide.bbl ref_guide.out \ *blg *.lot \ $(REF_GUIDE_PDF) \ -- 1.5.6.5

1 0