docs-common Makefile.common,1.113,1.114

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1547/docs-common

Modified Files:
	Makefile.common 
Log Message:
Correcting dependency ordering slightly to fix some build, er, uniqueness


Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- Makefile.common	18 May 2006 22:59:11 -0000	1.113
+++ Makefile.common	11 Jun 2006 23:33:47 -0000	1.114
@@ -379,7 +379,7 @@
 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 @@
 
 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 @@
 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 @@
 
 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 @@
 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 @@
 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 @@
 
 .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::