[geany/geany] 74006b: Cleanup doc Makefile so that each conditional set all its targets - Commits

23 Aug 2014


      Branch:      refs/heads/master
Author:      Colomban Wendling ban@herbesfolles.org
Committer:   Colomban Wendling ban@herbesfolles.org
Date:        Sat, 23 Aug 2014 16:14:56 UTC
Commit:      74006b069c1525af2d52cc8d488d8cbe03dd43a1
             https://github.com/geany/geany/commit/74006b069c1525af2d52cc8d488d8cbe03dd43...
Log Message:
-----------
Cleanup doc Makefile so that each conditional set all its targets
Don't set clean-local and all-local dependencies all together at the
end and rather let each section add the appropriate dependencies.
This makes each conditional more self-contained, and is safe as Make
allows adding extra dependencies to existing targets.
Modified Paths:
--------------
    doc/Makefile.am
Modified: doc/Makefile.am
21 lines changed, 6 insertions(+), 15 deletions(-)
===================================================================
@@ -56,15 +56,13 @@ geany.html: $(srcdir)/geany.css $(srcdir)/geany.txt
 hacking.html: $(srcdir)/geany.css $(top_srcdir)/HACKING
    $(AM_V_GEN)$(RST2HTML) -stg --stylesheet=$(srcdir)/geany.css $(top_srcdir)/HACKING $@
-all-html-local: geany.html hacking.html
+all-local: geany.html hacking.html
+clean-local: clean-html-local
 clean-html-local:
    -rm -f hacking.html
    -rm -f geany.html
-else
-all-html-local:;
-clean-html-local:;
 endif
# PDF user manual
@@ -73,14 +71,12 @@ if WITH_RST2PDF
 geany-$(VERSION).pdf: geany.txt
    $(AM_V_GEN)$(RST2PDF) $(srcdir)/geany.txt -o $@
-all-pdf-local: geany-$(VERSION).pdf
+all-local: geany-$(VERSION).pdf
+clean-local: clean-pdf-local
 clean-pdf-local:
    -rm -f geany-$(VERSION).pdf
-else
-all-pdf-local:;
-clean-pdf-local:;
 endif
# API Documentation
@@ -99,19 +95,14 @@ doxygen_sources = \
 Doxyfile.stamp: Doxyfile $(doxygen_sources)
    $(AM_V_GEN)$(DOXYGEN) Doxyfile && echo "" > $@
-all-api-docs-local: Doxyfile.stamp
+all-local: Doxyfile.stamp
+clean-local: clean-api-docs-local
 clean-api-docs-local:
    -rm -rf reference/ Doxyfile.stamp
-else
-all-api-docs-local:;
-clean-api-docs-local:;
 endif
-all-local: all-html-local all-pdf-local all-api-docs-local
-clean-local: clean-html-local clean-pdf-local clean-api-docs-local
-
 uninstall-local:
    rm -rf $(DOCDIR);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    