diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa78bea28b..81206536a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -848,20 +848,6 @@ ADD_CUSTOM_COMMAND(
${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
)
-ADD_CUSTOM_COMMAND(
- OUTPUT wireshark-filter.pod
- COMMAND tshark
- -G fields |
- ${PERL}
- ${CMAKE_SOURCE_DIR}/doc/dfilter2pod.pl
- ${CMAKE_SOURCE_DIR}/doc/wireshark-filter.pod.template
- > wireshark-filter.pod
- DEPENDS
- ${CMAKE_SOURCE_DIR}/doc/dfilter2pod.pl
- ${CMAKE_SOURCE_DIR}/doc/wireshark-filter.pod.template
- tshark
-)
-
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/capinfos 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/dftest 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/dumpcap 1 )
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ef88405808..b8a3ce45f1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -135,18 +135,14 @@ wireshark-filter.4: wireshark-filter.pod ../config.h
--section=4 \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
- wireshark-filter.pod > wireshark-filter.4
+ $(srcdir)/wireshark-filter.pod > wireshark-filter.4
wireshark-filter.html: wireshark-filter.pod ../config.h $(top_srcdir)/docbook/ws.css
$(POD2HTML) \
--title="wireshark-filter - The Wireshark Network Analyzer $(VERSION)" \
--css=$(top_srcdir)/docbook/ws.css \
--noindex \
- wireshark-filter.pod > wireshark-filter.html
-
-wireshark-filter.pod: wireshark-filter.pod.template ../tshark
- WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ../tshark -G fields | \
- $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/wireshark-filter.pod.template > wireshark-filter.pod
+ $(srcdir)/wireshark-filter.pod > wireshark-filter.html
capinfos.1: capinfos.pod ../config.h
$(POD2MAN) \
@@ -266,7 +262,6 @@ randpkt.html: randpkt.pod ../config.h $(top_srcdir)/docbook/ws.css
$(srcdir)/randpkt.pod > randpkt.html
CLEANFILES = \
- wireshark-filter.pod \
wireshark.pod \
wireshark-filter.4 \
wireshark-filter.html \
@@ -339,6 +334,6 @@ EXTRA_DIST = \
sgml.doc.template \
text2pcap.pod \
tshark.pod \
- wireshark-filter.pod.template \
+ wireshark-filter.pod \
wireshark.pod.template
diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake
index 37dc87b523..a37f7fedb5 100644
--- a/doc/Makefile.nmake
+++ b/doc/Makefile.nmake
@@ -91,18 +91,6 @@ wireshark-filter.html: wireshark-filter.pod ../config.h ws.css
--noindex \
wireshark-filter.pod > wireshark-filter.html
-tabchar=
-# We can't generate a filter list if we can't run TShark.
-wireshark-filter.pod: wireshark-filter.pod.template dfilter2pod.pl ../tshark.exe
-!if "$(PROCESSOR_ARCHITECTURE)" == "x86" && "$(WIRESHARK_TARGET_PLATFORM)" != "win32"
- $(PERL) dfilter2pod.pl -e wireshark-filter.pod.template > wireshark-filter.pod
-!else
- cd ..
- $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-all
- $(INSTALL_DIR)\tshark.exe -G | $(PERL) doc\dfilter2pod.pl doc\wireshark-filter.pod.template > doc\wireshark-filter.pod
- cd doc
-!endif
-
capinfos.1: capinfos.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
diff --git a/doc/doc.vcproj b/doc/doc.vcproj
index c2531eca25..fdfe9ad11a 100644
--- a/doc/doc.vcproj
+++ b/doc/doc.vcproj
@@ -155,7 +155,7 @@
>
+
+=item
+
+I in Wireshark
+
+=item
+
+C on the command line
+
+=item
+
+The Wireshark wiki: L
+
+=back
=head1 NOTES