diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-18 17:31:09 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-03-21 17:10:21 +0000 |
| commit | 52dd4fb6330a10ed37b8e221c502b5a98de4f581 (patch) | |
| tree | 9d3ea5b26003115f61ac5af0d9dd7997cbe7cfb2 /doc | |
| parent | 69d348c12a2d86e5fa75189cd2dd5f4f3784dcfc (diff) | |
| download | wireshark-52dd4fb6330a10ed37b8e221c502b5a98de4f581.tar.gz wireshark-52dd4fb6330a10ed37b8e221c502b5a98de4f581.tar.bz2 wireshark-52dd4fb6330a10ed37b8e221c502b5a98de4f581.zip | |
Fix building without extcap enabled
Using cmake -DENABLE_EXTCAP=no or ./configure --without-extcap.
Some documentation fixes too.
Change-Id: Iebf9c843d67e10a32de1a62904de8f88b872ec99
Reviewed-on: https://code.wireshark.org/review/14522
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 66ad3335cb..d26a5fb0c5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -75,7 +75,9 @@ man1_MANS = \ @sshdump_man@ \ @randpktdump_man@ -man4_MANS = @wiresharkfilter_man@ +man4_MANS = \ + @extcap_man@ \ + @wiresharkfilter_man@ man_MANS = # Build these in case a developer wants to read them and for the Debian @@ -86,7 +88,8 @@ noinst_DATA = asn2deb.1 asn2deb.html idl2deb.1 idl2deb.html idl2wrs.1 idl2wrs.ht pkgdata_DATA = AUTHORS-SHORT $(top_srcdir)/docbook/ws.css wireshark.html \ tshark.html wireshark-filter.html capinfos.html editcap.html \ mergecap.html reordercap.html text2pcap.html dumpcap.html androiddump.html \ - sshdump.html randpktdump.html rawshark.html dftest.html randpkt.html + sshdump.html randpktdump.html rawshark.html dftest.html randpkt.html \ + extcap.html # # Build the short version of the authors file for the about dialog @@ -134,7 +137,7 @@ POD_CSS_URL ?= $(top_srcdir)/docbook/ws.css --noindex \ $< > $@ -# This rule needs to stay separate because of the --section option. +# These rules need to stay separate because of the --section option. wireshark-filter.4: wireshark-filter.pod ../config.h $(AM_V_POD2MAN)$(POD2MAN) \ --section=4 \ @@ -142,6 +145,13 @@ wireshark-filter.4: wireshark-filter.pod ../config.h --release=$(VERSION) \ $(srcdir)/wireshark-filter.pod > wireshark-filter.4 +extcap.4: extcap.pod ../config.h + $(AM_V_POD2MAN)$(POD2MAN) \ + --section=4 \ + --center="The Wireshark Network Analyzer" \ + --release=$(VERSION) \ + $(srcdir)/extcap.pod > extcap.4 + # These rules need to stay separate because each man page has a separate # title. Using GNU make's pattern rules would allow these to be removed # but at the cost of portability. @@ -159,6 +169,13 @@ wireshark-filter.html: wireshark-filter.pod ../config.h $(top_srcdir)/docbook/ws --noindex \ $(srcdir)/wireshark-filter.pod > wireshark-filter.html +extcap.html: extcap.pod ../config.h $(top_srcdir)/docbook/ws.css + $(AM_V_POD2HTML)$(POD2HTML) \ + --title="extcap - The Wireshark Network Analyzer $(VERSION)" \ + --css=$(POD_CSS_URL) \ + --noindex \ + $(srcdir)/extcap.pod > extcap.html + capinfos.html: capinfos.pod ../config.h $(top_srcdir)/docbook/ws.css $(AM_V_POD2HTML)$(POD2HTML) \ --title="capinfos - The Wireshark Network Analyzer $(VERSION)" \ |