[geany/geany] 91a8bb: Don't generate GtkDoc header stuff if GtkDoc header will not be built

Colomban Wendling git-noreply at xxxxx
Thu Feb 18 22:38:54 UTC 2016


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Thu, 18 Feb 2016 22:38:54 UTC
Commit:      91a8bb6c6aa155085be370e9301cca324cea8914
             https://github.com/geany/geany/commit/91a8bb6c6aa155085be370e9301cca324cea8914

Log Message:
-----------
Don't generate GtkDoc header stuff if GtkDoc header will not be built


Modified Paths:
--------------
    doc/Makefile.am

Modified: doc/Makefile.am
43 lines changed, 25 insertions(+), 18 deletions(-)
===================================================================
@@ -99,6 +99,17 @@ doxygen_sources = \
 	$(top_srcdir)/tagmanager/src/tm_source_file.[ch] \
 	$(top_srcdir)/tagmanager/src/tm_workspace.[ch]
 
+Doxyfile.stamp: Doxyfile $(doxygen_sources)
+	$(AM_V_GEN)$(DOXYGEN) Doxyfile && echo "" > $@
+
+ALL_LOCAL_TARGETS = Doxyfile.stamp
+CLEAN_LOCAL_TARGETS = clean-api-docs-local
+
+clean-api-docs-local:
+	-rm -rf reference/ Doxyfile.stamp doxygen_*
+
+if ENABLE_GTKDOC_HEADER
+
 # set WARN_IF_UNDOCUMENTED because apparently doxygens warns for undocumented stuff
 # in headers (even though it's correctly documented in the corresponding .c file) only
 # for xml output
@@ -112,31 +123,27 @@ Doxyfile-gi: Doxyfile
 		-e 's,^\(SORT_BRIEF_DOCS.*\)YES,\1NO,' \
 		$< > $@ || { $(RM) $@ && exit 1; }
 
-Doxyfile.stamp: Doxyfile Doxyfile-gi $(doxygen_sources)
-	$(AM_V_at)$(DOXYGEN) Doxyfile-gi
-	$(AM_V_at)$(DOXYGEN) Doxyfile
-	$(AM_V_GEN)echo "" > $@
-
-ALL_TARGETS = Doxyfile.stamp
+# we depend on Doxyfile.stamp not have this run in parallel with it to avoid
+# concurrent Doxygen runs, which might overwrite each other's files
+Doxyfile-gi.stamp: Doxyfile-gi Doxyfile.stamp $(doxygen_sources)
+	$(AM_V_GEN)$(DOXYGEN) Doxyfile-gi && echo "" > $@
 
-if ENABLE_GTKDOC_HEADER
-
-geany-gtkdoc.h: Doxyfile.stamp $(top_srcdir)/scripts/gen-api-gtkdoc.py
-	$(AM_V_GEN)$(top_srcdir)/scripts/gen-api-gtkdoc.py xml -d $(builddir) \
-	-o geany-gtkdoc.h
-
-ALL_TARGETS += geany-gtkdoc.h
+geany-gtkdoc.h: Doxyfile-gi.stamp $(top_srcdir)/scripts/gen-api-gtkdoc.py
+	$(AM_V_GEN)$(top_srcdir)/scripts/gen-api-gtkdoc.py xml -d $(builddir) -o $@
 
 geany_gtkdocincludedir = $(includedir)/geany/gtkdoc
 nodist_geany_gtkdocinclude_HEADERS = geany-gtkdoc.h
 
-endif
+ALL_LOCAL_TARGETS += geany-gtkdoc.h
+CLEAN_LOCAL_TARGETS += clean-gtkdoc-header-local
 
-all-local: $(ALL_TARGETS)
+clean-gtkdoc-header-local:
+	-rm -rf xml/ Doxyfile-gi Doxyfile-gi.stamp geany-gtkdoc.h
 
-clean-local: clean-api-docs-local
-clean-api-docs-local:
-	-rm -rf reference/ xml/ doxygen_* Doxyfile-gi $(ALL_TARGETS)
+endif
+
+all-local: $(ALL_LOCAL_TARGETS)
+clean-local: $(CLEAN_LOCAL_TARGETS)
 
 endif
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list