aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-12-10 16:50:56 -0800
committerGerald Combs <gerald@wireshark.org>2014-12-11 21:41:44 +0000
commit1ce64e75ab4ac16e00cd664599b9b31c57a59f1a (patch)
treed76a4c48fddb78edf03d3661ad38ea3377b78264 /Makefile.am
parent425bc304fea88e8136c69d282547fba502b28708 (diff)
CMake: Make it easier to generate the release notes & NEWS.
Add convenience targets for generating the release notes and the NEWS file. Make sure we don't run multiple instances of a2x + AsciiDoc at the same time. Add the docbook directory to the build by default unless we're running Windows. Explain why we don't yet build docs on Windows. Make each docbook makefile target optional. Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on. Remove the Debian patch that hacked around the PDF requirement. Copy ws.css to the docbook build directory. Don't build PDF release notes. I'm not sure we ever used them and I don't want to install Java and FOP just to make a release. Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553 Reviewed-on: https://code.wireshark.org/review/5712 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index a2a5a0e3fc..4ccae65ae9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -784,7 +784,6 @@ EXTRA_DIST = \
debian/libwsutil0.install \
debian/libwsutil0.symbols \
debian/license-text-about-dialog \
- debian/patches/01_Disable-building-documentation-in-PDF-and-release-no.patch \
debian/patches/04_asn2wrs_ply.patch \
debian/patches/05_note-README-when-running-as-root.patch \
debian/patches/06_release-version.patch \