From: Michael Smith Date: Sun, 3 Sep 2006 17:12:45 +0000 (+0000) Subject: Attempted to streamline maintenance of doc and docsrc builds a bit X-Git-Tag: release/1.79.1~6^2~2552 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7aaf29f6576572a904c647b7a1dec737ce17a711;p=docbook-dsssl Attempted to streamline maintenance of doc and docsrc builds a bit by consolidating common targets and pattern rules in Makefile.incl files that get included by makefiles within subdirectories. --- diff --git a/xsl/Makefile b/xsl/Makefile index a7a00a95e..53a704496 100644 --- a/xsl/Makefile +++ b/xsl/Makefile @@ -7,7 +7,7 @@ DISTRO=xsl # value of DISTRIB_DEPENDS is a space-separated list of any # targets for this distro's "distrib" target to depend on -DISTRIB_DEPENDS = website slides doc install.sh +DISTRIB_DEPENDS = doc install.sh # value of ZIP_EXCLUDES is a space-separated list of any file or # directory names (shell wildcards OK) that should be excluded @@ -25,11 +25,11 @@ URILIST = \ DIRS=extensions common lib html fo manpages htmlhelp javahelp wordml -.PHONY: distrib clean doc xhtml +.PHONY: distrib clean doc docsrc xhtml -all: litprog base xhtml docsrc +all: base xhtml -base: +base: litprog for i in $(DIRS) __bogus__; do \ if [ $$i != __bogus__ ] ; then \ echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \ @@ -42,11 +42,10 @@ litprog: xhtml: $(MAKE) -C xhtml -docsrc: +docsrc: base website slides $(MAKE) -C docsrc -doc: - $(MAKE) -C docsrc +doc: docsrc $(MAKE) -C doc website: diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile index 15c6d516c..5a91a4a6e 100644 --- a/xsl/doc/Makefile +++ b/xsl/doc/Makefile @@ -1,77 +1,4 @@ -include ../../cvstools/Makefile.incl -XSLTOPT= -PROCOPT= - -PDF_MAKER=xep -DOCBOOK_FILE_EXTENSION=.dbk -REFERENCE_MAKEFILE=../tools/make/Makefile.DocBook -FO_PARAMS = "--stringparam refentry.pagebreak 0" -HTML_PARAMS = "--stringparam html.longdesc 0 --param local.l10n.xml \"document('../common/l10n.xsl')\" --stringparam reference.autolabel '1' --stringparam toc.max.depth '1'" -TXT_MAKER = "LANG=C w3mmee" -TXT_MAKER_FLAGS = "-dump -config $(W3MMEECONFIG)" -W3MMEECONFIG = "../../releasetools/w3mmee_config" - -GZIP=gzip -GZIPFLAGS= - -.PHONY : clean - -RSTYLE=../docsrc/reference.xsl -VPATH=../docsrc - -DIRS=common refentry lib html fo manpages wordml slides website template pi - -all: html reference.txt.gz - -html: base copyright.html warranty.html reference.html index.html - -base: docsrc - for i in $(DIRS) __bogus__; do \ - if [ $$i != __bogus__ ] ; then \ - echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \ - fi \ - done - -docsrc: - $(MAKE) -C ../docsrc - -copyright.html: copyright.xml $(RSTYLE) - $(XJPARSE) $(VPATH)/$< - $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT) - -warranty.html: warranty.xml $(RSTYLE) - $(XJPARSE) $(VPATH)/$< - $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT) - -reference.html: reference.xml $(RSTYLE) - $(XJPARSE) $(VPATH)/$< - $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT) - -index.html: reference.html - cp -pR $< $@ - -reference.pdf: ../docsrc/reference.dbk docsrc $(REFERENCE_MAKEFILE) - $(MAKE) -f $(REFERENCE_MAKEFILE) ../docsrc/reference.pdf PDF_MAKER=$(PDF_MAKER) DOCBOOK_FILE_EXTENSION=$(DOCBOOK_FILE_EXTENSION) FO_PARAMS=$(FO_PARAMS) \ - && mv ../docsrc/reference.pdf . - -reference.txt: ../docsrc/reference.dbk docsrc $(REFERENCE_MAKEFILE) - $(MAKE) -f $(REFERENCE_MAKEFILE) ../docsrc/reference.txt TXT_MAKER=$(TXT_MAKER) TXT_MAKER_FLAGS=$(TXT_MAKER_FLAGS) DOCBOOK_FILE_EXTENSION=$(DOCBOOK_FILE_EXTENSION) HTML_PARAMS=$(HTML_PARAMS) \ - && mv ../docsrc/reference.txt . && $(RM) ../docsrc/reference.html - -reference.pdf.gz: reference.pdf - cat $< | $(GZIP) $(GZIPFLAGS) > $@ - -reference.txt.gz: reference.txt - cat $< | $(GZIP) $(GZIPFLAGS) > $@ - -clean: - $(RM) *.html - for i in $(DIRS) __bogus__; do \ - if [ $$i != __bogus__ ] ; then \ - echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \ - fi \ - done - $(RM) reference.pdf - $(RM) reference.txt - $(RM) reference.pdf.gz - $(RM) reference.txt.gz +include ../../../releasetools/Variables.mk +VPATH=../../docsrc/refentry +HTMLFILES = refentry.html +include ../Makefile.incl diff --git a/xsl/doc/Makefile.incl b/xsl/doc/Makefile.incl new file mode 100644 index 000000000..bf14b6085 --- /dev/null +++ b/xsl/doc/Makefile.incl @@ -0,0 +1,14 @@ +# Makefile.incl gets included by makefiles in all subdirs + +all: $(HTMLFILES) + +%.html : %.xml $(JREFHTML) + $(XSLT) $< $(JREFHTML) $@ $(XSLTOPT) + +param.html: docparam.xml + $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT) + touch param.html + +clean: + $(RM) $(HTMLFILES) + $(RM) *.html diff --git a/xsl/doc/common/Makefile b/xsl/doc/common/Makefile index 0388cbb1e..6535b3d99 100644 --- a/xsl/doc/common/Makefile +++ b/xsl/doc/common/Makefile @@ -1,15 +1,4 @@ -include ../../../cvstools/Makefile.incl - -STYLE=../../docsrc/jrefhtml.xsl +include ../../../releasetools/Variables.mk VPATH=../../docsrc/common -XSLTOPT= - HTMLFILES = common.html - -all: $(HTMLFILES) - -%.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ $(XSLTOPT) - -clean: - rm -f $(HTMLFILES) +include ../Makefile.incl diff --git a/xsl/doc/fo/Makefile b/xsl/doc/fo/Makefile index 2b483f70c..a9490b9b8 100644 --- a/xsl/doc/fo/Makefile +++ b/xsl/doc/fo/Makefile @@ -1,19 +1,4 @@ -include ../../../cvstools/Makefile.incl - -STYLE=../../docsrc/jrefhtml.xsl +include ../../../releasetools/Variables.mk VPATH=../../docsrc/fo -XSLTOPT= - HTMLFILES = param.html table.html - -all: $(HTMLFILES) - -%.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ $(XSLTOPT) - -param.html: docparam.xml - $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT) - touch param.html - -clean: - $(RM) $(HTMLFILES) +include ../Makefile.incl diff --git a/xsl/doc/html/Makefile b/xsl/doc/html/Makefile index 3428ece20..340cd61bd 100644 --- a/xsl/doc/html/Makefile +++ b/xsl/doc/html/Makefile @@ -1,19 +1,4 @@ -include ../../../cvstools/Makefile.incl - -STYLE=../../docsrc/jrefhtml.xsl +include ../../../releasetools/Variables.mk VPATH=../../docsrc/html -XSLTOPT= - HTMLFILES = param.html - -all: $(HTMLFILES) - -%.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ $(XSLTOPT) - -param.html: docparam.xml - $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT) - touch param.html - -clean: - $(RM) $(HTMLFILES) +include ../Makefile.incl diff --git a/xsl/doc/lib/Makefile b/xsl/doc/lib/Makefile index 6e07a245c..86745dca5 100644 --- a/xsl/doc/lib/Makefile +++ b/xsl/doc/lib/Makefile @@ -1,15 +1,4 @@ -include ../../../cvstools/Makefile.incl - -STYLE=../../docsrc/lrefentry.xsl +include ../../../releasetools/Variables.mk VPATH=../../lib -XSLTOPT= - HTMLFILES = lib.html - -all: $(HTMLFILES) - -%.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ $(XSLTOPT) - -clean: - rm -f $(HTMLFILES) +include ../Makefile.incl diff --git a/xsl/doc/manpages/Makefile b/xsl/doc/manpages/Makefile index d7dc3792f..dc0af9c37 100644 --- a/xsl/doc/manpages/Makefile +++ b/xsl/doc/manpages/Makefile @@ -1,19 +1,4 @@ -include ../../../cvstools/Makefile.incl - -STYLE=../../docsrc/jrefhtml.xsl +include ../../../releasetools/Variables.mk VPATH=../../docsrc/manpages -XSLTOPT= - HTMLFILES = param.html - -all: $(HTMLFILES) - -%.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ $(XSLTOPT) - -param.html: docparam.xml - $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT) - touch param.html - -clean: - rm -f *.html +include ../Makefile.incl diff --git a/xsl/doc/pi/Makefile b/xsl/doc/pi/Makefile index fc44777d9..67f17b787 100644 --- a/xsl/doc/pi/Makefile +++ b/xsl/doc/pi/Makefile @@ -1,19 +1,8 @@ -include ../../../cvstools/Makefile.incl - -STYLE=../../docsrc/jrefhtml.xsl +include ../../../releasetools/Variables.mk VPATH=../../docsrc/pi -XSLTOPT= - HTMLFILES = pi.html - -all: $(HTMLFILES) - -%.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ $(XSLTOPT) +include ../Makefile.incl pi.html: pi.xml $(XSLT) $< ../../docsrc/pirefentry.xsl $(XSLTOPT) touch pi.html - -clean: - rm -f *.html diff --git a/xsl/doc/slides/Makefile b/xsl/doc/slides/Makefile index 9989462fb..16b1a6c91 100644 --- a/xsl/doc/slides/Makefile +++ b/xsl/doc/slides/Makefile @@ -1,19 +1,4 @@ -include ../../../cvstools/Makefile.incl - -STYLE=../../docsrc/jrefhtml.xsl +include ../../../releasetools/Variables.mk VPATH=../../docsrc/slides/ -XSLTOPT= - HTMLFILES = param.html - -all: $(HTMLFILES) - -%.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ $(XSLTOPT) - -param.html: docparam.xml - $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT) - touch param.html - -clean: - $(RM) $(HTMLFILES) +include ../Makefile.incl diff --git a/xsl/doc/template/Makefile b/xsl/doc/template/Makefile index 49c6904bd..38e39f84b 100644 --- a/xsl/doc/template/Makefile +++ b/xsl/doc/template/Makefile @@ -1,15 +1,4 @@ -include ../../../cvstools/Makefile.incl - -STYLE=../../docsrc/jrefhtml.xsl +include ../../../releasetools/Variables.mk VPATH=../../docsrc/template -XSLTOPT= - HTMLFILES = titlepage.html - -all: $(HTMLFILES) - -%.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ $(XSLTOPT) - -clean: - rm -f $(HTMLFILES) +include ../Makefile.incl diff --git a/xsl/doc/website/Makefile b/xsl/doc/website/Makefile index 2794dafe9..56b16f8f9 100644 --- a/xsl/doc/website/Makefile +++ b/xsl/doc/website/Makefile @@ -1,19 +1,4 @@ -include ../../../cvstools/Makefile.incl - -STYLE=../../docsrc/jrefhtml.xsl +include ../../../releasetools/Variables.mk VPATH=../../docsrc/website -XSLTOPT= - HTMLFILES = param.html - -all: $(HTMLFILES) - -%.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ $(XSLTOPT) - -param.html: docparam.xml - $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT) - touch param.html - -clean: - $(RM) $(HTMLFILES) +include ../Makefile.incl diff --git a/xsl/doc/wordml/Makefile b/xsl/doc/wordml/Makefile index 899567a0b..e9533067c 100644 --- a/xsl/doc/wordml/Makefile +++ b/xsl/doc/wordml/Makefile @@ -1,19 +1,4 @@ -include ../../../cvstools/Makefile.incl - -STYLE=../../docsrc/jrefhtml.xsl +include ../../../releasetools/Variables.mk VPATH=../../docsrc/wordml -XSLTOPT= - HTMLFILES = param.html - -all: $(HTMLFILES) - -%.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ $(XSLTOPT) - -param.html: docparam.xml - $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT) - touch param.html - -clean: - rm -f *.html +include ../Makefile.incl diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile index a6709d33d..035e5bd52 100644 --- a/xsl/docsrc/Makefile +++ b/xsl/docsrc/Makefile @@ -1,5 +1,5 @@ include ../../cvstools/Makefile.incl -DIRS=common refentry html fo manpages wordml slides website template pi +DIRS=common refentry html fo manpages wordml slides website template DOCBOOK5_RNG=../../docbook/relaxng/docbook/docbook.rng PARAM_XSL_FILES=$(shell for file in $$(find . -name "param.xsl"); do \ @@ -23,10 +23,6 @@ clean: echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \ fi \ done - $(RM) reference.txt - $(RM) reference.html - $(RM) reference.fo - $(RM) reference.pdf $(DOCBOOK5_RNG): $(MAKE) -C $(dir $@) $(notdir $@) diff --git a/xsl/docsrc/Makefile.incl b/xsl/docsrc/Makefile.incl new file mode 100644 index 000000000..f9f212c54 --- /dev/null +++ b/xsl/docsrc/Makefile.incl @@ -0,0 +1,15 @@ +all: $(XMLFILES) + +clean: + $(RM) $(XMLFILES) + +%.refsect1.xml: %.xml $(JREF2REFSECT1) + $(XSLT) $< $(JREF2REFSECT1) $@ + +%.xml : %.xsl $(XSL2JREF) ../../docsrc/legalnotice.xml + $(XSLT) $< $(XSL2JREF) /dev/null output-file=$@ + $(XJPARSE) $@ + +docparam.xml: $(VPATH)/param.xsl + $(MAKE) -C $(VPATH) param.xml + cp $(VPATH)/param.xml docparam.xml diff --git a/xsl/docsrc/common/Makefile b/xsl/docsrc/common/Makefile index 8973b18b2..01e1c7829 100644 --- a/xsl/docsrc/common/Makefile +++ b/xsl/docsrc/common/Makefile @@ -1,20 +1,4 @@ -XSLT=../../../cvstools/saxon -XJPARSE=../../../cvstools/xjparse - -JSTYLE=../../docsrc/xsl2jref.xsl -TOREFSECT1=../../docsrc/torefsect1.xsl +include ../../../releasetools/Variables.mk VPATH=../../common - XMLFILES = common.xml common.refsect1.xml - -all: $(XMLFILES) - -clean: - rm -f $(XMLFILES) - -%.refsect1.xml: %.xml $(TOREFSECT1) - $(XSLT) $< $(TOREFSECT1) $@ - -%.xml : %.xsl $(JSTYLE) ../../docsrc/legalnotice.xml - $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ - $(XJPARSE) $@ +include ../Makefile.incl diff --git a/xsl/docsrc/fo/Makefile b/xsl/docsrc/fo/Makefile index c720aaf6f..844ee0bd7 100644 --- a/xsl/docsrc/fo/Makefile +++ b/xsl/docsrc/fo/Makefile @@ -1,23 +1,4 @@ -include ../../../cvstools/Makefile.incl - -JSTYLE=../../docsrc/xsl2jref.xsl -TOREFSECT1=../../docsrc/torefsect1.xsl +include ../../../releasetools/Variables.mk VPATH=../../fo - XMLFILES = docparam.xml table.xml table.refsect1.xml - -all: $(XMLFILES) - -clean: - $(RM) $(XMLFILES) - -%.refsect1.xml: %.xml $(TOREFSECT1) - $(XSLT) $< $(TOREFSECT1) $@ - -%.xml : %.xsl $(JSTYLE) - $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ - $(XJPARSE) $@ - -docparam.xml: ../../fo/param.xsl - $(MAKE) -C ../../fo param.xml - cp ../../fo/param.xml docparam.xml +include ../Makefile.incl diff --git a/xsl/docsrc/html/Makefile b/xsl/docsrc/html/Makefile index ecd9bf1ee..51cc59c8e 100644 --- a/xsl/docsrc/html/Makefile +++ b/xsl/docsrc/html/Makefile @@ -1,19 +1,4 @@ -include ../../../cvstools/Makefile.incl - -JSTYLE=../../docsrc/xsl2jref.xsl +include ../../../releasetools/Variables.mk VPATH=../../html - XMLFILES = docparam.xml - -all: $(XMLFILES) - -clean: - $(RM) $(XMLFILES) - -%.xml : %.xsl $(JSTYLE) - $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ - $(XJPARSE) $@ - -docparam.xml: ../../html/param.xsl - $(MAKE) -C ../../html param.xml - cp ../../html/param.xml docparam.xml +include ../Makefile.incl diff --git a/xsl/docsrc/torefsect1.xsl b/xsl/docsrc/jref2refsect1.xsl similarity index 100% rename from xsl/docsrc/torefsect1.xsl rename to xsl/docsrc/jref2refsect1.xsl diff --git a/xsl/docsrc/manpages/Makefile b/xsl/docsrc/manpages/Makefile index 0f1ae7b9e..c1b074518 100644 --- a/xsl/docsrc/manpages/Makefile +++ b/xsl/docsrc/manpages/Makefile @@ -1,19 +1,4 @@ -include ../../../cvstools/Makefile.incl - -JSTYLE=../../docsrc/xsl2jref.xsl +include ../../../releasetools/Variables.mk VPATH=../../manpages - XMLFILES = docparam.xml - -all: $(XMLFILES) - -clean: - rm -f $(XMLFILES) - -%.xml : %.xsl $(JSTYLE) - $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ - $(XJPARSE) $@ - -docparam.xml: ../../manpages/param.xsl - $(MAKE) -C ../../manpages param.xml - cp ../../manpages/param.xml docparam.xml +include ../Makefile.incl diff --git a/xsl/docsrc/pi/Makefile b/xsl/docsrc/pi/Makefile deleted file mode 100644 index a2d258030..000000000 --- a/xsl/docsrc/pi/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -XSLT=../../../cvstools/saxon -XJPARSE=../../../cvstools/xjparse - -JSTYLE=../../docsrc/xsl2jref.xsl -VPATH=../../pi - -XMLFILES = pi.xml - -all: $(XMLFILES) - -clean: - -echo nop - -%.xml : %.xsl $(JSTYLE) ../../docsrc/legalnotice.xml - $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ - $(XJPARSE) $@ diff --git a/xsl/docsrc/refentry/Makefile b/xsl/docsrc/refentry/Makefile index 64397b508..5be64c7b7 100644 --- a/xsl/docsrc/refentry/Makefile +++ b/xsl/docsrc/refentry/Makefile @@ -1,19 +1,4 @@ -XSLT=../../../cvstools/saxon -XJPARSE=../../../cvstools/xjparse - -JSTYLE=../../docsrc/xsl2jref.xsl -TOREFSECT1=../../docsrc/torefsect1.xsl +include ../../../releasetools/Variables.mk VPATH=../../common - XMLFILES = refentry.xml refentry.refsect1.xml - -all: $(XMLFILES) - -clean: - rm -f $(XMLFILES) - -%.refsect1.xml: %.xml $(TOREFSECT1) - $(XSLT) $< $(TOREFSECT1) $@ - -%.xml : %.xsl $(JSTYLE) ../../docsrc/legalnotice.xml - $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ +include ../Makefile.incl diff --git a/xsl/docsrc/reference.dbk b/xsl/docsrc/reference.dbk index f847a5509..6e156576c 100644 --- a/xsl/docsrc/reference.dbk +++ b/xsl/docsrc/reference.dbk @@ -14,7 +14,7 @@ - + diff --git a/xsl/docsrc/slides/Makefile b/xsl/docsrc/slides/Makefile index 9d8e33ec8..664ba7a89 100644 --- a/xsl/docsrc/slides/Makefile +++ b/xsl/docsrc/slides/Makefile @@ -1,19 +1,4 @@ -include ../../../cvstools/Makefile.incl - -JSTYLE=../../docsrc/xsl2jref.xsl +include ../../../releasetools/Variables.mk VPATH=../../../slides/xsl - XMLFILES = docparam.xml - -all: $(XMLFILES) - -clean: - $(RM) $(XMLFILES) - -%.xml : %.xsl $(JSTYLE) - $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ - $(XJPARSE) $@ - -docparam.xml: ../../../slides/xsl/param.xsl - $(MAKE) -C ../../../slides/xsl param.xml - cp ../../../slides/xsl/param.xml docparam.xml +include ../Makefile.incl diff --git a/xsl/docsrc/template/Makefile b/xsl/docsrc/template/Makefile index 67c93f9ad..dad0c4d82 100644 --- a/xsl/docsrc/template/Makefile +++ b/xsl/docsrc/template/Makefile @@ -1,20 +1,4 @@ -XSLT=../../../cvstools/saxon -XJPARSE=../../../cvstools/xjparse - -JSTYLE=../../docsrc/xsl2jref.xsl -TOREFSECT1=../../docsrc/torefsect1.xsl +include ../../../releasetools/Variables.mk VPATH=../../template - XMLFILES = titlepage.xml titlepage.refsect1.xml - -all: $(XMLFILES) - -clean: - rm -f $(XMLFILES) - -%.refsect1.xml: %.xml $(TOREFSECT1) - $(XSLT) $< $(TOREFSECT1) $@ - -%.xml : %.xsl $(JSTYLE) - $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ - $(XJPARSE) $@ +include ../Makefile.incl diff --git a/xsl/docsrc/website/Makefile b/xsl/docsrc/website/Makefile index 698f69757..8069db144 100644 --- a/xsl/docsrc/website/Makefile +++ b/xsl/docsrc/website/Makefile @@ -1,19 +1,4 @@ -include ../../../cvstools/Makefile.incl - -JSTYLE=../../docsrc/xsl2jref.xsl +include ../../../releasetools/Variables.mk VPATH=../../../website/xsl - XMLFILES = docparam.xml - -all: $(XMLFILES) - -clean: - $(RM) $(XMLFILES) - -%.xml : %.xsl $(JSTYLE) - $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ - $(XJPARSE) $@ - -docparam.xml: ../../../website/xsl/param.xsl - $(MAKE) -C ../../../website/xsl param.xml - cp ../../../website/xsl/param.xml docparam.xml +include ../Makefile.incl diff --git a/xsl/docsrc/wordml/Makefile b/xsl/docsrc/wordml/Makefile index a80b59b77..90afc4b59 100644 --- a/xsl/docsrc/wordml/Makefile +++ b/xsl/docsrc/wordml/Makefile @@ -1,19 +1,4 @@ -include ../../../cvstools/Makefile.incl - -JSTYLE=../../docsrc/xsl2jref.xsl +include ../../../releasetools/Variables.mk VPATH=../../wordml - XMLFILES = docparam.xml - -all: $(XMLFILES) - -clean: - rm -f $(XMLFILES) - -%.xml : %.xsl $(JSTYLE) - $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ - $(XJPARSE) $@ - -docparam.xml: ../../wordml/param.xsl - $(MAKE) -C ../../wordml param.xml - cp ../../wordml/param.xml docparam.xml +include ../Makefile.incl