Make the build dependencies more consistent between platforms. Try to

fix the Windows build (without breaking the GNU toolchain build).

svn path=/trunk/; revision=31861

diff --git a/docbook/Makefile.am b/docbook/Makefile.am
index 7e74c0edf6cca8c408c7bdfcded9d4fe4a120261..595d6e3c5b3302d30f24a5cf9619a26d718084cf 100644 (file)
--- a/docbook/Makefile.am
+++ b/docbook/Makefile.am
@@ -36,6 +36,10 @@ endif
 
 include Makefile.common
 
+WSUG_SOURCE          = $(WSUG_SOURCE)          Makefile Makefile.common
+WSDG_SOURCE          = $(WSDG_SOURCE)          Makefile Makefile.common
+RELEASE_NOTES_SOURCE = $(RELEASE_NOTES_SOURCE) Makefile Makefile.common
+
 # Automatically generate .pdf files from .fo files
 # Suse needs FOP_OPTS, Debian needs JAVA_OPTS
 .fo.pdf:

diff --git a/docbook/Makefile.common b/docbook/Makefile.common
index e9c39dba2ac19ac6786d0ca6207c474cd58dff94..3f2f0863fcf47bd93aad9919b7c4d005ff9281fc 100644 (file)
--- a/docbook/Makefile.common
+++ b/docbook/Makefile.common
@@ -181,7 +181,6 @@ WSUG_SOURCE =       \
        svn_version.xml         \
        GPL_appendix.xml        \
        custom_layer_pdf.xsl    \
-       Makefile                \
        $(WSUG_FILES)           \
        $(WSUG_GRAPHICS)
 
@@ -191,14 +190,12 @@ WSDG_SOURCE =     \
        svn_version.xml         \
        GPL_appendix.xml        \
        custom_layer_pdf.xsl    \
-       Makefile                \
        $(WSDG_FILES)           \
        $(WSDG_GRAPHICS)
 
 RELEASE_NOTES_SOURCE = \
        release-notes.xml       \
-       svn_version.xml         \
-       Makefile
+       svn_version.xml
 
 CLEANFILES =   \
        *.chm                   \