diff options
| author | Paul W. Frields <stickster@gmail.com> | 2006-06-11 23:33:47 +0000 |
|---|---|---|
| committer | Paul W. Frields <stickster@gmail.com> | 2006-06-11 23:33:47 +0000 |
| commit | b94ca3b33ad50e78b57f3dbda90976b20dbb2af9 (patch) | |
| tree | d5fcbf85017899e004992f34826c3e256a61eb86 | |
| parent | 4f55912bf5d64344e37f78520c9ab01bc873f55d (diff) | |
| download | fedora-doc-utils-b94ca3b33ad50e78b57f3dbda90976b20dbb2af9.tar.gz fedora-doc-utils-b94ca3b33ad50e78b57f3dbda90976b20dbb2af9.tar.xz fedora-doc-utils-b94ca3b33ad50e78b57f3dbda90976b20dbb2af9.zip | |
Correcting dependency ordering slightly to fix some build, er, uniqueness
| -rw-r--r-- | Makefile.common | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.common b/Makefile.common index 7a150ae..6865a90 100644 --- a/Makefile.common +++ b/Makefile.common @@ -379,7 +379,7 @@ distclean:: define HTML_template .PHONY: html-${1} html-$(1):: ${DOCBASE}-$(1)/index.html -${DOCBASE}-$(1)/index.html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1} +${DOCBASE}-$(1)/index.html:: set-locale-${1} ${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 @@ -414,7 +414,7 @@ define HTMLNOCHUNK_template html-nochunks-$(1):: ${DOCBASE}-$(1).html -${DOCBASE}-$(1).html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1} +${DOCBASE}-$(1).html:: set-locale-${1} ${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/ @@ -472,7 +472,7 @@ tarball:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).tar.gz) define FO_template .PHONY: fo-${1} fo-${1}:: ${1}/${DOCBASE}.fo -${1}/${DOCBASE}.fo:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1} +${1}/${DOCBASE}.fo:: set-locale-${1} ${XMLFILES-${1}} ${XMLDEPFILES-${1}} LANG=${1}.UTF-8 xsltproc --xinclude \ --stringparam FDPDIR ${FDPDIR} \ --stringparam IMGROOT ${PWD} \ @@ -522,7 +522,7 @@ define TXT_template txt-$(1) text-$(1):: ${DOCBASE}-$(1).txt -${DOCBASE}-$(1).txt:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1} +${DOCBASE}-$(1).txt:: set-locale-${1} ${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 @@ -621,7 +621,7 @@ help:: define khelp_template .PHONY: khelp-$(1) -khelp-$(1):: ${XMLFILES-$(1)} ${XMLDEPFILES-$(1)} set-locale-$(1) +khelp-$(1):: set-locale-$(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 \ @@ -879,7 +879,7 @@ $(foreach L,${LANGUAGES},$(eval $(call FDP_ENTITIES_template,${L}))) define LOCALE_template .PHONY: set-locale-${1} -set-locale-${1}:: ${1}/${FDP_ENTITIES} +set-locale-${1}:: ${1}/${FDP_ENTITIES} ${PRI_LANG}/${DOC_ENTITIES}.ent clean:: ${RM} ${1}/${FDP_ENTITIES} @@ -903,7 +903,7 @@ define VALIDATE_template .PHONY: validate-xml-${1} -validate-xml-${1}:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1} +validate-xml-${1}:: set-locale-${1} ${XMLFILES-${1}} ${XMLDEPFILES-${1}} ${XMLLINT} --noout --xinclude --postvalid ${1}/${DOCBASE}.xml help:: |