Ignore page.png

diff --git a/xsl/docx/Makefile b/xsl/docx/Makefile
index e17c92d96aab7d54a7b434022b6948bb1c966846..6fdb83f7bc2b0c1eeb7e7ec82a9aa4d42d7bbad1 100644 (file)
--- a/xsl/docx/Makefile
+++ b/xsl/docx/Makefile
@@ -12,6 +12,8 @@ TXT_MAKER = LANG=C w3mmee
 TXT_MAKER_FLAGS = -dump -config $(W3MMEECONFIG)
 W3MMEECONFIG = ../../releasetools/w3mmee_config
 
+XMLID_TO_ID=../tools/xsl/build/xmlid-to-id.xsl
+
 GZIP=gzip
 GZIPFLAGS=
 
@@ -21,21 +23,26 @@ DIRS=common fo html lib manpages pi refentry roundtrip slides/fo slides/html tem
 
 .PHONY : clean
 
+# rule for building file with includes resolved; uses hacky
+# stylesheet to transform all @xml:id instances to @id instances;
+# otherwise, xsltproc reports duplicate ID errors...
 %.included: %
-       $(XINCLUDE) $< >$@
+       $(XINCLUDE) $< > $@.tmp
+       $(DOCBOOK_SVN)/buildtools/saxon $@.tmp $(XMLID_TO_ID) > $@
+       $(RM) $@.tmp
 
 # build reference.pdf.gz except for snapshot releases
 ifneq (snapshot,$(findstring snapshot,$(RELVER)))
-all: reference.html reference.css reference.txt.gz reference.pdf.gz
+all: fo/page.png reference.html reference.css reference.txt.gz reference.pdf.gz
 else
-all: reference.html reference.css reference.txt.gz
+all: fo/page.png reference.html reference.css reference.txt.gz
 endif
 
 #reference.html: ../docsrcx/reference.xml.included $(REFERENCETXTXSL)
 #      $(XSLT) $< $(REFERENCETXTXSL) > $@
 
 index.html: ../docsrcx/reference.xml.included $(RSTYLE)
-       $(XSLT) $< $(RSTYLE) > $@
+       $(XSLT) $< $(RSTYLE)
 
 reference.html: index.html
        cp -p $< $@
@@ -44,10 +51,7 @@ reference.css: ../docsrcx/reference.css
        cp -p $< .
        for dir in $(DIRS); do cp -p $< $$dir; done
 
-debug:
-       @echo $(DIRS)
-
-reference.fo: ../docsrcx/reference.xml.included $(REFERENCEFOXSL)
+reference.fo: ../docsrcx/reference.xml.included $(REFERENCEFOXSL) fo/page.png
        $(DOCBOOK_SVN)/buildtools/xslt -$(FO_BUILDER) $< $(REFERENCEFOXSL) > $@
 
 reference.pdf: reference.fo
@@ -65,15 +69,20 @@ reference.pdf.gz: reference.pdf
 reference.txt.gz: reference.txt
        cat $< | $(GZIP) $(GZIPFLAGS) > $@
 
+fo/page.png: ../docsrcx/page.png
+       cp -p $< $@
+
 clean:
        $(RM) reference.css
        for dir in $(DIRS); do $(RM) $$dir/reference.css; done
        $(RM) reference.html
+       $(RM) reference.txt.html
        $(RM) reference.fo
        $(RM) reference.pdf
        $(RM) reference.pdf.gz
        $(RM) reference.txt.gz
        $(RM) reference.txt
+       $(RM) fo/page.png
        $(RM) ../docsrc/reference.xml.included
-       for file in $$(cat $(HTMLMANIFEST)); do $(RM) $$file; done
+       if [ -f $(HTMLMANIFEST) ]; then for file in $$(cat $(HTMLMANIFEST)); do $(RM) $$file; done; fi
        $(RM) $(HTMLMANIFEST)

diff --git a/xsl/docx/fo/.cvsignore b/xsl/docx/fo/.cvsignore
index 293c39ebb10bc89c79257619bccb4267269124b7..cb84c4cc5e22ad7116a69273a7b415906b1ec7a6 100644 (file)
--- a/xsl/docx/fo/.cvsignore
+++ b/xsl/docx/fo/.cvsignore
@@ -1,2 +1,3 @@
 *.html
 reference.css
+page.png