gtk-doc/: Get closer to upstream makefiles. Don't install index.sgml twice. Call...

Original commit message from CVS:
* gtk-doc-plugins.mak:
* gtk-doc.mak:
Get closer to upstream makefiles. Don't install index.sgml twice. Call
gtkdoc-rebase (if exists).

diff --git a/ChangeLog b/ChangeLog
index af9cedd..2708499 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-04  Stefan Kost  <ensonic@users.sf.net>
+
+       * gtk-doc-plugins.mak:
+       * gtk-doc.mak:
+         Get closer to upstream makefiles. Don't install index.sgml twice. Call
+         gtkdoc-rebase (if exists).
+
 2008-08-21  Stefan Kost  <ensonic@users.sf.net>
 
        * gtk-doc-plugins.mak:

diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index f4f1ccc..8993906 100644 (file)
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -275,11 +275,11 @@ MAINTAINERCLEANFILES = $(MAINTAINER_DOC_STAMPS)
 
 # thomas: make docs parallel installable; devhelp requires majorminor too
 install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) 
-       (installfiles=`echo ./html/*.html`; \
-       if test "$$installfiles" = './html/*.html'; \
+       (installfiles=`echo $(srcdir)/html/*.sgml $(srcdir)/html/*.html $(srcdir)/html/*.png $(srcdir)/html/*.css`; \
+       if test "$$installfiles" = '$(srcdir)/html/*.sgml $(srcdir)/html/*.html $(srcdir)/html/*.png $(srcdir)/html/*.css'; \
        then echo '-- Nothing to install' ; \
        else \
+          $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
          for i in $$installfiles; do \
            echo '-- Installing '$$i ; \
            $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
@@ -295,15 +295,11 @@ install-data-local:
          $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
            $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
          if test -e $(srcdir)/html/$(DOC_MODULE).devhelp2; then \
-                 $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
+                   $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
                   $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
          fi; \
-         echo '-- Installing $(srcdir)/html/index.sgml' ; \
-         $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-               if test -e $(srcdir)/html/style.css; then \
-                       echo '-- Installing $(srcdir)/html/style.css' ; \
-                       $(INSTALL_DATA) $(srcdir)/html/style.css $(DESTDIR)$(TARGET_DIR); \
-               fi; \
+         which gtkdoc-rebase >/dev/null && \
+           gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
        fi) 
 uninstall-local:
        (installfiles=`echo ./html/*.html`; \
@@ -377,19 +373,12 @@ endif
 
 # FIXME: decide whether we want to dist generated html or not
 dist-hook: dist-check-gtkdoc dist-hook-local
-       mkdir $(distdir)/tmpl
-       mkdir $(distdir)/xml
        mkdir $(distdir)/html
-       -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-       -cp $(srcdir)/sgml/*.xml $(distdir)/xml
-       -cp $(srcdir)/html/index.sgml $(distdir)/html
-       -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(srcdir)/html/*.png $(distdir)/html
-       -cp $(srcdir)/html/$(DOC_MODULE).devhelp* $(distdir)/html
-
-       images=$(HTML_IMAGES) ;               \
-       for i in "" $$images ; do                     \
-         if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \
-       done
-
-.PHONY : dist-hook-local
+       cp $(srcdir)/html/* $(distdir)/html
+       -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+       -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+       cd $(distdir) && rm -f $(DISTCLEANFILES)
+        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
 

diff --git a/gtk-doc.mak b/gtk-doc.mak
index 458a400..2b4d812 100644 (file)
--- a/gtk-doc.mak
+++ b/gtk-doc.mak
@@ -35,10 +35,10 @@ DOC_STAMPS =                                \
 SCANOBJ_FILES =                                \
        $(DOC_MODULE).args              \
        $(DOC_MODULE).hierarchy         \
-       $(DOC_MODULE).interfaces        \
+       $(DOC_MODULE).interfaces                \
        $(DOC_MODULE).prerequisites     \
-       .libs/$(DOC_MODULE)-scan.o      \
-       $(DOC_MODULE).signals
+       $(DOC_MODULE).signals           \
+       .libs/$(DOC_MODULE)-scan.o
 
 REPORT_FILES = \
        $(DOC_MODULE)-undocumented.txt \
@@ -158,16 +158,12 @@ clean-local: clean-local-gtkdoc
        rm -f *~ *.bak
        rm -rf .libs
 
-maintainer-clean-local: clean
-       cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
 # company: don't delete .sgml and -sections.txt as they're in CVS
 # FIXME : thomas added all sgml files and some other things to make
 # make distcheck work
 distclean-local: clean
-       rm -f $(DOC_MODULE)-decl-list.txt
-       rm -f $(DOC_MODULE)-decl.txt
-       rm -f $(REPORT_FILES)
+       rm -f $(REPORT_FILES) \
+                $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
        rm -rf tmpl/*.sgml.bak
        rm -f $(DOC_MODULE).hierarchy
        rm -f *.stamp || true
@@ -182,37 +178,30 @@ distclean-local: clean
        fi
        rm -rf *.o
 
+maintainer-clean-local: clean
+       cd $(srcdir) && rm -rf html \
+                xml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
 # thomas: make docs parallel installable; devhelp requires majorminor too
 install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) 
-       (installfiles=`echo ./html/*.html`; \
-       if test "$$installfiles" = './html/*.html'; \
+       (installfiles=`echo $(srcdir)/html/*.sgml $(srcdir)/html/*.html $(srcdir)/html/*.png $(srcdir)/html/*.css`; \
+       if test "$$installfiles" = '$(srcdir)/html/*.sgml $(srcdir)/html/*.html $(srcdir)/html/*.png $(srcdir)/html/*.css'; \
        then echo '-- Nothing to install' ; \
        else \
+         $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
          for i in $$installfiles; do \
            echo '-- Installing '$$i ; \
            $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
          done; \
-         pngfiles=`echo ./html/*.png`; \
-         if test "$$pngfiles" != './html/*.png'; then \
-           for i in $$pngfiles; do \
-             echo '-- Installing '$$i ; \
-             $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-           done; \
-         fi; \
          echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
          $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
            $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
          if test -e $(srcdir)/html/$(DOC_MODULE).devhelp2; then \
-                 $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
+                   $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
                   $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
          fi; \
-         echo '-- Installing $(srcdir)/html/index.sgml' ; \
-         $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-               if test -e $(srcdir)/html/style.css; then \
-                       echo '-- Installing $(srcdir)/html/style.css' ; \
-                       $(INSTALL_DATA) $(srcdir)/html/style.css $(DESTDIR)$(TARGET_DIR); \
-               fi; \
+         which gtkdoc-rebase >/dev/null && \
+           gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
        fi) 
 uninstall-local:
        (installfiles=`echo ./html/*.html`; \
@@ -258,23 +247,11 @@ dist-check-gtkdoc:
 endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
-       mkdir $(distdir)/tmpl
-       mkdir $(distdir)/xml
        mkdir $(distdir)/html
-       -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-       -cp $(srcdir)/sgml/*.xml $(distdir)/xml
-       -cp $(srcdir)/html/index.sgml $(distdir)/html
-       -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-       -cp $(srcdir)/html/$(DOC_MODULE).devhelp* $(distdir)/html
-
-       images=$(HTML_IMAGES) ;               \
-       for i in "" $$images ; do                     \
-         if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \
-       done
-       images="$(srcdir)/html/*.png" ;               \
-       for i in "" $$images ; do                     \
-         fname=`basename $$i` ;                      \
-         if test ! -f "$(distdir)/html/$$fname"; then cp $$i $(distdir)/html ; fi; \
-       done 
+       cp $(srcdir)/html/* $(distdir)/html
+       -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+       -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+       cd $(distdir) && rm -f $(DISTCLEANFILES)
+        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
-.PHONY : dist-hook-local
+.PHONY : dist-hook-local docs