release-notes/devel Makefile,1.22,1.23

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/release-notes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13592

Modified Files:
	Makefile 
Log Message:
Make the building more template-heavy to make work easier



Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/devel/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile	28 Aug 2006 02:13:41 -0000	1.22
+++ Makefile	1 Sep 2006 22:27:39 -0000	1.23
@@ -8,7 +8,7 @@
 #
 DOCBASE        	= RELEASE-NOTES
 PRI_LANG	= en_US
-OTHERS		= de el es fr_FR it ja_JP nl pa pt pt_BR ru zh_CN # cs hr ml ms sv
+OTHERS		= de #el es fr_FR it ja_JP nl pa pt pt_BR ru # zh_CN cs hr ml ms sv
 FDPDIR		= ${PWD}/../..
 
 # Special legalnotice for this document:
@@ -197,7 +197,7 @@
 
 readme-${1}:: README-${1}.txt
 
-README-${1}.txt:: set-locale-${1} ${XMLFILES-${1}} ${XMLDEPFILES-${1}}
+README-${1}.txt::
 	LANG=${1}.UTF-8 ${XMLLINT} ${XMLLINTOPT} ${1}/README.xml > 	\
 		${1}/README.lint.xml
 	LANG=${1}.UTF-8 ${XSLTPROC}					\
@@ -210,7 +210,7 @@
 
 readme-isoburn-${1}:: README-BURNING-ISOS-${1}.txt
 
-README-BURNING-ISOS-${1}.txt:: set-locale-${1} ${XMLFILES-${1}} ${XMLDEPFILES-${1}}
+README-BURNING-ISOS-${1}.txt::
 	LANG=${1}.UTF-8 ${XMLLINT} ${XMLLINTOPT} ${1}/README-BURNING-ISOS.xml \
 		> ${1}/README-BURNING-ISOS.lint.xml
 	LANG=${1}.UTF-8 ${XSLTPROC}					\
@@ -242,52 +242,63 @@
 # 
 #########
 
-define PKG_template
-.PHONY: release-pkg-${1}
+define PKGOMF_DOC_template
+.PHONY: pkgomf-${1}-${2}
+pkgomf-${1}-${2}:: ${PKGNAME}-${VERSION}/${1}-${2}.omf
+
+${PKGNAME}-${VERSION}/${1}-${2}.omf:: omf-${2}
+	mkdir -p ${PKGNAME}-${VERSION}
+	cp ${2}/${1}.omf $$@
+
+endef
+
+$(foreach L,${LANGUAGES}, \
+	$(foreach F,$(patsubst ${PRI_LANG}/%.omf.in,%,${OMFINFILES}), \
+		$(eval $(call PKGOMF_DOC_template,${F},${L}))))
+
+define PKGOMF_template
+.PHONY: pkgomf-${1}
+pkgomf-${1}:: $(foreach F,$(patsubst ${PRI_LANG}/%.omf.in,%,${OMFINFILES}), \
+		pkgomf-${F}-${1})
+
+endef
+
+$(foreach L,${LANGUAGES},$(eval $(call PKGOMF_template,${L})))
+
+define PKGHTML_NOCHUNKS_template
+.PHONY: pkghtml-nochunks-${1}
+pkghtml-nochunks-${1}:: ${PKGNAME}-${VERSION}/${DOCBASE}-${1}.html
 ${PKGNAME}-${VERSION}/${DOCBASE}-${1}.html:: html-nochunks-${1}
 	mkdir -p ${PKGNAME}-${VERSION}
 	cp ${DOCBASE}-${1}.html $$@
+endef
 
+$(foreach L,${LANGUAGES},$(eval $(call PKGHTML_NOCHUNKS_template,${L})))
+
+define PKGTXT_template
+.PHONY: pkgtxt-${1}
+pkgtxt-${1}:: ${PKGNAME}-${VERSION}/${DOCBASE}-${1}.txt			\
+		${PKGNAME}-${VERSION}/README-${1}.txt
 ${PKGNAME}-${VERSION}/${DOCBASE}-${1}.txt:: txt-${1}
 	mkdir -p ${PKGNAME}-${VERSION}
 	cp ${DOCBASE}-${1}.txt $$@
-
+### README is hacked in until we have more control here...
 ${PKGNAME}-${VERSION}/README-${1}.txt:: txt-${1}
 	mkdir -p ${PKGNAME}-${VERSION}
 	cp README-${1}.txt $$@
-
-define PKGOMF_template
-$${PKGNAME}-$${VERSION}/$${1}-${1}.omf:: omf-${1}
-	mkdir -p ${PKGNAME}-${VERSION}
-	cp ${1}/$${1}.omf $$$$@
 endef
-$(foreach F,$(patsubst ${PRI_LANG}/%.omf.in,%,${OMFINFILES}),		\
-	$(eval $(call PKGOMF_template,${F})))
 
-release-pkg-${1}:: ${PKGNAME}-${VERSION}/${DOCBASE}-${1}.html		\
-	${PKGNAME}-${VERSION}/${DOCBASE}-${1}.txt			\
-	${PKGNAME}-${VERSION}/README-${1}.txt				\
-	$(foreach F,$(patsubst ${PRI_LANG}/%.omf.in,%,${OMFINFILES}),	\
-		${PKGNAME}-${VERSION}/${F}-${1}.omf)
-
-ifeq "${1}" "en_US"
-release-pkg-${1}::  ${PKGNAME}-${VERSION}/about/C/about-fedora.xml
-${PKGNAME}-${VERSION}/about/C/about-fedora.xml:: xml-${1}
-	mkdir -p ${PKGNAME}-${VERSION}/about/C
-	cp ${1}/about-fedora.xml $$@
-else
-release-pkg-${1}::  ${PKGNAME}-${VERSION}/about/${1}/about-fedora.xml
-${PKGNAME}-${VERSION}/about/${1}/about-fedora.xml:: xml-${1}
-	mkdir -p ${PKGNAME}-${VERSION}/about/${1}
-	cp ${1}/about-fedora.xml $$@
-endif
+$(foreach L,${LANGUAGES},$(eval $(call PKGTXT_template,${L})))
 
+define PKG_template
+.PHONY: release-pkg-${1}
+release-pkg-${1}:: pkghtml-nochunks-${1} pkgtxt-${1} pkgomf-${1}
 endef
 
 $(foreach L,${LANGUAGES},$(eval $(call PKG_template,${L})))
 
 .PHONY: release-pkg
-release-pkg:: clean ${PKGNAME}-${VERSION}.tar.gz
+release-pkg:: ${PKGNAME}-${VERSION}.tar.gz
 ${PKGNAME}-${VERSION}.tar.gz::  $(foreach LANG,${LANGUAGES},release-pkg-${LANG})
 	cp -a --parents css/*css fedora.css img/*png stylesheet-images/*png ${PKGNAME}-${VERSION}
 	cp -a about-* ${PKGNAME}-${VERSION}
@@ -304,7 +315,7 @@
 
 .PHONY: release-srpm
 release-srpm:: ${PKGNAME}-${VERSION}-${PKGRELEASE}.src.rpm
-${PKGNAME}-${VERSION}-${PKGRELEASE}.src.rpm::  ${SPECFILE} ${PKGNAME}-${VERSION}.tar.gz
+${PKGNAME}-${VERSION}-${PKGRELEASE}.src.rpm::  ${SPECFILE} release-pkg
 	rpmbuild -bs ${PKGRPMFLAGS} ${SPECFILE}
 
 clean::