aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authormorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>2010-02-10 22:12:22 +0000
committermorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>2010-02-10 22:12:22 +0000
commit86b47ac567fd17689f6fc10bdaec24fdad647882 (patch)
tree60232993dfa541da0f4b561af3ad1953bcc777b5 /Makefile.am
parentcae6a149488d2305a7da7424cf479f40b7ad3629 (diff)
Use automake to build things in docbook/ .
This at least gets the docbook source distributed, as requested in: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3871 Still to do: 1) get out-of-source-tree builds working 2) automatically check that everything is distributed with distcheck (requires (1) but it may also require building the docbook directory as part of "make all") 3) (optional) use automake rules to actually build the stuff (currently Makefile.am is basically some automake stuff wrapped around standard Makefile rules. Could this done better?) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31858 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 3cd33e4133..fa305790bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -622,8 +622,6 @@ EXTRA_DIST = \
debian/wireshark.manpages \
debian/wireshark.menu \
dfilters \
- docbook/Makefile.auto.am \
- docbook/ws.css \
doxygen.cfg.in \
dumpcap.c \
editcap.c \
@@ -824,7 +822,7 @@ else
install-exec-hook:
endif
-DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil
+DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil docbook
if HAVE_PLUGINS
SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc