* Makefile.am (imgdir): New variable. (EXTRA_DIST): Move img/README, img/fly.pbm, img/fly.pgm, img/fly.ppm, img/lena.pbm, img/lena.pgm, img/lena.ppm, img/lena_16.ppm, img/medium.pgm, img/medium.ppm, img/picasso.pbm, img/picasso.pgm, img/quite-small.pgm, img/small.pbm, img/small.pgm, img/small.ppm, img/squares-lc.pgm, img/squares.pgm, img/test.fits, img/tiny.pbm, img/tiny.pgm, img/tiny.ppm and img/toto.pbm... (dist_img_DATA): ...here (new variable). * doc/Makefile.am (EXTRA_DIST): Move $(USER_REFMAN_HTML) and $(USER_REFMAN_PDF)... (dist_doc_DATA): ...here (new variable). * doc/ref_guide/Makefile.am (EXTRA_DIST): Move $(REF_GUIDE_PDF)... (dist_doc_DATA): ...here (new variable). * doc/tutorial/Makefile.am (EXTRA_DIST): Move $(TUTORIAL_PDF)... (dist_doc_DATA): ...here (new variable). * doc/white_paper/Makefile.am (EXTRA_DIST): Move $(WHITE_PAPER_HTML) and $(WHITE_PAPER_PDF)... (dist_doc_DATA): ...here (new variable). (clean-local): Replace target by... (CLEANFILES): ...this variable. --- milena/ChangeLog | 26 ++++++++++++++++++++++++++ milena/Makefile.am | 3 ++- milena/doc/Makefile.am | 6 ++++-- milena/doc/ref_guide/Makefile.am | 12 ++++++------ milena/doc/tutorial/Makefile.am | 11 ++++++----- milena/doc/white_paper/Makefile.am | 19 +++++++++++-------- 6 files changed, 55 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b9501d7..9f6fb97 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,31 @@ 2009-06-24 Roland Levillain <roland@lrde.epita.fr> + Install the documentation and the images. + + * Makefile.am (imgdir): New variable. + (EXTRA_DIST): Move img/README, img/fly.pbm, img/fly.pgm, + img/fly.ppm, img/lena.pbm, img/lena.pgm, img/lena.ppm, + img/lena_16.ppm, img/medium.pgm, img/medium.ppm, img/picasso.pbm, + img/picasso.pgm, img/quite-small.pgm, img/small.pbm, + img/small.pgm, img/small.ppm, img/squares-lc.pgm, img/squares.pgm, + img/test.fits, img/tiny.pbm, img/tiny.pgm, img/tiny.ppm and + img/toto.pbm... + (dist_img_DATA): ...here (new variable). + * doc/Makefile.am (EXTRA_DIST): Move $(USER_REFMAN_HTML) and + $(USER_REFMAN_PDF)... + (dist_doc_DATA): ...here (new variable). + * doc/ref_guide/Makefile.am (EXTRA_DIST): Move $(REF_GUIDE_PDF)... + (dist_doc_DATA): ...here (new variable). + * doc/tutorial/Makefile.am (EXTRA_DIST): Move $(TUTORIAL_PDF)... + (dist_doc_DATA): ...here (new variable). + * doc/white_paper/Makefile.am (EXTRA_DIST): Move + $(WHITE_PAPER_HTML) and $(WHITE_PAPER_PDF)... + (dist_doc_DATA): ...here (new variable). + (clean-local): Replace target by... + (CLEANFILES): ...this variable. + +2009-06-24 Roland Levillain <roland@lrde.epita.fr> + Distribute Doxyfiles. * doc/Makefile.am (EXTRA_DIST): Add Doxyfile_user, diff --git a/milena/Makefile.am b/milena/Makefile.am index 5e06f1b..f08e193 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -85,7 +85,8 @@ include $(srcdir)/headers.mk # Generated by configure from mln/version.hh.in. nobase_include_HEADERS += mln/version.hh -EXTRA_DIST += \ +imgdir = $(pkgdatadir)/images +dist_img_DATA = \ img/README \ img/fly.pbm \ img/fly.pgm \ diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8b396fd..1a73c35 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -191,6 +191,10 @@ include $(srcdir)/figures/figures.mk include $(srcdir)/outputs/outputs.mk +dist_doc_DATA = \ + $(USER_REFMAN_HTML) \ + $(USER_REFMAN_PDF) + EXTRA_DIST += \ Doxyfile.in \ Doxyfile_user \ @@ -201,8 +205,6 @@ EXTRA_DIST += \ tools/clearbanner.sh \ tools/sample_utils.hh \ tools/split_sample.sh \ - $(USER_REFMAN_HTML) \ - $(USER_REFMAN_PDF) \ tools/todoxygen.sh CLEANFILES = \ diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index e77300a..543265f 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -49,6 +49,12 @@ $(REF_GUIDE_PDF): TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/ref_guide.tex +dist_doc_DATA = $(REF_GUIDE_PDF) + +EXTRA_DIST = \ + ref_guide.tex \ + $(REF_GUIDE_HH) + CLEANFILES = \ ref_guide.aux ref_guide.toc ref_guide.log ref_guide.bbl ref_guide.out \ *~ *blg *.lot \ @@ -56,9 +62,3 @@ CLEANFILES = \ *.haux *.hh *.html *.htoc \ ref_guide.html \ $(REF_GUIDE_HH) - - -EXTRA_DIST = \ - ref_guide.tex \ - $(REF_GUIDE_HH) \ - $(REF_GUIDE_PDF) diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index 8c81afe..bc651c6 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -47,6 +47,12 @@ $(TUTORIAL_PDF): $(FIGURES_BUILDDIR) TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/tutorial.tex TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/tutorial.tex +dist_doc_DATA = $(TUTORIAL_PDF) + +EXTRA_DIST = \ + tutorial.tex \ + $(TUTORIAL_HH) + CLEANFILES = \ tutorial.aux tutorial.toc tutorial.log tutorial.bbl tutorial.out \ *~ *blg *.lot \ @@ -55,8 +61,3 @@ CLEANFILES = \ tutorial.haux \ tutorial.html \ $(TUTORIAL_HH) - -EXTRA_DIST = \ - tutorial.tex \ - $(TUTORIAL_HH) \ - $(TUTORIAL_PDF) diff --git a/milena/doc/white_paper/Makefile.am b/milena/doc/white_paper/Makefile.am index ab542a8..6d5d512 100644 --- a/milena/doc/white_paper/Makefile.am +++ b/milena/doc/white_paper/Makefile.am @@ -53,16 +53,19 @@ $(WHITE_PAPER_PDF): TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/white_paper.tex TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/white_paper.tex -clean-local: - rm -Rf white_paper_html - rm -f white_paper_image.* - rm -f white_paper.pdf - rm -f *.log *.idx *.out *.aux - rm -Rf figures + +dist_doc_DATA = \ + $(WHITE_PAPER_HTML) \ + $(WHITE_PAPER_PDF) EXTRA_DIST = \ white_paper.tex \ - $(WHITE_PAPER_HTML) \ - $(WHITE_PAPER_PDF) \ $(PNGS) \ $(EPSS) + +CLEANFILES = \ + white_paper_html \ + white_paper_image.* \ + white_paper.pdf \ + *.log *.idx *.out *.aux \ + figures -- 1.6.2.4