diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | docs/Makefile.am | 40 | ||||
| -rw-r--r-- | docs/reference/.cvsignore | 2 | ||||
| -rw-r--r-- | docs/reference/version.xml.in | 1 |
4 files changed, 42 insertions, 10 deletions
@@ -1,3 +1,12 @@ +2006-07-20 Johan Dahlin <jdahlin@async.com.br> + + * configure.ac: + * docs/Makefile.am: + * docs/reference/.cvsignore: + * docs/reference/version.xml.in: + Generate builddate.xml and version.xml at build time instead on + configure time, add proper dependencies. + 2006-07-19 John Finlay <finlay@moeraki.com> * docs/Makefile.am: Use more portable date generator. diff --git a/docs/Makefile.am b/docs/Makefile.am index 40714c2c..88835464 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,4 +1,5 @@ REF_VERSION = $(PYGOBJECT_MAJOR_VERSION).$(PYGOBJECT_MINOR_VERSION) +FULL_VERSION = $(REF_VERSION).$(PYGOBJECT_MICRO_VERSION) XMLFILES = \ reference/pygobject-introduction.xml \ @@ -40,22 +41,43 @@ HTML_DATA = \ html/index.sgml \ html/pygobject.devhelp -BUILT_SOURCES = build_stamp $(HTML_DATA) reference/version.xml \ - reference/builddate.xml -CLEANFILES = build_stamp $(HTML_DATA) reference/version.xml \ - reference/builddate.xml -EXTRA_DIST = $(XMLFILES) $(XSLFILES) reference/version.xml.in +BUILT_SOURCES = \ + build_stamp \ + reference/builddate.xml \ + reference/version.xml \ + $(HTML_DATA) -build_stamp: reference ${XMLFILES} ${XSLFILES} - python -c 'import datetime; print datetime.date.today()' \ - > reference/builddate.xml +CLEANFILES = \ + build_stamp \ + reference/builddate.xml \ + reference/version.xml \ + $(HTML_DATA) + +EXTRA_DIST = \ + $(XMLFILES) \ + $(XSLFILES) + +REFERENCE_DEPS = \ + reference/builddate.xml \ + reference/version.xml \ + reference \ + $(XMLFILES) \ + $(XSLFILES) + +reference/builddate.xml: + @$(PYTHON) -c 'import datetime; print datetime.date.today()' > $@ + +reference/version.xml: + @echo $(FULL_VERSION) > $@ + +build_stamp: $(REFERENCE_DEPS) xsltproc --nonet --xinclude -o html/ \ --stringparam gtkdoc.bookname "pygobject" \ --stringparam gtkdoc.version ${REF_VERSION} \ xsl/ref-html-style.xsl reference/pygobject-ref.xml touch $@ -pdf: reference ${XMLFILES} ${XSLFILES} +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 a7ec8077..3dd45460 100644 --- a/docs/reference/.cvsignore +++ b/docs/reference/.cvsignore @@ -1,2 +1,4 @@ *.html pygobject.devhelp +builddate.xml +version.xml diff --git a/docs/reference/version.xml.in b/docs/reference/version.xml.in deleted file mode 100644 index a24f9877..00000000 --- a/docs/reference/version.xml.in +++ /dev/null @@ -1 +0,0 @@ -@PACKAGE_VERSION@ |