work out dependencies in a .common way and make sure we nmake wsluarm

svn path=/trunk/; revision=22374

diff --git a/docbook/Makefile b/docbook/Makefile
index 4472e7d09e7403d3f8e9dd54edd5bc4f72564d8a..934ebeec2e5b47c60cac7f60a15b1a5bb9dfb59e 100644 (file)
--- a/docbook/Makefile
+++ b/docbook/Makefile
@@ -69,7 +69,7 @@ svn_version.xml: svn_version_check
 wsug: wsug_html_chunked user-guide.html user-guide-a4.pdf user-guide-us.pdf 
 
 # validate the content
-wsug.validated: $(WSUG_SOURCE) wsluarm
+wsug.validated: $(WSUG_SOURCE)
        @ echo --- WSUG - VALIDATING XML ---
        $(XMLLINT) --valid --noout $<
        touch $@
@@ -77,7 +77,7 @@ wsug.validated: $(WSUG_SOURCE) wsluarm
 # create html single page file
 user-guide.html: wsug_html/user-guide.html
 
-wsug_html/user-guide.html: $(WSUG_SOURCE) wsluarm
+wsug_html/user-guide.html: $(WSUG_SOURCE)
        @ echo --- WSUG - HTML SINGLE PAGE ---
        mkdir -p wsug_html/wsug_graphics/toolbar
        cp wsug_graphics/*.* wsug_html/wsug_graphics
@@ -89,7 +89,7 @@ wsug_html/user-guide.html: $(WSUG_SOURCE) wsluarm
 # create html chunked page files
 wsug_html_chunked: wsug_html_chunked/index.html
 
-wsug_html_chunked/index.html: $(WSUG_SOURCE) wsluarm
+wsug_html_chunked/index.html: $(WSUG_SOURCE)
        @ echo --- WSUG - HTML CHUNKED ---
        mkdir -p wsug_html_chunked/wsug_graphics/toolbar
        cp wsug_graphics/*.* wsug_html_chunked/wsug_graphics

diff --git a/docbook/Makefile.common b/docbook/Makefile.common
index 6205335251d5ec011d764b66a12520ff91abba9c..dfe0ffdeef8e87b2703ba367233e5ef54db1b7f9 100644 (file)
--- a/docbook/Makefile.common
+++ b/docbook/Makefile.common
@@ -162,6 +162,7 @@ WSUG_SOURCE =       \
        user-guide.xml          \
        svn_version.xml         \
        Makefile                        \
+       wsluarm                 \
        $(WSUG_FILES)           \
        $(WSUG_GRAPHICS)
 

diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake
index 1d8d70abe542242905dfbf3db88866cffb2e4687..a29c5500c63725f03ad3ddd909916d9a0770bffd 100644 (file)
--- a/docbook/Makefile.nmake
+++ b/docbook/Makefile.nmake
@@ -213,3 +213,9 @@ release-notes.chm: $(RELEASE_NOTES_SOURCE)
        -rm -r toc.hhc
 !endif
 
+
+wsluarm: make-wsluarm.pl $(WSLUA_MODULES)
+        $(PERL) make-wsluarm.pl $(WSLUA_MODULES)
+        touch wsluarm
+
+