summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Dahlin <johan@src.gnome.org>2006-08-21 21:01:51 +0000
committerJohan Dahlin <johan@src.gnome.org>2006-08-21 21:01:51 +0000
commit01561230b271ddd16fb650b53e2ed6cc40e99d35 (patch)
treea2f58096dfc463bfd6eaf8fa4b5a75b7be762a23
parentccc909291861fb58f06651ff59aadb5985d8ece6 (diff)
downloadpygobject-01561230b271ddd16fb650b53e2ed6cc40e99d35.tar.gz
pygobject-01561230b271ddd16fb650b53e2ed6cc40e99d35.tar.xz
pygobject-01561230b271ddd16fb650b53e2ed6cc40e99d35.zip
Remove builddate.xml, reference directory and fixxref.py
dependencies to avoid regenerating the tarball when it's not needed.
-rw-r--r--ChangeLog5
-rw-r--r--docs/Makefile.am24
2 files changed, 20 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index e177e52..d05bbf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
2006-08-21 Johan Dahlin <jdahlin@async.com.br>
* docs/Makefile.am (EXTRA_DIST): Remove build_stamp, include generated .html
- in the distributed tarball
-
+ in the distributed tarball. Remove builddate.xml, reference directory and fixxref.py
+ dependencies to avoid regenerating the tarball when it's not needed.
+
* configure.ac: Post release version bump
=== 2.11.3 ===
diff --git a/docs/Makefile.am b/docs/Makefile.am
index b3d59a5..a3c68d1 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -41,12 +41,15 @@ XML_FILES = \
XSL_FILES = \
xsl/common.xsl \
xsl/devhelp.xsl \
- xsl/fixxref.py \
xsl/html.xsl \
xsl/pdf-style.xsl \
xsl/pdf.xsl \
xsl/ref-html-style.xsl
+# fixxref cannot be included in XSL_FILES, because automake is touching it
+# so the date is newer then the files in HTML_FILES
+FIXXREF = xsl/fixxref.py
+
CSSdir = $(HTMLdir)
CSS_DATA = $(CSS_FILES)
@@ -54,20 +57,27 @@ HTMLdir = $(datadir)/gtk-doc/html/pygobject
HTML_DATA = $(HTML_FILES)
XSLdir = $(datadir)/pygobject/xsl
-XSL_DATA = $(XSL_FILES)
+XSL_DATA = $(XSL_FILES) $(FIXXREF)
BUILT_SOURCES = reference/builddate.xml $(HTML_FILES)
CLEANFILES = reference/builddate.xml $(HTML_FILES)
-EXTRA_DIST = $(XML_FILES) $(XSL_FILES) $(CSS_FILES) $(HTML_FILES)
-
-REFERENCE_DEPS = reference $(XML_FILES) $(XSL_FILES)
+EXTRA_DIST = \
+ $(HTML_FILES) \
+ $(XML_FILES) \
+ $(XSL_FILES) \
+ $(FIXXREF) \
+ $(CSS_FILES)
-reference/builddate.xml: $(REFERENCE_DEPS)
+reference/builddate.xml:
@$(PYTHON) -c 'import datetime; print datetime.date.today()' > $@
-$(HTML_FILES): $(REFERENCE_DEPS) reference/builddate.xml
+# Do not add a builddate.xml dependency here, because the generated html
+# documentation will be included in the tarball so xsltproc is not needed to
+# install the documentation. Adding a builddate.xml dependency will force
+# the documentation to be rebuilt when it doesn't need to be.
+$(HTML_FILES): $(XML_FILES) $(XSL_FILES)
@xsltproc --nonet --xinclude -o $(BUILDDIR)/html/ \
--path $(BUILDDIR)/reference:$(srcdir)/reference \
--stringparam gtkdoc.bookname "pygobject" \