Clean up the build date/version mess I created. Now it's created during

    * configure.ac:
    * docs/Makefile.am:
    * docs/reference/.cvsignore:
    * docs/reference/entities.docbook.in:
    * docs/reference/pygobject-ref.xml:
    Clean up the build date/version mess I created.
    Now it's created during configure time and properly included in
    the docbook files. Also make sure distcheck passes

6 files changed, 30 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 68acdc5..1bd10cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-08-04  Johan Dahlin  <jdahlin@async.com.br>
+
+	* configure.ac:
+	* docs/Makefile.am:
+	* docs/reference/.cvsignore:
+	* docs/reference/entities.docbook.in:
+	* docs/reference/pygobject-ref.xml:
+	Clean up the build date/version mess I created.
+	Now it's created during configure time and properly included in
+	the docbook files. Also make sure distcheck passes
+
 2006-08-04  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
 
 	* configure.in: Add hack to disable libtool checking for g++ and
diff --git a/configure.ac b/configure.ac
index 0a32eb4..4a37cf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,6 +72,9 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 PLATFORM=`$PYTHON -c "from distutils import util; print util.get_platform()"`
 AC_SUBST(PLATFORM)
 
+BUILDDATE=`$PYTHON -c "import datetime; print datetime.date.today()"`
+AC_SUBST(BUILDDATE)
+
 AC_ARG_ENABLE(thread,
   AC_HELP_STRING([--disable-thread], [Disable pygobject threading support]),,
   enable_thread=yes)
@@ -134,6 +137,7 @@ AC_CONFIG_FILES(
   Makefile
   pygobject-2.0.pc
   docs/Makefile
+  docs/reference/entities.docbook
   gobject/Makefile
   examples/Makefile
   tests/Makefile
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f1a1af0..99cd5bc 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -2,6 +2,7 @@ REF_VERSION = $(PYGOBJECT_MAJOR_VERSION).$(PYGOBJECT_MINOR_VERSION)
 FULL_VERSION = $(REF_VERSION).$(PYGOBJECT_MICRO_VERSION)
 
 XMLFILES = 					\
+	reference/pygobject.xml			\
 	reference/pygobject-introduction.xml 	\
 	reference/pygobject-classes.xml 	\
 	reference/pygobject-constants.xml 	\
@@ -24,6 +25,8 @@ XSLFILES =			\
 XSLdir = $(datadir)/pygobject/xsl
 XSL_DATA = $(XSLFILES)
 
+BUILDDIR = $(top_builddir)/docs
+
 HTMLdir = $(datadir)/gtk-doc/html/pygobject
 HTML_DATA = 					\
 	html/pygobject-introduction.html	\
@@ -43,14 +46,10 @@ HTML_DATA = 					\
 
 BUILT_SOURCES = 			\
 	build_stamp 			\
-	reference/builddate.xml		\
-	reference/version.xml 		\
 	$(HTML_DATA)
 
 CLEANFILES = 				\
 	build_stamp 			\
-	reference/builddate.xml		\
-	reference/version.xml 		\
 	pygobject-ref.*			\
 	$(HTML_DATA)
 
@@ -59,25 +58,20 @@ EXTRA_DIST = 				\
 	$(XSLFILES)
 
 REFERENCE_DEPS = 			\
-	reference/version.xml 		\
 	reference 			\
 	$(XMLFILES)			\
 	$(XSLFILES)
 
-reference/builddate.xml: $(REFERENCE_DEPS)
-	@$(PYTHON) -c 'import datetime; print datetime.date.today()' > $@
-
-reference/version.xml: $(top_srcdir)/config.h
-	@echo $(FULL_VERSION) > $@
-
-build_stamp: $(REFERENCE_DEPS) reference/builddate.xml 
-	xsltproc --nonet --xinclude -o html/ \
+build_stamp: $(REFERENCE_DEPS)
+	xsltproc --nonet --xinclude -o $(BUILDDIR)/html/ \
+		 --path $(BUILDDIR)/reference:$(srcdir)/reference \
                  --stringparam gtkdoc.bookname "pygobject" \
                  --stringparam gtkdoc.version ${REF_VERSION} \
-                 xsl/ref-html-style.xsl reference/pygobject-ref.xml
+                 $(srcdir)/xsl/ref-html-style.xsl \
+                 $(srcdir)/reference/pygobject-ref.xml
 	touch $@
 
-pdf: $(REFERENCE_DEPS) reference/builddate.xml 
+pdf: $(REFERENCE_DEPS)
 	xsltproc --nonet --xinclude -o pygobject-ref.fo xsl/pdf-style.xsl \
 		reference/pygobject-ref.xml
 	pdfxmltex pygobject-ref.fo >output </dev/null
diff --git a/docs/reference/.cvsignore b/docs/reference/.cvsignore
index 3dd4546..9482099 100644
--- a/docs/reference/.cvsignore
+++ b/docs/reference/.cvsignore
@@ -1,4 +1,3 @@
 *.html
 pygobject.devhelp
-builddate.xml
-version.xml
+entities.docbook
diff --git a/docs/reference/entities.docbook.in b/docs/reference/entities.docbook.in
new file mode 100644
index 0000000..cc855cf
--- /dev/null
+++ b/docs/reference/entities.docbook.in
@@ -0,0 +1,2 @@
+<!ENTITY builddate "@BUILDDATE@">
+<!ENTITY version "@PACKAGE_VERSION@">
diff --git a/docs/reference/pygobject-ref.xml b/docs/reference/pygobject-ref.xml
index c455145..325367b 100644
--- a/docs/reference/pygobject-ref.xml
+++ b/docs/reference/pygobject-ref.xml
@@ -1,9 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
-<!ENTITY builddate SYSTEM "builddate.xml">
+<!ENTITY % entities SYSTEM "entities.docbook">
+%entities;
 ]>
+
 <book id="pygobject-reference" xmlns:xi="http://www.w3.org/2001/XInclude">
   <bookinfo>
     <pubdate>&builddate;</pubdate>