[seed] doc/modules: gtk-doc must be run in the html subfolder.



commit 7a70f39bc8e4f689eee734b5134ac2d0b97d5771
Author: Mathieu Duponchelle <mathieu duponchelle opencreed com>
Date:   Fri Sep 16 06:44:18 2016 +0200

    doc/modules: gtk-doc must be run in the html subfolder.
    
    gtkdoc-mkhtml will output html.stamp in the parent folder, and
    it never got cleaned afterwards.
    
    Not sure why doc/modules does not use the gtk-doc makefile
    fragment, but I'm not going for the best solution, simply the
    one that does not break distcheck by leaving build artefacts in
    random places.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=771510

 doc/modules/Makefile.am |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/doc/modules/Makefile.am b/doc/modules/Makefile.am
index 03fe2ae..f85c192 100644
--- a/doc/modules/Makefile.am
+++ b/doc/modules/Makefile.am
@@ -4,8 +4,7 @@ EXTRA_DIST=make-functions.js book.xml version.xml.in
 if ENABLE_GTK_DOC
 html/index.html: version.xml book.xml sqlite/sqlite.xml sqlite/sqlite-funcs.xml readline/readline.xml 
readline/readline-funcs.xml make-functions.js gtkbuilder/gtkbuilder-funcs.xml gtkbuilder/gtkbuilder.xml 
sandbox/sandbox.xml sandbox/sandbox-funcs.xml
        mkdir -p html;
-       gtkdoc-mkhtml --path="$(abs_builddir)" "Seed" $(srcdir)/book.xml;
-       mv *.html *.css *.png *.sgml *.devhelp* html
+       cd html && gtkdoc-mkhtml --path="$(abs_top_builddir)/doc/modules" "Seed" 
$(abs_top_srcdir)/doc/modules/book.xml;
 
 bookdir = $(docdir)/modules/html
 book_DATA = html/index.html
@@ -13,7 +12,11 @@ book_DATA = html/index.html
 install-data-local:
        cp -r html $(DESTDIR)$(docdir)/modules
 
-CLEANFILES = html/*
+CLEANFILES = \
+       html/* \
+       html.stamp \
+       $(NULL)
+
 endif 
 
 uninstall-local:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]