example-tutorial Makefile,1.22,1.23

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27548

Modified Files:
	Makefile 
Log Message:
Show some improvement, and clean up a little


Index: Makefile
===================================================================
RCS file: /cvs/docs/example-tutorial/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile	28 Dec 2005 22:19:04 -0000	1.22
+++ Makefile	29 Dec 2005 22:39:06 -0000	1.23
@@ -44,22 +44,16 @@
 # Some packaging specific vars
 
 # These are obviated by new standard
-#VERSION=$(shell grep DOCID $(DOCBASE)-en.xml | sed 's/<!ENTITY DOCID "[^0-9\.]\+//' | sed 's/ .\+//')
 DATE=$(shell grep DOCID $(DOCBASE)-en.xml | sed 's/.\+(//' | sed 's/).\+//')
 VERSION=$(shell grep " DOCVERSION" $(DOCBASE)-en.xml | sed 's/.\+"\([0-9\.]\+\)".\+/\1/' )
 NOW=$(shell date +"%a %b %e %Y")
-#SPECIN=../docs-common/packaging/fedora-doc.spec.in.common
-#OMFIN=../docs-common/packaging/fedora-doc.omf.in.common
-#DESKTOPIN=../docs-common/packaging/fedora-doc.desktop.in.common
-#DOCSPEC=$(PWD)/$(DOCBASE).spec.in
-#DOCOMF=$(PWD)/fedora-doc-$(DOCBASE)-C.omf
-#DOCDESKTOP=$(PWD)/fedora-doc-$(DOCBASE).desktop
-#DOCSRCTAR=$(PWD)/$(DOCBASE)-$(VERSION).src.tar.gz
-#TITLE=$(shell ../docs-common/packaging/titlegrab.py $(DOCBASE)-en.xml | sed 's/^ \+//')
+
+XMLFORMAT=$(FDPDIR)/docs-common/bin/xmlformat
+XMLFOPTS=-f $(FDPDIR)/docs-common/bin/xmlformat-fdp.conf
 ######################################################
 # Some RPM flags...
 ######################################################
-RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_specdir $(PWD)"
+RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_srcrpmdir $(PWD)" --define "_specdir $(PWD)"
 ######################################################
 
 
@@ -99,33 +93,44 @@
 
 
 khelp.desktop::
-	$(XSLTPROC) ../docs-common/packaging/khelpcenter-plugin.xsl > \
-		fedora-doc-$(DOCBASE)-khelp.desktop
+	$(XSLTPROC) ../docs-common/packaging/khelpcenter-plugin.xsl \
+		rpm-info.xml > fedora-doc-$(DOCBASE)-khelp.desktop
+
+
+define omf_template
+omf-$(1)::
+	${XSLTPROC} ../docs-common/packaging/omf.xsl rpm-info.xml | \
+		$(XMLFORMAT) $(XMLFOPTS) > fedora-doc-$(DOCBASE)-$(1).omf
+endef
+
+omf::  $(foreach LANG,${LANGUAGES},omf-$(LANG))
+# correct lang=en for scrollkeeper document
+	mv fedora-doc-$(DOCBASE)-en.omf fedora-doc-$(DOCBASE)-C.omf
 
+$(foreach LANG,${LANGUAGES},$(eval $(call omf_template,${LANG})))
 
 
-$(DOCBASE)-$(VERSION).src.tar.gz::  fdp-info
+$(DOCBASE)-$(VERSION).src.tar.gz::  clean fdp-info gnome.desktop kde.desktop khelp.desktop omf
 	mkdir $(DOCBASE)-$(VERSION)
-	find . -maxdepth 1 -type f ! \( -name '*~' -o -name 'Makefile*' \
+	find . -maxdepth 1 -type f ! \( -name '*~' -o -name '#*' \
 		-o -name '$(DOCBASE)*.tar.gz' -o -name '.*' \) \
 		| cpio -pamdv $(DOCBASE)-$(VERSION)
 	find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \
 		-o -name 'CVS' -o -name '*~' -o -name '$(DOCBASE)*' \) \
 		| cpio -pamdv $(DOCBASE)-$(VERSION)
-#	( cd $(DOCBASE)-$(VERSION) ; tar xzf ../$(DOCBASE)-*.tar.gz )
-#	pwd
 	tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/
 	rm -rf $(DOCBASE)-$(VERSION)/
 
+src-tarball:: $(DOCBASE)-$(VERSION).src.tar.gz
+
 
-rpm::  clean $(DOCBASE)-$(VERSION).src.tar.gz spec gnome.desktop kde.desktop khelp.desktop
+rpm::  src-tarball spec
 # depend on source tarball and lang-specific HTML tarball
 # Make RPM build tree; don't rely on local user's setup
 	mkdir -p BUILD
-	rpmbuild -bb $(RPMFLAGS) fedora-doc-$(DOCBASE).spec
-	rpmbuild --clean --rmsource $(RPMFLAGS) $(DOCSPEC)
-#	rm -rf {BUILD,RPMS,SOURCES,SPECS,SRPMS}
-#	rm -rf $(DOCBASE)-$(VERSION)
+	rpmbuild -ba $(RPMFLAGS) fedora-doc-$(DOCBASE).spec
+	rpmbuild --clean --rmsource $(RPMFLAGS) fedora-doc-$(DOCBASE).spec
+	rm -rf BUILD
 
 
 showvars::