aboutsummaryrefslogtreecommitdiffstats
path: root/docbook
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2010-02-10 23:34:46 +0000
committerGerald Combs <gerald@wireshark.org>2010-02-10 23:34:46 +0000
commit81793ee828136fefc57b4be41219e1372d834481 (patch)
treea352c887798f144c19601d521030a8992a269f6e /docbook
parent71913d2700e3165aa2dcfec8c4788227bc67e364 (diff)
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
Diffstat (limited to 'docbook')
-rw-r--r--docbook/Makefile.am4
-rw-r--r--docbook/Makefile.common5
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 \