[cairo-commit] configure.ac doc/public

[Behdad Esfahbod]

 configure.ac              |    1 -
 doc/public/Makefile.am    |   13 +++++++------
 doc/public/version.xml.in |    1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit fe31c35d8672117a8586591abada4aa1b42a07ff
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Sep 11 17:31:07 2008 -0400

    [doc] Don't rebuild after every configure run
    
    The version.xml file was rebuilt all the time and forcing a full
    doc rebuild.  Not anymore unless cairo-version.h was changed.

diff --git a/configure.ac b/configure.ac
index 2f211cf..001e267 100644
--- a/configure.ac
+++ b/configure.ac
@@ -472,7 +472,6 @@ perf/Makefile
 util/Makefile
 doc/Makefile
 doc/public/Makefile
-doc/public/version.xml
 ])
 
 AC_OUTPUT
diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am
index e5ed28f..dfc26c8 100644
--- a/doc/public/Makefile.am
+++ b/doc/public/Makefile.am
@@ -32,9 +32,13 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml
 MKTMPL_OPTIONS=
 
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
-content_files =					\
-	version.xml				\
-	language-bindings.xml
+content_files =	\
+	language-bindings.xml \
+	version.xml \
+	$(NULL)
+
+version.xml: $(top_srcdir)/cairo-version.h
+	echo $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MICRO).$(CAIRO_VERSION_MINOR) > $@
 
 # Images to copy into HTML directory
 HTML_IMAGES =
@@ -46,9 +50,6 @@ include $(top_srcdir)/build/Makefile.am.gtk-doc
 
 dist-hook: doc
 
-# Version information for marking the documentation
-EXTRA_DIST += version.xml.in
-
 check: doc
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" top_srcdir="$(top_srcdir)" MAKE="$(MAKE)"
diff --git a/doc/public/version.xml.in b/doc/public/version.xml.in
deleted file mode 100644
index f5e3fc7..0000000
--- a/doc/public/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
- at CAIRO_VERSION_MAJOR@. at CAIRO_VERSION_MINOR@. at CAIRO_VERSION_MICRO@