docbook: Windows: rebuild docs only when source or svn_version actually changes.

 Also: rebuild docs if docbook/Makefile.nmake or docbook/Makefile.common changes;
       rebuilding individual target (wdug, wsdg,...) will check for svn_version change.

svn path=/trunk/; revision=28497

1 files changed, 36 insertions, 11 deletions

diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake
index a211bc22a7..9d6551daf2 100644
--- a/docbook/Makefile.nmake
+++ b/docbook/Makefile.nmake
@@ -3,7 +3,7 @@
 # in several formats.
 # See the Readme.txt file for instructions.
 #
-## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
+## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake [target ...]
 #
 # $Id$
 #
@@ -14,31 +14,57 @@ TOOLS_DIR=..\tools
 include ..\config.nmake
 include Makefile.common
 
+WSUG_SOURCE          = $(WSUG_SOURCE)          Makefile.nmake Makefile.common
+WSDG_SOURCE          = $(WSDG_SOURCE)          Makefile.nmake Makefile.common
+RELEASE_NOTES_SOURCE = $(RELEASE_NOTES_SOURCE) Makefile.nmake Makefile.common
+
 # Automatically generate .pdf files from .fo files
 .fo.pdf:
 	$(FOP) $< $@
 
+.SUFFIXES: .fo .pdf
+
+# -- (Public) targets -------------------------------------------------------
+#    Note that the command for each of the four targets below recurse to
+#     force a reread of the svn_version.xml file date/time (which may or
+#      may not have been updated by the svn_version_check target).
+
+# Make all (default)
+all: svn_version_check 
+	@ $(MAKE) /$(MAKEFLAGS) -f makefile.nmake all_x
 
-all: svn_version_check wsug wsdg release_notes
+# Make only the WSUG
+wsug: svn_version_check
+	@ $(MAKE) /$(MAKEFLAGS) -f makefile.nmake wsug.validated wsug_x
 
+# Make only the WSDG
+wsdg: svn_version_check
+	@ $(MAKE) /$(MAKEFLAGS) -f makefile.nmake wsdg.validated wsdg_x
+
+# Make only the release notes
+release_notes: svn_version_check
+	@ $(MAKE) /$(MAKEFLAGS) -f makefile.nmake release_notes.validated release_notes_x
+
+# Clean all
 clean:
 	rm -rf $(CLEANFILES)
 
-.SUFFIXES: .fo .pdf
+## ----------------------------------------------------------------------------
 
-#
-# on every build, record the working copy revision string
-#
 # FORCE is the portable version of .PHONY
 FORCE:
 
+#
+# on every build, record the working copy revision string
+#   in svn_version.xml (if the svn version has changed)
 svn_version_check: FORCE
 	@ $(SH) ./check_svn_version.sh
 
-svn_version.xml: svn_version_check
+
+all_x: wsug.validated wsdg.validated release_notes.validated wsug_x wsdg_x release_notes_x
 
 
-wsug: wsug.validated wsug_html_chunked user-guide.html user-guide-a4.pdf user-guide-us.pdf user-guide.chm user-guide.zip
+wsug_x: wsug_html_chunked user-guide.html user-guide-a4.pdf user-guide-us.pdf user-guide.chm user-guide.zip
 
 # validate the content
 wsug.validated: $(WSUG_SOURCE)
@@ -106,7 +132,7 @@ user-guide.zip: user-guide.chm
 user-guide.zip:
 !endif
 
-wsdg: wsdg.validated wsdg_html_chunked developer-guide.html developer-guide-a4.pdf developer-guide-us.pdf developer-guide.chm
+wsdg_x: wsdg_html_chunked developer-guide.html developer-guide-a4.pdf developer-guide-us.pdf developer-guide.chm
 
 # validate the content
 wsdg.validated: $(WSDG_SOURCE)
@@ -165,8 +191,7 @@ developer-guide.chm: $(WSDG_SOURCE)
 	-rm -r toc.hhc
 !endif
 
-
-release_notes: release_notes.validated release-notes.html release-notes.txt release-notes-a4.pdf release-notes-us.pdf release-notes.chm
+release_notes_x: release-notes.html release-notes.txt release-notes-a4.pdf release-notes-us.pdf release-notes.chm
 
 # validate the content
 release_notes.validated: $(RELEASE_NOTES_SOURCE)