osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Use the docbook CSS for the man pages (which assumes your version of 

pod2html supports the "--css" flag). Package up the CSS file, and add
missing HTML files where needed.

svn path=/trunk/; revision=24428
This commit is contained in:
Gerald Combs 2008-02-22 20:03:36 +00:00
parent 2839497766
commit 4f996bd670
5 changed files with 72 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile.am
View File

@ -103,7 +103,7 @@ idl2wrs: tools/idl2wrs.sh Makefile
pkgdata_DATA = AUTHORS-SHORT COPYING manuf services wireshark.html \ pkgdata_DATA = AUTHORS-SHORT COPYING manuf services wireshark.html \
tshark.html wireshark-filter.html capinfos.html editcap.html \ tshark.html wireshark-filter.html capinfos.html editcap.html \
idl2wrs.html mergecap.html text2pcap.html dumpcap.html \ idl2wrs.html mergecap.html text2pcap.html dumpcap.html \
rawshark.html cfilters colorfilters dfilters smi_modules rawshark.html ws.css cfilters colorfilters dfilters smi_modules
# #
# Install the Diameter DTD and XML files in the "diameter" subdirectory # Install the Diameter DTD and XML files in the "diameter" subdirectory
@ -840,43 +840,46 @@ rawshark.1: doc/rawshark.pod
(cd doc ; \ (cd doc ; \
$(MAKE) ../rawshark.1 ) $(MAKE) ../rawshark.1 )
wireshark.html: doc/wireshark.pod AUTHORS-SHORT-FORMAT ws.css: docbook/ws.css
cp docbook/ws.css .
wireshark.html: doc/wireshark.pod AUTHORS-SHORT-FORMAT ws.css
(cd doc ; \ (cd doc ; \
$(MAKE) ../wireshark.html ) $(MAKE) ../wireshark.html )
tshark.html: doc/tshark.pod tshark.html: doc/tshark.pod ws.css
(cd doc ; \ (cd doc ; \
$(MAKE) ../tshark.html ) $(MAKE) ../tshark.html )
wireshark-filter.html: tshark doc/wireshark-filter.pod.template wireshark-filter.html: tshark doc/wireshark-filter.pod.template ws.css
(cd doc ; \ (cd doc ; \
$(MAKE) ../wireshark-filter.html ) $(MAKE) ../wireshark-filter.html )
capinfos.html: doc/capinfos.pod capinfos.html: doc/capinfos.pod ws.css
(cd doc ; \ (cd doc ; \
$(MAKE) ../capinfos.html ) $(MAKE) ../capinfos.html )
editcap.html: doc/editcap.pod editcap.html: doc/editcap.pod ws.css
(cd doc ; \ (cd doc ; \
$(MAKE) ../editcap.html ) $(MAKE) ../editcap.html )
idl2wrs.html: doc/idl2wrs.pod idl2wrs.html: doc/idl2wrs.pod ws.css
(cd doc ; \ (cd doc ; \
$(MAKE) ../idl2wrs.html ) $(MAKE) ../idl2wrs.html )
mergecap.html: doc/mergecap.pod mergecap.html: doc/mergecap.pod ws.css
(cd doc ; \ (cd doc ; \
$(MAKE) ../mergecap.html ) $(MAKE) ../mergecap.html )
text2pcap.html: doc/text2pcap.pod text2pcap.html: doc/text2pcap.pod ws.css
(cd doc ; \ (cd doc ; \
$(MAKE) ../text2pcap.html ) $(MAKE) ../text2pcap.html )
dumpcap.html: doc/dumpcap.pod dumpcap.html: doc/dumpcap.pod ws.css
(cd doc ; \ (cd doc ; \
$(MAKE) ../dumpcap.html ) $(MAKE) ../dumpcap.html )
rawshark.html: doc/rawshark.pod rawshark.html: doc/rawshark.pod ws.css
(cd doc ; \ (cd doc ; \
$(MAKE) ../rawshark.html ) $(MAKE) ../rawshark.html )

33
doc/Makefile.am
View File

@ -27,15 +27,19 @@
wireshark-tmp.pod: $(srcdir)/wireshark.pod $(top_builddir)/AUTHORS-SHORT-FORMAT wireshark-tmp.pod: $(srcdir)/wireshark.pod $(top_builddir)/AUTHORS-SHORT-FORMAT
cat $(srcdir)/wireshark.pod $(top_builddir)/AUTHORS-SHORT-FORMAT > wireshark-tmp.pod cat $(srcdir)/wireshark.pod $(top_builddir)/AUTHORS-SHORT-FORMAT > wireshark-tmp.pod
../ws.css: ../docbook/ws.css
cp ../docbook/ws.css ../
../wireshark.1: wireshark-tmp.pod ../config.h ../wireshark.1: wireshark-tmp.pod ../config.h
$(POD2MAN) \ $(POD2MAN) \
--center="The Wireshark Network Analyzer" \ --center="The Wireshark Network Analyzer" \
--release=$(VERSION) \ --release=$(VERSION) \
wireshark-tmp.pod | sed 's/WIRESHARK-TMP/WIRESHARK/' > ../wireshark.1 wireshark-tmp.pod | sed 's/WIRESHARK-TMP/WIRESHARK/' > ../wireshark.1
../wireshark.html: wireshark-tmp.pod ../config.h ../wireshark.html: wireshark-tmp.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="The Wireshark Network Analyzer $(VERSION)" \ --title="The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
wireshark-tmp.pod > ../wireshark.html wireshark-tmp.pod > ../wireshark.html
@ -45,9 +49,10 @@ wireshark-tmp.pod: $(srcdir)/wireshark.pod $(top_builddir)/AUTHORS-SHORT-FORMAT
--release=$(VERSION) \ --release=$(VERSION) \
$(srcdir)/tshark.pod > ../tshark.1 $(srcdir)/tshark.pod > ../tshark.1
../tshark.html: tshark.pod ../config.h ../tshark.html: tshark.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="tshark - The Wireshark Network Analyzer $(VERSION)" \ --title="tshark - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
$(srcdir)/tshark.pod > ../tshark.html $(srcdir)/tshark.pod > ../tshark.html
@ -58,9 +63,10 @@ wireshark-tmp.pod: $(srcdir)/wireshark.pod $(top_builddir)/AUTHORS-SHORT-FORMAT
--release=$(VERSION) \ --release=$(VERSION) \
wireshark-filter.pod > ../wireshark-filter.4 wireshark-filter.pod > ../wireshark-filter.4
../wireshark-filter.html: wireshark-filter.pod ../config.h ../wireshark-filter.html: wireshark-filter.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="wireshark-filter - The Wireshark Network Analyzer $(VERSION)" \ --title="wireshark-filter - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
wireshark-filter.pod > ../wireshark-filter.html wireshark-filter.pod > ../wireshark-filter.html
@ -73,9 +79,10 @@ wireshark-filter.pod: wireshark-filter.pod.template ../tshark
--release=$(VERSION) \ --release=$(VERSION) \
$(srcdir)/capinfos.pod > ../capinfos.1 $(srcdir)/capinfos.pod > ../capinfos.1
../capinfos.html: capinfos.pod ../config.h ../capinfos.html: capinfos.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="capinfos - The Wireshark Network Analyzer $(VERSION)" \ --title="capinfos - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
$(srcdir)/capinfos.pod > ../capinfos.html $(srcdir)/capinfos.pod > ../capinfos.html
@ -85,9 +92,10 @@ wireshark-filter.pod: wireshark-filter.pod.template ../tshark
--release=$(VERSION) \ --release=$(VERSION) \
$(srcdir)/editcap.pod > ../editcap.1 $(srcdir)/editcap.pod > ../editcap.1
../editcap.html: editcap.pod ../config.h ../editcap.html: editcap.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="editcap - The Wireshark Network Analyzer $(VERSION)" \ --title="editcap - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
$(srcdir)/editcap.pod > ../editcap.html $(srcdir)/editcap.pod > ../editcap.html
@ -97,9 +105,10 @@ wireshark-filter.pod: wireshark-filter.pod.template ../tshark
--release=$(VERSION) \ --release=$(VERSION) \
$(srcdir)/idl2wrs.pod > ../idl2wrs.1 $(srcdir)/idl2wrs.pod > ../idl2wrs.1
../idl2wrs.html: idl2wrs.pod ../config.h ../idl2wrs.html: idl2wrs.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="idl2wrs - The Wireshark Network Analyzer $(VERSION)" \ --title="idl2wrs - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
$(srcdir)/idl2wrs.pod > ../idl2wrs.html $(srcdir)/idl2wrs.pod > ../idl2wrs.html
@ -109,9 +118,10 @@ wireshark-filter.pod: wireshark-filter.pod.template ../tshark
--release=$(VERSION) \ --release=$(VERSION) \
$(srcdir)/mergecap.pod > ../mergecap.1 $(srcdir)/mergecap.pod > ../mergecap.1
../mergecap.html: mergecap.pod ../config.h ../mergecap.html: mergecap.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="mergecap - The Wireshark Network Analyzer $(VERSION)" \ --title="mergecap - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
$(srcdir)/mergecap.pod > ../mergecap.html $(srcdir)/mergecap.pod > ../mergecap.html
@ -121,9 +131,10 @@ wireshark-filter.pod: wireshark-filter.pod.template ../tshark
--release=$(VERSION) \ --release=$(VERSION) \
$(srcdir)/text2pcap.pod > ../text2pcap.1 $(srcdir)/text2pcap.pod > ../text2pcap.1
../text2pcap.html: text2pcap.pod ../config.h ../text2pcap.html: text2pcap.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="text2pcap - The Wireshark Network Analyzer $(VERSION)" \ --title="text2pcap - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
$(srcdir)/text2pcap.pod > ../text2pcap.html $(srcdir)/text2pcap.pod > ../text2pcap.html
@ -133,9 +144,10 @@ wireshark-filter.pod: wireshark-filter.pod.template ../tshark
--release=$(VERSION) \ --release=$(VERSION) \
$(srcdir)/dumpcap.pod > ../dumpcap.1 $(srcdir)/dumpcap.pod > ../dumpcap.1
../dumpcap.html: dumpcap.pod ../config.h ../dumpcap.html: dumpcap.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="dumpcap - The Wireshark Network Analyzer $(VERSION)" \ --title="dumpcap - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
$(srcdir)/dumpcap.pod > ../dumpcap.html $(srcdir)/dumpcap.pod > ../dumpcap.html
@ -145,9 +157,10 @@ wireshark-filter.pod: wireshark-filter.pod.template ../tshark
--release=$(VERSION) \ --release=$(VERSION) \
$(srcdir)/rawshark.pod > ../rawshark.1 $(srcdir)/rawshark.pod > ../rawshark.1
../rawshark.html: rawshark.pod ../config.h ../rawshark.html: rawshark.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="rawshark - The Wireshark Network Analyzer $(VERSION)" \ --title="rawshark - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
$(srcdir)/rawshark.pod > ../rawshark.html $(srcdir)/rawshark.pod > ../rawshark.html

33
doc/Makefile.nmake
View File

@ -41,15 +41,19 @@ wireshark-tmp.pod: wireshark.pod ../AUTHORS-SHORT-FORMAT
$(MAKE) /$(MAKEFLAGS) -f makefile.nmake AUTHORS-SHORT-FORMAT $(MAKE) /$(MAKEFLAGS) -f makefile.nmake AUTHORS-SHORT-FORMAT
cd doc cd doc
../ws.css: ../docbook/ws.css:
copy ..\docbook\ws.css ..
wireshark.1: wireshark.pod ../config.h wireshark.1: wireshark.pod ../config.h
$(POD2MAN) \ $(POD2MAN) \
--center="The Wireshark Network Analyzer" \ --center="The Wireshark Network Analyzer" \
--release=$(VERSION) \ --release=$(VERSION) \
wireshark-tmp.pod > wireshark.1 wireshark-tmp.pod > wireshark.1
wireshark.html: wireshark-tmp.pod ../config.h wireshark.html: wireshark-tmp.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="The Wireshark Network Analyzer $(VERSION)" \ --title="The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
wireshark-tmp.pod > wireshark.html wireshark-tmp.pod > wireshark.html
@ -64,9 +68,10 @@ tshark.1: tshark.pod ../config.h
--release=$(VERSION) \ --release=$(VERSION) \
tshark.pod > tshark.1 tshark.pod > tshark.1
tshark.html: tshark.pod ../config.h tshark.html: tshark.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="tshark - The Wireshark Network Analyzer $(VERSION)" \ --title="tshark - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
tshark.pod > tshark.html tshark.pod > tshark.html
@ -76,9 +81,10 @@ wireshark-filter.4: wireshark-filter.pod ../config.h
--release=$(VERSION) \ --release=$(VERSION) \
wireshark-filter.pod > wireshark.4 wireshark-filter.pod > wireshark.4
wireshark-filter.html: wireshark-filter.pod ../config.h wireshark-filter.html: wireshark-filter.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="wireshark-filter - The Wireshark Network Analyzer $(VERSION)" \ --title="wireshark-filter - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
wireshark-filter.pod > wireshark-filter.html wireshark-filter.pod > wireshark-filter.html
@ -95,9 +101,10 @@ capinfos.1: capinfos.pod ../config.h
--release=$(VERSION) \ --release=$(VERSION) \
capinfos.pod > capinfos.1 capinfos.pod > capinfos.1
capinfos.html: capinfos.pod ../config.h capinfos.html: capinfos.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="capinfos - The Wireshark Network Analyzer $(VERSION)" \ --title="capinfos - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
capinfos.pod > capinfos.html capinfos.pod > capinfos.html
@ -108,9 +115,10 @@ editcap.1: editcap.pod ../config.h
--release=$(VERSION) \ --release=$(VERSION) \
editcap.pod > editcap.1 editcap.pod > editcap.1
editcap.html: editcap.pod ../config.h editcap.html: editcap.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="editcap - The Wireshark Network Analyzer $(VERSION)" \ --title="editcap - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
editcap.pod > editcap.html editcap.pod > editcap.html
@ -120,9 +128,10 @@ idl2wrs.1: idl2wrs.pod ../config.h
--release=$(VERSION) \ --release=$(VERSION) \
idl2wrs.pod > idl2wrs.1 idl2wrs.pod > idl2wrs.1
idl2wrs.html: idl2wrs.pod ../config.h idl2wrs.html: idl2wrs.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="idl2wrs - The Wireshark Network Analyzer $(VERSION)" \ --title="idl2wrs - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
idl2wrs.pod > idl2wrs.html idl2wrs.pod > idl2wrs.html
@ -132,9 +141,10 @@ mergecap.1: mergecap.pod ../config.h
--release=$(VERSION) \ --release=$(VERSION) \
mergecap.pod > mergecap.1 mergecap.pod > mergecap.1
mergecap.html: mergecap.pod ../config.h mergecap.html: mergecap.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="mergecap - The Wireshark Network Analyzer $(VERSION)" \ --title="mergecap - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
mergecap.pod > mergecap.html mergecap.pod > mergecap.html
@ -144,9 +154,10 @@ text2pcap.1: text2pcap.pod ../config.h
--release=$(VERSION) \ --release=$(VERSION) \
text2pcap.pod > text2pcap.1 text2pcap.pod > text2pcap.1
text2pcap.html: text2pcap.pod ../config.h text2pcap.html: text2pcap.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="text2pcap - The Wireshark Network Analyzer $(VERSION)" \ --title="text2pcap - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
text2pcap.pod > text2pcap.html text2pcap.pod > text2pcap.html
@ -156,9 +167,10 @@ dumpcap.1: dumpcap.pod ../config.h
--release=$(VERSION) \ --release=$(VERSION) \
dumpcap.pod > dumpcap.1 dumpcap.pod > dumpcap.1
dumpcap.html: dumpcap.pod ../config.h dumpcap.html: dumpcap.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="dumpcap - The Wireshark Network Analyzer $(VERSION)" \ --title="dumpcap - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
dumpcap.pod > dumpcap.html dumpcap.pod > dumpcap.html
@ -168,9 +180,10 @@ rawshark.1: rawshark.pod ../config.h
--release=$(VERSION) \ --release=$(VERSION) \
rawshark.pod > rawshark.1 rawshark.pod > rawshark.1
rawshark.html: rawshark.pod ../config.h rawshark.html: rawshark.pod ../config.h ../ws.css
$(POD2HTML) \ $(POD2HTML) \
--title="rawshark - The Wireshark Network Analyzer $(VERSION)" \ --title="rawshark - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--noindex \ --noindex \
rawshark.pod > rawshark.html rawshark.pod > rawshark.html

16
packaging/nsis/Makefile.nmake
View File

@ -44,13 +44,17 @@ EXE=../../tshark.exe ../../editcap.exe \
!ENDIF !ENDIF
../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_4_0_2.exe ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_4_0_2.exe
DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll
DOC=../../doc/wireshark.html \ DOC=../../doc/ws.css \
../../doc/tshark.html \
../../doc/wireshark-filter.html \
../../doc/editcap.html \
../../doc/text2pcap.html \
../../doc/mergecap.html \
../../doc/capinfos.html \ ../../doc/capinfos.html \
../../doc/dumpcap.html \
../../doc/editcap.html \
../../doc/idl2wrs.html \
../../doc/mergecap.html \
../../doc/rawshark.html \
../../doc/text2pcap.html \
../../doc/tshark.html \
../../doc/wireshark-filter.html \
../../doc/wireshark.html \
../../FAQ \ ../../FAQ \
../../README \ ../../README \
../../README.win32 ../../README.win32

2
packaging/nsis/wireshark.nsi
View File

@ -348,6 +348,7 @@ File "..\..\COPYING"
File "NEWS.txt" File "NEWS.txt"
File "..\..\manuf" File "..\..\manuf"
File "..\..\services" File "..\..\services"
File "..\..\doc\ws.css"
File "..\..\doc\wireshark.html" File "..\..\doc\wireshark.html"
File "..\..\doc\wireshark-filter.html" File "..\..\doc\wireshark-filter.html"
File "..\..\dumpcap.exe" File "..\..\dumpcap.exe"
@ -760,6 +761,7 @@ SectionIn 1 2
!endif !endif
SetOutPath $INSTDIR SetOutPath $INSTDIR
File "..\..\rawshark.exe" File "..\..\rawshark.exe"
File "..\..\doc\rawshark.html"
SectionEnd SectionEnd
SectionGroup "Plugins / Extensions" SecPluginsGroup SectionGroup "Plugins / Extensions" SecPluginsGroup