gtk-doc r637 - in trunk: . tests tests/gobject/docs tests/gobject/docs-tmpl

[stefkost svn gnome org]

Author: stefkost
Date: Thu Jan  8 10:06:48 2009
New Revision: 637
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=637&view=rev

Log:
	* gtk-doc.make:
	* gtkdoc-mkhtml.in:
	* tests/gobject/docs-tmpl/Makefile.am:
	* tests/gobject/docs/Makefile.am:
	* tests/gtk-doc.make:
	* tests/gtk-doc.notmpl.make:
	  Finally, make distcheck works.



Modified:
   trunk/ChangeLog
   trunk/gtk-doc.make
   trunk/gtkdoc-mkhtml.in
   trunk/tests/gobject/docs-tmpl/Makefile.am
   trunk/tests/gobject/docs/Makefile.am
   trunk/tests/gtk-doc.make
   trunk/tests/gtk-doc.notmpl.make

Modified: trunk/gtk-doc.make
==============================================================================
--- trunk/gtk-doc.make	(original)
+++ trunk/gtk-doc.make	Thu Jan  8 10:06:48 2009
@@ -88,10 +88,9 @@
 tmpl.stamp: tmpl-build.stamp
 	@true
 
-tmpl/*.sgml:
+$(srcdir)/tmpl/*.sgml:
 	@true
 
-
 #### xml ####
 
 sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)

Modified: trunk/gtkdoc-mkhtml.in
==============================================================================
--- trunk/gtkdoc-mkhtml.in	(original)
+++ trunk/gtkdoc-mkhtml.in	Thu Jan  8 10:06:48 2009
@@ -4,7 +4,7 @@
 usage="\
 Usage: gtkdoc-mkhtml [--path=SEARCH_PATH] MODULE DRIVER_FILE [BACKEND_OPTIONS...]"
 
-#echo "args $0\n";
+echo "args $0\n";
 
 # parse options, ignore unknown options for future extensions
 
@@ -38,6 +38,7 @@
       gtkdocdir= datadir@/gtk-doc/data
 else
       #echo "uninstalled"
+      # this does not work from buiddir!=srcdir
       gtkdocdir=`dirname $0`
 fi
 

Modified: trunk/tests/gobject/docs-tmpl/Makefile.am
==============================================================================
--- trunk/tests/gobject/docs-tmpl/Makefile.am	(original)
+++ trunk/tests/gobject/docs-tmpl/Makefile.am	Thu Jan  8 10:06:48 2009
@@ -64,7 +64,7 @@
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST +=
+EXTRA_DIST += tester.types
 
 DISTCLEANFILES = \
 	gtkdoc-scan.log \

Modified: trunk/tests/gobject/docs/Makefile.am
==============================================================================
--- trunk/tests/gobject/docs/Makefile.am	(original)
+++ trunk/tests/gobject/docs/Makefile.am	Thu Jan  8 10:06:48 2009
@@ -64,7 +64,7 @@
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST +=
+EXTRA_DIST += tester.types
 
 DISTCLEANFILES = \
 	gtkdoc-scan.log \

Modified: trunk/tests/gtk-doc.make
==============================================================================
--- trunk/tests/gtk-doc.make	(original)
+++ trunk/tests/gtk-doc.make	Thu Jan  8 10:06:48 2009
@@ -86,7 +86,7 @@
 tmpl.stamp: tmpl-build.stamp
 	@true
 
-tmpl/*.sgml:
+$(srcdir)/tmpl/*.sgml:
 	@true
 
 #### xml ####
@@ -109,7 +109,7 @@
 	rm -rf $(srcdir)/html
 	mkdir $(srcdir)/html
 	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
-	gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
+	gtkdoc-mkhtml --path="$(abs_srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 	@echo 'gtk-doc: Fixing cross-references'
 	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
@@ -135,22 +135,4 @@
 maintainer-clean-local: clean
 	cd $(srcdir) && rm -rf xml html
 
-#
-# Require gtk-doc when making dist
-#
-dist-check-gtkdoc:
-
-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)/xml/*.xml $(distdir)/xml
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	! which gtkdoc-rebase >/dev/null 2>&1 || \
-	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
 .PHONY : dist-hook-local docs

Modified: trunk/tests/gtk-doc.notmpl.make
==============================================================================
--- trunk/tests/gtk-doc.notmpl.make	(original)
+++ trunk/tests/gtk-doc.notmpl.make	Thu Jan  8 10:06:48 2009
@@ -94,7 +94,7 @@
 	rm -rf $(srcdir)/html
 	mkdir $(srcdir)/html
 	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
-	gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
+	gtkdoc-mkhtml --path="$(abs_srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 	@echo 'gtk-doc: Fixing cross-references'
 	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
@@ -120,18 +120,4 @@
 maintainer-clean-local: clean
 	cd $(srcdir) && rm -rf html
 
-#
-# Require gtk-doc when making dist
-#
-dist-check-gtkdoc:
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/html
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	! which gtkdoc-rebase >/dev/null 2>&1 || \
-	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
 .PHONY : dist-hook-local docs