aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-11-24 23:03:13 +0100
committerAnders Broman <a.broman58@gmail.com>2016-04-25 07:22:28 +0000
commitae316e2d888e3204f08593c27b4c2360eff7f679 (patch)
tree26baec1e2daaee3578b4ae8450831703c47c877a /doc
parentc3574ed4173917f6ad89f40ab0b0dc0b1ad5e62d (diff)
Compile sshdump and ciscodump for Windows
Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43 Reviewed-on: https://code.wireshark.org/review/12117 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/CMakeLists.txt2
-rw-r--r--doc/Makefile.am12
-rw-r--r--doc/Makefile.nmake17
3 files changed, 27 insertions, 4 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index d2bc082c5a..fea2fb5227 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -97,6 +97,7 @@ set(MAN1_INSTALL_FILES
${CMAKE_CURRENT_BINARY_DIR}/androiddump.1
${CMAKE_CURRENT_BINARY_DIR}/capinfos.1
${CMAKE_CURRENT_BINARY_DIR}/captype.1
+ ${CMAKE_CURRENT_BINARY_DIR}/ciscodump.1
${CMAKE_CURRENT_BINARY_DIR}/dftest.1
${CMAKE_CURRENT_BINARY_DIR}/dumpcap.1
${CMAKE_CURRENT_BINARY_DIR}/editcap.1
@@ -124,6 +125,7 @@ set(HTML_INSTALL_FILES
${CMAKE_CURRENT_BINARY_DIR}/androiddump.html
${CMAKE_CURRENT_BINARY_DIR}/capinfos.html
${CMAKE_CURRENT_BINARY_DIR}/captype.html
+ ${CMAKE_CURRENT_BINARY_DIR}/ciscodump.html
${CMAKE_CURRENT_BINARY_DIR}/dftest.html
${CMAKE_CURRENT_BINARY_DIR}/dumpcap.html
${CMAKE_CURRENT_BINARY_DIR}/editcap.html
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4d69a91a48..6a2004b2d9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -86,7 +86,7 @@ man_MANS =
noinst_DATA = asn2deb.1 asn2deb.html idl2deb.1 idl2deb.html idl2wrs.1 idl2wrs.html
pkgdata_DATA = AUTHORS-SHORT $(top_srcdir)/docbook/ws.css wireshark.html \
- tshark.html wireshark-filter.html capinfos.html editcap.html \
+ tshark.html wireshark-filter.html capinfos.html ciscodump.html editcap.html \
mergecap.html reordercap.html text2pcap.html dumpcap.html androiddump.html \
sshdump.html randpktdump.html rawshark.html dftest.html randpkt.html \
extcap.html
@@ -237,6 +237,13 @@ sshdump.html: sshdump.pod ../config.h $(top_srcdir)/docbook/ws.css
--noindex \
$(srcdir)/sshdump.pod > sshdump.html
+ciscodump.html: ciscodump.pod ../config.h $(top_srcdir)/docbook/ws.css
+ $(AM_V_POD2HTML)$(POD2HTML) \
+ --title="ciscodump - The Wireshark Network Analyzer $(VERSION)" \
+ --css=$(POD_CSS_URL) \
+ --noindex \
+ $(srcdir)/ciscodump.pod > ciscodump.html
+
randpktdump.html: randpktdump.pod ../config.h $(top_srcdir)/docbook/ws.css
$(AM_V_POD2HTML)$(POD2HTML) \
--title="randpktdump - The Wireshark Network Analyzer $(VERSION)" \
@@ -307,6 +314,7 @@ EXTRA_DIST = \
asn2deb.pod \
capinfos.pod \
captype.pod \
+ ciscodump.pod \
dfilter2pod.pl \
dftest.pod \
dumpcap.pod \
@@ -326,7 +334,7 @@ EXTRA_DIST = \
rawshark.pod \
reordercap.pod \
sgml.doc.template \
- sshdump.pod \
+ sshdump.pod \
text2pcap.pod \
tshark.pod \
wireshark-filter.pod \
diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake
index ed5055c4ea..f56d2c78a7 100644
--- a/doc/Makefile.nmake
+++ b/doc/Makefile.nmake
@@ -25,7 +25,7 @@
include ../config.nmake
doc: wireshark.html tshark.html wireshark-filter.html capinfos.html \
- editcap.html idl2wrs.html mergecap.html reordercap.html \
+ ciscodump.html editcap.html idl2wrs.html mergecap.html reordercap.html \
text2pcap.html dumpcap.html androiddump.html sshdump.html rawshark.html \
dftest.html randpkt.html randpktdump.html \
idl2deb.html asn2deb.html extcap.html
@@ -33,7 +33,7 @@ doc: wireshark.html tshark.html wireshark-filter.html capinfos.html \
man: wireshark.1 tshark.1 wireshark-filter.4 capinfos.1 \
editcap.1 idl2wrs.1 mergecap.1 reordercap.1 \
text2pcap.1 dumpcap.1 androiddump.1 sshdump.1 rawshark.1 dftest.1 randpkt.1 \
- idl2deb.1 asn2deb.1 extcap.4 randpktdump.1
+ idl2deb.1 asn2deb.1 extcap.4 randpktdump.1 ciscodump.1
wireshark.pod: wireshark.pod.template AUTHORS-SHORT-FORMAT
copy /B wireshark.pod.template + AUTHORS-SHORT-FORMAT wireshark.pod
@@ -249,6 +249,19 @@ sshdump.html: sshdump.pod ../config.h ws.css
--noindex \
sshdump.pod > sshdump.html
+ciscodump.1: ciscodump.pod ../config.h
+ $(POD2MAN) \
+ --center="The Wireshark Network Analyzer" \
+ --release=$(VERSION) \
+ ciscodump.pod > ciscodump.1
+
+ciscodump.html: ciscodump.pod ../config.h ws.css
+ $(POD2HTML) \
+ --title="ciscodump - The Wireshark Network Analyzer $(VERSION)" \
+ --css=ws.css \
+ --noindex \
+ ciscodump.pod > ciscodump.html
+
randpktdump.1: randpktdump.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \