[docbook-checkins] CVS: releasetools Targets.mk,1.23,1.24

[Michael S. <xm...@us...>]

Update of /cvsroot/docbook/releasetools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4130

Modified Files:
	Targets.mk 
Log Message:
Don't try to be quite so clever.


Index: Targets.mk
===================================================================
RCS file: /cvsroot/docbook/releasetools/Targets.mk,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -U2 -r1.23 -r1.24
--- Targets.mk	27 Mar 2006 05:31:09 -0000	1.23
+++ Targets.mk	27 Mar 2006 06:42:23 -0000	1.24
@@ -6,29 +6,22 @@
 debug:
 
-ifeq ($(TAGVER),$(shell if [ -f LatestTag ]; then cat LatestTag; fi))
-RELEASE-NOTES.html: RELEASE-NOTES.xml
-else
-RELEASE-NOTES.html: RELEASE-NOTES-$(TAGVER).xml
-endif
-	$(XSLT) $< $(DOC-LINK-STYLE) $@
+RELEASE-NOTES.html: RELEASE-NOTES.xml NEWS.xml
+	$(XINCLUDE) $< > RELEASE-NOTES-TMP.xml
+	$(XSLT) RELEASE-NOTES-TMP.xml $(DOC-LINK-STYLE) $@
+	$(RM) RELEASE-NOTES-TMP.xml
 
 RELEASE-NOTES.txt: RELEASE-NOTES.html
 	LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@
 
-ifeq ($(TAGVER),$(shell if [ -f LatestTag ]; then cat LatestTag; fi))
-RELEASE-NOTES.pdf: RELEASE-NOTES.xml
-else
-RELEASE-NOTES.pdf: RELEASE-NOTES-$(TAGVER).xml
-endif
-	$(XSLT) $< $(FO-STYLE) $(basename $<).fo $(FO_ENGINE).extensions=1 \
+RELEASE-NOTES.pdf: RELEASE-NOTES.xml NEWS.xml
+	$(XINCLUDE) $< > RELEASE-NOTES-TMP.xml
+	$(XSLT) RELEASE-NOTES-TMP.xml $(FO-STYLE) $(basename $<).fo $(FO_ENGINE).extensions=1 \
 	&& $(FO_ENGINE) $(FO_ENGINE_OPTS) $(basename $<).fo
-
-RELEASE-NOTES-$(TAGVER).xml: RELEASE-NOTES.xml NEWS.xml
-	$(XINCLUDE) $< > $@
+	$(RM) RELEASE-NOTES-TMP.xml
 
 $(MARKUP_XSL):
 	$(MAKE) -C $(dir $(MARKUP_XSL))
 
-NEWS.xml: ChangesSince$(LATEST_TAG).xml TERMS.xml
+NEWS.xml: ChangeLog.xml TERMS.xml
 	$(XSLT) $< $(CVS2CL2DOCBOOK) $@ \
 	latest-tag="'$(LATEST_TAG)'" \
@@ -42,5 +35,5 @@
 	LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@
 
-ChangesSince$(LATEST_TAG).xml: LatestTag
+ChangeLog.xml: LatestTag
 	$(CVS2CL) $(CVS2CL_OPTS) \
 	--delta $(LATEST_TAG):HEAD --xml -f $@ -g -q
@@ -54,11 +47,11 @@
 	| $(XSLTPROC) $(GET_LATEST_TAG) - > $@
 
-ChangeLog.xml.zip: ChangeLog.xml
+ChangeHistory.xml.zip: ChangeHistory.xml
 	$(ZIP) $(ZIP_OPTS) $@ $<
 	$(RM) $<
 
-# ChangeLog.xml holds the whole change history for the module,
+# ChangeHistory.xml holds the whole change history for the module,
 # including all subdirectories
-ChangeLog.xml:
+ChangeHistory.xml:
 	$(CVS2CL) $(CVS2CL_OPTS) \
 	--xml -f $@ -g -q
@@ -86,5 +79,5 @@
 	cp $(INSTALL_SH) install.sh
 
-distrib: all $(DISTRIB_DEPENDS) ChangeLog.xml.zip RELEASE-NOTES.txt RELEASE-NOTES.pdf $(NEWSFILE)
+distrib: all $(DISTRIB_DEPENDS) RELEASE-NOTES.txt RELEASE-NOTES.pdf $(NEWSFILE)
 
 newversion:
@@ -125,5 +118,5 @@
 endif
 
-zip:
+zip: ChangeHistory.xml.zip
 ifeq ($(ZIPVER),)
 	@echo You must specify ZIPVER for the zip target
@@ -233,7 +226,7 @@
 	$(RM) NEWS.html
 	$(RM) NEWS.xml
-	$(RM) RELEASE-NOTES-$(TAGVER).xml
-	$(RM) ChangeLog.xml.zip
-	$(RM) ChangesSince$(LATEST_TAG).xml
+	$(RM) RELEASE-NOTES-TMP.xml
+	$(RM) ChangeHistory.xml.zip
+	$(RM) ChangeLog.xml 
 	$(RM) LatestTag
 	$(RM) RELEASE-NOTES.txt