From 81793ee828136fefc57b4be41219e1372d834481 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 10 Feb 2010 23:34:46 +0000
Subject: [PATCH] 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
---
 docbook/Makefile.am     | 4 ++++
 docbook/Makefile.common | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docbook/Makefile.am b/docbook/Makefile.am
index 7e74c0edf6..595d6e3c5b 100644
--- 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 e9c39dba2a..3f2f0863fc 100644
--- 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			\
-- 
2.34.1