[cairo-commit] cairo ChangeLog, 1.931, 1.932 autogen.sh, 1.13, 1.14 gtk-doc.make, 1.3, 1.4

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	ChangeLog autogen.sh gtk-doc.make 
Log Message:
2005-08-21  Owen Taylor  <otaylor at redhat.com>

        * autogen.sh: When invoked as, say, ../autogen.sh, switch to
        the sourcedir to run the auto*. Based on corresponding code
        in GTK+'s autogen.sh. (#3402, Thomas Fitzsimmons)

        * gtk-doc.make: Update from gtk-doc CVS, bringing in some
        minor output changes. (Eliminate the *** from the messages
        that don't indicate errors.)

        * doc/public/Makefile.am (EXTRA_DIST): Use += for EXTRA_DIST,
        since gtk-doc.make already defines it.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.931
retrieving revision 1.932
diff -u -d -r1.931 -r1.932
--- ChangeLog	21 Aug 2005 16:27:52 -0000	1.931
+++ ChangeLog	21 Aug 2005 16:57:19 -0000	1.932
@@ -1,5 +1,18 @@
 2005-08-21  Owen Taylor  <otaylor at redhat.com>
 
+	* autogen.sh: When invoked as, say, ../autogen.sh, switch to
+	the sourcedir to run the auto*. Based on corresponding code
+	in GTK+'s autogen.sh. (#3402, Thomas Fitzsimmons)
+
+	* gtk-doc.make: Update from gtk-doc CVS, bringing in some
+	minor output changes. (Eliminate the *** from the messages
+	that don't indicate errors.)
+
+	* doc/public/Makefile.am (EXTRA_DIST): Use += for EXTRA_DIST,
+	since gtk-doc.make already defines it.
+
+2005-08-21  Owen Taylor  <otaylor at redhat.com>
+
 	* configure.in: Check for FT_Load_Sfnt_Table and disable
 	the PDF/PS backends if not found. (#4144, Billy Biggs)
 

Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/cairo/autogen.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- autogen.sh	5 Aug 2005 22:01:55 -0000	1.13
+++ autogen.sh	21 Aug 2005 16:57:19 -0000	1.14
@@ -25,6 +25,15 @@
 
 ARGV0=$0
 
+# Allow invocation from a separate build directory; in that case, we change
+# to the source directory to run the auto*, then change back before running configure
+srcdir=`dirname $ARGV0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+
+cd $srcdir
+
 if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 ; then
     if ($AUTOCONF --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$autoconf_min_vers') \
 			       exit 1; exit 0; }');
@@ -133,4 +142,6 @@
 
 do_cmd $AUTOCONF
 
-do_cmd ./configure --enable-maintainer-mode --enable-gtk-doc ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
+cd $ORIGDIR || exit 1
+
+do_cmd $srcdir/configure --enable-maintainer-mode --enable-gtk-doc ${1+"$@"} && echo "Now type \`make' to compile" || exit 1

Index: gtk-doc.make
===================================================================
RCS file: /cvs/cairo/cairo/gtk-doc.make,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gtk-doc.make	24 May 2005 23:08:39 -0000	1.3
+++ gtk-doc.make	21 Aug 2005 16:57:19 -0000	1.4
@@ -46,7 +46,7 @@
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo '*** Scanning header files ***'
+	@echo 'gtk-doc: Scanning header files'
 	@-chmod -R u+w $(srcdir)
 	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) ; \
@@ -66,7 +66,7 @@
 #### templates ####
 
 tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '*** Rebuilding template files ***'
+	@echo 'gtk-doc: Rebuilding template files'
 	@-chmod -R u+w $(srcdir)
 	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
 	touch tmpl-build.stamp
@@ -77,10 +77,10 @@
 #### xml ####
 
 sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo '*** Building XML ***'
+	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
 	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS)
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
 	touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -89,13 +89,13 @@
 #### html ####
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '*** Building HTML ***'
+	@echo 'gtk-doc: Building HTML'
 	@-chmod -R u+w $(srcdir)
 	rm -rf $(srcdir)/html 
 	mkdir $(srcdir)/html
 	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo '-- Fixing Crossreferences' 
+	@echo 'gtk-doc: Fixing cross-references' 
 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	touch html-build.stamp
 else