[geany/geany] b741ea: doc: Makefile.am cleanup

[Thomas Martitz]

Branch:      refs/heads/master
Author:      Thomas Martitz <kugel at rockbox.org>
Committer:   Thomas Martitz <kugel at rockbox.org>
Date:        Tue, 16 Feb 2016 06:08:58 UTC
Commit:      b741ea76dfb091602e6d065c8e000a635a840d62
             https://github.com/geany/geany/commit/b741ea76dfb091602e6d065c8e000a635a840d62

Log Message:
-----------
doc: Makefile.am cleanup

- split doxygen make recipe up
- rename geany_includedir to geany_gtkdocincludedir
- removed all references to geany-scintilla-gtkdoc.h

Also, remove geany-scintilla-gtkdoc.h from .gitignore


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

Modified: .gitignore
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -112,7 +112,6 @@ Makefile.in
 /doc/*.toc
 /doc/reference
 /doc/geany-gtkdoc.h
-/doc/geany-scintilla-gtkdoc.h
 /doc/xml/
 
 #-----------------------------------------------------------------------


Modified: doc/Makefile.am
14 lines changed, 7 insertions(+), 7 deletions(-)
===================================================================
@@ -113,22 +113,22 @@ Doxyfile-gi: Doxyfile
 		$< > $@ || { $(RM) $@ && exit 1; }
 
 Doxyfile.stamp: Doxyfile Doxyfile-gi $(doxygen_sources)
-	$(AM_V_GEN)$(DOXYGEN) Doxyfile-gi && $(DOXYGEN) Doxyfile && echo "" > $@
+	$(AM_V_at)$(DOXYGEN) Doxyfile-gi
+	$(AM_V_at)$(DOXYGEN) Doxyfile
+	$(AM_V_GEN)echo "" > $@
 
 ALL_TARGETS = Doxyfile.stamp
 
 if WITH_PYTHON
 
-geany-scintilla-gtkdoc.h: geany-gtkdoc.h
-
 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 --sci-output geany-scintilla-gtkdoc.h
+	-o geany-gtkdoc.h
 
-ALL_TARGETS += geany-gtkdoc.h geany-scintilla-gtkdoc.h
+ALL_TARGETS += geany-gtkdoc.h
 
-geany_includedir = $(includedir)/geany/gtkdoc
-geany_include_HEADERS = geany-gtkdoc.h geany-scintilla-gtkdoc.h
+geany_gtkdocincludedir = $(includedir)/geany/gtkdoc
+geany_gtkdocinclude_HEADERS = geany-gtkdoc.h
 
 endif
 



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