diff options
| author | Paul W. Frields <stickster@gmail.com> | 2006-09-17 18:17:55 +0000 |
|---|---|---|
| committer | Paul W. Frields <stickster@gmail.com> | 2006-09-17 18:17:55 +0000 |
| commit | 7f85d7860540c69bb09fd8b38eb5a483d2af90ba (patch) | |
| tree | 3a90e9720c8a7dcd51fcb41ac03a64fab51a24e8 /Makefile.common | |
| parent | 4772e0a7b4360d377157590d5983a9fc8e279f71 (diff) | |
| download | fedora-doc-utils-7f85d7860540c69bb09fd8b38eb5a483d2af90ba.tar.gz fedora-doc-utils-7f85d7860540c69bb09fd8b38eb5a483d2af90ba.tar.xz fedora-doc-utils-7f85d7860540c69bb09fd8b38eb5a483d2af90ba.zip | |
Don't use phony prerequisites for real file targets. Since the FDP entity
files are really all XML dependencies, wrap them up in XMLDEPFILES,
and now we have easier maintenance and readability. I think I caused
this problem my own durn self, so it's only just that I fix it too. :-)
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Makefile.common b/Makefile.common index e6d6370..3947235 100644 --- a/Makefile.common +++ b/Makefile.common @@ -199,6 +199,7 @@ $(foreach L,${LANGUAGES},$(eval $(call XMLFILES_template,${L}))) # Append per-document dependancies $(foreach L, ${LANGUAGES}, $(eval XMLDEPFILES-${L}+=${DOC_ENTITIES_ENT-${L}})) $(foreach L, ${LANGUAGES}, $(eval XMLDEPFILES-${L}+=${L}/fdp-info.xml)) +$(foreach L, ${LANGUAGES}, $(eval XMLDEPFILES-${L}+=${L}/${FDP_ENTITIES})) # ######################################################################### @@ -495,7 +496,7 @@ distclean:: define HTML_template .PHONY: html-${1} html-$(1):: ${DOCBASE}-$(1)/index.html -${DOCBASE}-$(1)/index.html:: set-locale-${1} ${XMLFILES-${1}} ${XMLDEPFILES-${1}} +${DOCBASE}-$(1)/index.html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) $(1)/$(DOCBASE).xml mkdir -p $(DOCBASE)-$(1)/stylesheet-images/ cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images @@ -530,7 +531,7 @@ define HTMLNOCHUNK_template html-nochunks-$(1):: ${DOCBASE}-$(1).html -${DOCBASE}-$(1).html:: set-locale-${1} ${XMLFILES-${1}} ${XMLDEPFILES-${1}} +${DOCBASE}-$(1).html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} LANG=${1}.UTF-8 ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(1)/$(DOCBASE).xml mv $(DOCBASE).html $(DOCBASE)-$(1).html mkdir -p stylesheet-images/ @@ -588,7 +589,7 @@ tarball:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).tar.gz) define FO_template .PHONY: fo-${1} fo-${1}:: ${1}/${DOCBASE}.fo -${1}/${DOCBASE}.fo:: set-locale-${1} ${XMLFILES-${1}} ${XMLDEPFILES-${1}} +${1}/${DOCBASE}.fo:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} LANG=${1}.UTF-8 xsltproc --xinclude \ --stringparam FDPDIR ${FDPDIR} \ --stringparam IMGROOT ${PWD} \ @@ -638,7 +639,7 @@ define TXT_template txt-$(1) text-$(1):: ${DOCBASE}-$(1).txt -${DOCBASE}-$(1).txt:: set-locale-${1} ${XMLFILES-${1}} ${XMLDEPFILES-${1}} +${DOCBASE}-$(1).txt:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} ${XMLLINT} ${XMLLINTOPT} $(1)/$(DOCBASE).xml > $(1)/$(DOCBASE).lint.xml ${XSLTPROC} $(FDPDIR)/docs-common/packaging/strip-for-txt.xsl \ $(1)/$(DOCBASE).lint.xml > $(1)/$(DOCBASE).stripped.xml @@ -764,7 +765,7 @@ help:: define khelp_template .PHONY: khelp-$(1) -khelp-$(1):: set-locale-$(1) ${XMLFILES-$(1)} ${XMLDEPFILES-$(1)} +khelp-$(1):: ${XMLFILES-$(1)} ${XMLDEPFILES-$(1)} LANG=$(1).UTF-8 ${XMLLINT} --noent --xinclude $(1)/$(DOCBASE).xml 2>/dev/null >$(1)/$(DOCBASE).xml-parsed mkdir -p kde-$(1) ${MEINPROC} --output kde-$(1)/index.docbook \ @@ -946,13 +947,10 @@ $(foreach L,${LANGUAGES},$(eval $(call FDP_ENTITIES_template,${L}))) define LOCALE_template .PHONY: set-locale-${1} -set-locale-${1}:: ${1}/${FDP_ENTITIES} ${DOC_ENTITIES_ENT-${PRI_LANG}} +set-locale-${1}:: ${XMLDEPFILES-${1}} clean:: - ${RM} ${1}/${FDP_ENTITIES} -ifneq "${DOC_ENTITIES_ENT-${1}}" "" - ${RM} ${DOC_ENTITIES_ENT-${1}} -endif + ${RM} ${XMLDEPFILES-${1}} help:: @printf ${TFMT} 'set-locale-${1}' 'Link to locale ${1} FDP entities' |