Commit fb074a93 authored by Roland Levillain's avatar Roland Levillain
Browse files

Improve doc/'s cleaning rules.

	* doc/Makefile.am (CLEANFILES): Remove
	$(technical_dir)/technical.haux,
	$(tutorial_dir)/tutorial.haux,
	$(ref_guide_dir)/ref_guide.haux and
	$(ref_guide_dir)/ref_guide.htoc.
	(clean-local): Remove (phony) target.
	($(EPSS)): Move...
	(MAINTAINERCLEANFILES): ...here.
	Add $(TECHNICAL_PDF), $(TECHNICAL_HH),
	$(TUTORIAL_PDF), $(TUTORIAL_HH),
	$(WHITE_PAPER_PDF)
	$(REF_GUIDE_PDF) and $(REF_GUIDE_HH).
parent f9e6be6b
2010-03-15 Roland Levillain <roland@lrde.epita.fr>
Improve doc/'s cleaning rules.
* doc/Makefile.am (CLEANFILES): Remove
$(technical_dir)/technical.haux,
$(tutorial_dir)/tutorial.haux,
$(ref_guide_dir)/ref_guide.haux and
$(ref_guide_dir)/ref_guide.htoc.
(clean-local): Remove (phony) target.
($(EPSS)): Move...
(MAINTAINERCLEANFILES): ...here.
Add $(TECHNICAL_PDF), $(TECHNICAL_HH),
$(TUTORIAL_PDF), $(TUTORIAL_HH),
$(WHITE_PAPER_PDF)
$(REF_GUIDE_PDF) and $(REF_GUIDE_HH).
2010-03-15 Roland Levillain <roland@lrde.epita.fr> 2010-03-15 Roland Levillain <roland@lrde.epita.fr>
   
Prevent todoxygen.sh from generating incomplete outputs. Prevent todoxygen.sh from generating incomplete outputs.
# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development # Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE). # Laboratory (LRDE).
# #
...@@ -15,7 +14,6 @@ ...@@ -15,7 +14,6 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>. # along with Olena. If not, see <http://www.gnu.org/licenses/>.
#
# FIXME: To be overhauled! (See ticket #134). # FIXME: To be overhauled! (See ticket #134).
...@@ -52,8 +50,6 @@ DOXYFILE = Doxyfile ...@@ -52,8 +50,6 @@ DOXYFILE = Doxyfile
# Initialiaze variables. # Initialiaze variables.
EXTRA_DIST = EXTRA_DIST =
dist_doc_DATA = dist_doc_DATA =
CLEANFILES =
MAINTAINERCLEANFILES =
# FIXME: Simplify all of this. ``Devel'' targets are really # FIXME: Simplify all of this. ``Devel'' targets are really
# secondary. And we probably don't need so much target aliases! # secondary. And we probably don't need so much target aliases!
...@@ -144,6 +140,7 @@ $(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in ...@@ -144,6 +140,7 @@ $(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in
Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \ Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \
| sed -e 's/\\\$$//g'`; \ | sed -e 's/\\\$$//g'`; \
$(edit) $< >$@ $(edit) $< >$@
MAINTAINERCLEANFILES = $(DOXYFILE_USER)
## FIXME: Rename USER_REFMAN_PDF to something else? ## FIXME: Rename USER_REFMAN_PDF to something else?
USER_REFMAN_PDF = user-refman.pdf USER_REFMAN_PDF = user-refman.pdf
...@@ -220,6 +217,7 @@ $(DOXYFILE_DEVEL): $(srcdir)/$(DOXYFILE).in ...@@ -220,6 +217,7 @@ $(DOXYFILE_DEVEL): $(srcdir)/$(DOXYFILE).in
$(edit) $< >$@.tmp $(edit) $< >$@.tmp
$(edit_devel) $@.tmp >$@ $(edit_devel) $@.tmp >$@
rm -f $@.tmp rm -f $@.tmp
MAINTAINERCLEANFILES += $(DOXYFILE_DEVEL)
## FIXME: Rename DEVEL_REFMAN_PDF to something else? ## FIXME: Rename DEVEL_REFMAN_PDF to something else?
DEVEL_REFMAN_PDF = devel-refman-pdf DEVEL_REFMAN_PDF = devel-refman-pdf
...@@ -373,13 +371,13 @@ technical-pdf: $(TECHNICAL_PDF) ...@@ -373,13 +371,13 @@ technical-pdf: $(TECHNICAL_PDF)
$(TECHNICAL_PDF): $(technical_dependencies) $(TECHNICAL_PDF): $(technical_dependencies)
dist_doc_DATA += $(TECHNICAL_PDF) dist_doc_DATA += $(TECHNICAL_PDF)
MAINTAINERCLEANFILES += $(TECHNICAL_PDF)
EXTRA_DIST += \ EXTRA_DIST += \
$(technical_dir)/technical.tex \ $(technical_dir)/technical.tex \
$(TECHNICAL_HH) $(TECHNICAL_HH)
CLEANFILES += $(technical_dir)/technical.haux MAINTAINERCLEANFILES += $(TECHNICAL_HH)
## ---------- ## ## ---------- ##
## Tutorial. ## ## Tutorial. ##
...@@ -476,15 +474,13 @@ tutorial-pdf: $(TUTORIAL_PDF) ...@@ -476,15 +474,13 @@ tutorial-pdf: $(TUTORIAL_PDF)
$(TUTORIAL_PDF): $(tutorial_dependencies) $(TUTORIAL_PDF): $(tutorial_dependencies)
dist_doc_DATA += $(TUTORIAL_PDF) dist_doc_DATA += $(TUTORIAL_PDF)
MAINTAINERCLEANFILES += $(TUTORIAL_PDF)
EXTRA_DIST += \ EXTRA_DIST += \
$(tutorial_dir)/tutorial.tex \ $(tutorial_dir)/tutorial.tex \
$(TUTORIAL_HH) $(TUTORIAL_HH)
# FIXME: Why is $(TUTORIAL_HH) listed here? It should be MAINTAINERCLEANFILES += $(TUTORIAL_HH)
# automatically cleaned. I'm not sure either about the rest of
# CLEANFILES.
CLEANFILES += $(tutorial_dir)/tutorial.haux
## ------------- ## ## ------------- ##
...@@ -572,19 +568,15 @@ white-paper-pdf: $(WHITE_PAPER_PDF) ...@@ -572,19 +568,15 @@ white-paper-pdf: $(WHITE_PAPER_PDF)
# Extra dependencies. # Extra dependencies.
$(WHITE_PAPER_PDF): $(PNGS) $(WHITE_PAPER_PDF): $(PNGS)
dist_doc_DATA += \ dist_doc_DATA += $(WHITE_PAPER_PDF)
$(WHITE_PAPER_HTML) \ MAINTAINERCLEANFILES += $(WHITE_PAPER_PDF)
$(WHITE_PAPER_PDF)
EXTRA_DIST += \ EXTRA_DIST += \
$(white_paper_dir)/white_paper.tex \ $(white_paper_dir)/white_paper.tex \
$(PNGS) \ $(PNGS) \
$(EPSS) $(EPSS)
CLEANFILES += $(EPSS) MAINTAINERCLEANFILES += $(EPSS)
clean-local:
-rm -rf $(white_paper_dir)/white_paper_html
## ----------------- ## ## ----------------- ##
...@@ -685,14 +677,13 @@ ref-guide-pdf: $(REF_GUIDE_PDF) ...@@ -685,14 +677,13 @@ ref-guide-pdf: $(REF_GUIDE_PDF)
$(REF_GUIDE_PDF): $(ref_guide_dependencies) $(REF_GUIDE_PDF): $(ref_guide_dependencies)
dist_doc_DATA += $(REF_GUIDE_PDF) dist_doc_DATA += $(REF_GUIDE_PDF)
MAINTAINERCLEANFILES += $(REF_GUIDE_PDF)
EXTRA_DIST += \ EXTRA_DIST += \
$(ref_guide_dir)/ref_guide.tex \ $(ref_guide_dir)/ref_guide.tex \
$(REF_GUIDE_HH) $(REF_GUIDE_HH)
CLEANFILES += \ MAINTAINERCLEANFILES += $(REF_GUIDE_HH)
$(ref_guide_dir)/ref_guide.haux \
$(ref_guide_dir)/ref_guide.htoc
## --------- ## ## --------- ##
...@@ -782,7 +773,7 @@ PROGRAMS_examples += \ ...@@ -782,7 +773,7 @@ PROGRAMS_examples += \
tuto4_site_set_create tuto4_site_set_create
EXTRA_PROGRAMS = $(PROGRAMS_examples) EXTRA_PROGRAMS = $(PROGRAMS_examples)
CLEANFILES += $(PROGRAMS_examples) CLEANFILES = $(PROGRAMS_examples)
# FIXME: Careful, this will only work if this file is included by # FIXME: Careful, this will only work if this file is included by
# `milena/doc/Makefile.am', since `examples/' is a subdirectory of # `milena/doc/Makefile.am', since `examples/' is a subdirectory of
...@@ -1128,7 +1119,3 @@ EXTRA_DIST += \ ...@@ -1128,7 +1119,3 @@ EXTRA_DIST += \
tools/sample_utils.hh \ tools/sample_utils.hh \
tools/split_sample.sh \ tools/split_sample.sh \
tools/todoxygen.sh tools/todoxygen.sh
MAINTAINERCLEANFILES += \
Doxyfile_user \
Doxyfile_devel
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment