[cairo-commit] cairo ChangeLog,1.612,1.613 gtk-doc.make,1.2,1.3

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv21135

Modified Files:
	ChangeLog gtk-doc.make 
Log Message:

        * gtk-doc.make: Re-synch with latest from gtk-doc CVS tree.

        * doc/public/Makefile.am (MKTMPL_OPTIONS): Add --only-section-tmpl
        option so that changes to inline documentation does not lead to
        churn in the .sgml template files.

        * doc/public/tmpl/cairo-font.sgml:
        * doc/public/tmpl/cairo-ft.sgml:
        * doc/public/tmpl/cairo-glitz.sgml:
        * doc/public/tmpl/cairo-matrix.sgml:
        * doc/public/tmpl/cairo-pattern.sgml:
        * doc/public/tmpl/cairo-pdf.sgml:
        * doc/public/tmpl/cairo-png.sgml:
        * doc/public/tmpl/cairo-ps.sgml:
        * doc/public/tmpl/cairo-quartz.sgml:
        * doc/public/tmpl/cairo-surface.sgml:
        * doc/public/tmpl/cairo-xcb.sgml:
        * doc/public/tmpl/cairo-xlib.sgml:
        * doc/public/tmpl/cairo.sgml: Commit new templates now that
        gtk-doc has ripped all the inline portions out.

        * doc/public/tmpl/cairo-win32.sgml:
        * doc/public/tmpl/cairo-xcb-xrender.sgml:
        * doc/public/tmpl/cairo-xlib-xrender.sgml: New template files
        added for new sections.

        * doc/public/cairo-sections.txt: Update to match current API.

        * src/cairo-xcb.h: Make parameter names match those in the .c file
        and its documentation.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -d -r1.612 -r1.613
--- ChangeLog	22 May 2005 18:12:46 -0000	1.612
+++ ChangeLog	24 May 2005 23:08:39 -0000	1.613
@@ -1,3 +1,36 @@
+2005-05-24  Carl Worth  <cworth at cworth.org>
+
+	* gtk-doc.make: Re-synch with latest from gtk-doc CVS tree.
+
+	* doc/public/Makefile.am (MKTMPL_OPTIONS): Add --only-section-tmpl
+	option so that changes to inline documentation does not lead to
+	churn in the .sgml template files.
+
+	* doc/public/tmpl/cairo-font.sgml:
+	* doc/public/tmpl/cairo-ft.sgml:
+	* doc/public/tmpl/cairo-glitz.sgml:
+	* doc/public/tmpl/cairo-matrix.sgml:
+	* doc/public/tmpl/cairo-pattern.sgml:
+	* doc/public/tmpl/cairo-pdf.sgml:
+	* doc/public/tmpl/cairo-png.sgml:
+	* doc/public/tmpl/cairo-ps.sgml:
+	* doc/public/tmpl/cairo-quartz.sgml:
+	* doc/public/tmpl/cairo-surface.sgml:
+	* doc/public/tmpl/cairo-xcb.sgml:
+	* doc/public/tmpl/cairo-xlib.sgml:
+	* doc/public/tmpl/cairo.sgml: Commit new templates now that
+	gtk-doc has ripped all the inline portions out.
+
+	* doc/public/tmpl/cairo-win32.sgml:
+	* doc/public/tmpl/cairo-xcb-xrender.sgml:
+	* doc/public/tmpl/cairo-xlib-xrender.sgml: New template files
+	added for new sections.
+
+	* doc/public/cairo-sections.txt: Update to match current API.
+
+	* src/cairo-xcb.h: Make parameter names match those in the .c file
+	and its documentation.
+
 2005-05-22  Carl Worth  <cworth at cworth.org>
 
 	* src/cairo.c (cairo_create): Protect less-than and greater-than

Index: gtk-doc.make
===================================================================
RCS file: /cvs/cairo/cairo/gtk-doc.make,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gtk-doc.make	9 Mar 2005 03:30:19 -0000	1.2
+++ gtk-doc.make	24 May 2005 23:08:39 -0000	1.3
@@ -1,9 +1,3 @@
-#
-# *** NOTE *** this file is checked into CVS for convenience only.
-# DO NOT EDIT. Rather get changes into upstream gtk-doc and then
-# update this version from the gtk-doc version.
-#
-
 # -*- mode: makefile -*-
 
 ####################################
@@ -31,7 +25,6 @@
 	$(content_files)		\
 	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE).types		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
 
@@ -55,7 +48,7 @@
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo '*** Scanning header files ***'
 	@-chmod -R u+w $(srcdir)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
 	    cd $(srcdir) ; \
@@ -75,7 +68,7 @@
 tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 	@echo '*** Rebuilding template files ***'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
 	touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
@@ -83,11 +76,11 @@
 
 #### xml ####
 
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo '*** Building XML ***'
 	@-chmod -R u+w $(srcdir)
 	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS)
 	touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -146,18 +139,15 @@
 	@false
 endif
 
-# XXX: Before this was:
-# 	dist-hook: dist-check-gtkdoc dist-hook-local
-# which seems reasonable, but for some reason the dist-check-gtkdoc
-# was always failing on me, even though I do have gtk-doc installed
-# and it is successfully building the documentation.
-
-dist-hook: dist-hook-local
+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
+	if test -f $(srcdir)/$(DOC_MODULE).types; then \
+	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
+	fi
 
 .PHONY : dist-hook-local