[cairo-commit] cairo/doc/public Makefile.am,1.11,1.12

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	Makefile.am 
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: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/doc/public/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.am	18 Aug 2005 15:28:08 -0000	1.11
+++ Makefile.am	21 Aug 2005 16:57:19 -0000	1.12
@@ -56,7 +56,8 @@
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=
 
+include $(top_srcdir)/gtk-doc.make
+
 # Version information for marking the documentation
-EXTRA_DIST=version.xml.in
+EXTRA_DIST += version.xml.in
 
-include $(top_srcdir)/gtk-doc.make