Don't use (GNU-specific) pattern rules: use old-fashioned suffix rules instead.

Since there's now a suffix rule for the .1 man pages, don't create explicit
rules for them.  (Leave a comment explaining why the .html and .4 rules need
to stay.)

Simplify CLEANFILES: there's no need to list each man page, just remove them
all.

svn path=/trunk/; revision=48135

1 files changed, 61 insertions, 164 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a58132f098..f327a05a43 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -62,16 +62,16 @@
 # the "man{section}_MANS" variables.
 #
 man1_MANS = \
-	@wireshark_man@	\
-	@tshark_man@	\
-	@text2pcap_man@	\
-	@mergecap_man@	\
+	@wireshark_man@		\
+	@tshark_man@		\
+	@text2pcap_man@		\
+	@mergecap_man@		\
 	@reordercap_man@	\
-	@capinfos_man@	\
-	@editcap_man@	\
-	@dumpcap_man@	\
-	@rawshark_man@	\
-	@dftest_man@	\
+	@capinfos_man@		\
+	@editcap_man@		\
+	@dumpcap_man@		\
+	@rawshark_man@		\
+	@dftest_man@		\
 	@randpkt_man@
 man4_MANS = @wiresharkfilter_man@
 man_MANS =
@@ -117,39 +117,30 @@ AM_V_POD2HTML = $(am__v_POD2HTML_@AM_V@)
 am__v_POD2HTML_ = $(am__v_POD2HTML_@AM_DEFAULT_V@)
 am__v_POD2HTML_0 = @echo "  POD2HTML" $@;
 
-%.1: $(srcdir)/%.pod ../config.h
+.pod.1: ../config.h
 	$(AM_V_POD2MAN)$(POD2MAN)                       \
 	--center="The Wireshark Network Analyzer"       \
 	--release=$(VERSION)                            \
 	$< > $@
 
-%.html: $(srcdir)/%.pod ../config.h
+.pod.html: ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)                             \
 	--title="The Wireshark Network Analyzer $(VERSION)"	\
 	--css=$(top_srcdir)/docbook/ws.css			\
 	--noindex						\
 	$< > $@
 
-
-wireshark.1: wireshark.pod ../config.h
-	$(AM_V_POD2MAN)$(POD2MAN)			\
-	--center="The Wireshark Network Analyzer"	\
-	--release=$(VERSION)				\
-	wireshark.pod  > wireshark.1
-
-wireshark.html: wireshark.pod ../config.h $(top_srcdir)/docbook/ws.css
-	$(AM_V_POD2HTML)$(POD2HTML)					\
-	--title="The Wireshark Network Analyzer $(VERSION)"	\
-	--css=$(top_srcdir)/docbook/ws.css			\
-	--noindex						\
-	wireshark.pod > wireshark.html
-
-tshark.1: tshark.pod ../config.h
+# This rule needs to stay separate because of the --section option.
+wireshark-filter.4: wireshark-filter.pod ../config.h
 	$(AM_V_POD2MAN)$(POD2MAN)			\
+	--section=4					\
 	--center="The Wireshark Network Analyzer"	\
 	--release=$(VERSION)				\
-	$(srcdir)/tshark.pod > tshark.1
+	$(srcdir)/wireshark-filter.pod > wireshark-filter.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.
 tshark.html: tshark.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)					\
 	--title="tshark - The Wireshark Network Analyzer $(VERSION)"	\
@@ -157,13 +148,6 @@ tshark.html: tshark.pod ../config.h $(top_srcdir)/docbook/ws.css
 	--noindex							\
 	$(srcdir)/tshark.pod > tshark.html
 
-wireshark-filter.4: wireshark-filter.pod ../config.h
-	$(AM_V_POD2MAN)$(POD2MAN)			\
-	--section=4					\
-	--center="The Wireshark Network Analyzer"	\
-	--release=$(VERSION)				\
-	$(srcdir)/wireshark-filter.pod > wireshark-filter.4
-
 wireshark-filter.html: wireshark-filter.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)						\
 	--title="wireshark-filter - The Wireshark Network Analyzer $(VERSION)"	\
@@ -171,12 +155,6 @@ wireshark-filter.html: wireshark-filter.pod ../config.h $(top_srcdir)/docbook/ws
 	--noindex								\
 	$(srcdir)/wireshark-filter.pod > wireshark-filter.html
 
-capinfos.1: capinfos.pod ../config.h
-	$(AM_V_POD2MAN)$(POD2MAN)			\
-	--center="The Wireshark Network Analyzer"	\
-	--release=$(VERSION)				\
-	$(srcdir)/capinfos.pod > capinfos.1
-
 capinfos.html: capinfos.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)					\
 	--title="capinfos - The Wireshark Network Analyzer $(VERSION)"	\
@@ -184,12 +162,6 @@ capinfos.html: capinfos.pod ../config.h $(top_srcdir)/docbook/ws.css
 	--noindex							\
 	$(srcdir)/capinfos.pod > capinfos.html
 
-editcap.1: editcap.pod ../config.h
-	$(AM_V_POD2MAN)$(POD2MAN)			\
-	--center="The Wireshark Network Analyzer"	\
-	--release=$(VERSION)				\
-	$(srcdir)/editcap.pod > editcap.1
-
 editcap.html: editcap.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)					\
 	--title="editcap - The Wireshark Network Analyzer $(VERSION)"	\
@@ -197,12 +169,6 @@ editcap.html: editcap.pod ../config.h $(top_srcdir)/docbook/ws.css
 	--noindex							\
 	$(srcdir)/editcap.pod > editcap.html
 
-idl2wrs.1: idl2wrs.pod ../config.h
-	$(AM_V_POD2MAN)$(POD2MAN)			\
-	--center="The Wireshark Network Analyzer"	\
-	--release=$(VERSION)				\
-	$(srcdir)/idl2wrs.pod > idl2wrs.1
-
 idl2wrs.html: idl2wrs.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)					\
 	--title="idl2wrs - The Wireshark Network Analyzer $(VERSION)"	\
@@ -210,12 +176,6 @@ idl2wrs.html: idl2wrs.pod ../config.h $(top_srcdir)/docbook/ws.css
 	--noindex							\
 	$(srcdir)/idl2wrs.pod > idl2wrs.html
 
-mergecap.1: mergecap.pod ../config.h
-	$(AM_V_POD2MAN)$(POD2MAN)			\
-	--center="The Wireshark Network Analyzer"	\
-	--release=$(VERSION)				\
-	$(srcdir)/mergecap.pod > mergecap.1
-
 mergecap.html: mergecap.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)					\
 	--title="mergecap - The Wireshark Network Analyzer $(VERSION)"	\
@@ -223,12 +183,6 @@ mergecap.html: mergecap.pod ../config.h $(top_srcdir)/docbook/ws.css
 	--noindex							\
 	$(srcdir)/mergecap.pod > mergecap.html
 
-reordercap.1: reordercap.pod ../config.h
-	$(AM_V_POD2MAN)$(POD2MAN)			\
-	--center="The Wireshark Network Analyzer"	\
-	--release=$(VERSION)				\
-	$(srcdir)/reordercap.pod > reordercap.1
-
 reordercap.html: reordercap.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)					\
 	--title="reordercap - The Wireshark Network Analyzer $(VERSION)"	\
@@ -236,12 +190,6 @@ reordercap.html: reordercap.pod ../config.h $(top_srcdir)/docbook/ws.css
 	--noindex							\
 	$(srcdir)/reordercap.pod > reordercap.html
 
-text2pcap.1: text2pcap.pod ../config.h
-	$(AM_V_POD2MAN)$(POD2MAN)			\
-	--center="The Wireshark Network Analyzer"	\
-	--release=$(VERSION)				\
-	$(srcdir)/text2pcap.pod > text2pcap.1
-
 text2pcap.html: text2pcap.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)                     \
 	--title="text2pcap - The Wireshark Network Analyzer $(VERSION)"	\
@@ -249,12 +197,6 @@ text2pcap.html: text2pcap.pod ../config.h $(top_srcdir)/docbook/ws.css
 	--noindex							\
 	$(srcdir)/text2pcap.pod > text2pcap.html
 
-dumpcap.1: dumpcap.pod ../config.h
-	$(AM_V_POD2MAN)$(POD2MAN)			\
-	--center="The Wireshark Network Analyzer"	\
-	--release=$(VERSION)				\
-	$(srcdir)/dumpcap.pod > dumpcap.1
-
 dumpcap.html: dumpcap.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)                     \
 	--title="dumpcap - The Wireshark Network Analyzer $(VERSION)"	\
@@ -262,12 +204,6 @@ dumpcap.html: dumpcap.pod ../config.h $(top_srcdir)/docbook/ws.css
 	--noindex							\
 	$(srcdir)/dumpcap.pod > dumpcap.html
 
-rawshark.1: rawshark.pod ../config.h
-	$(AM_V_POD2MAN)$(POD2MAN)			\
-	--center="The Wireshark Network Analyzer"	\
-	--release=$(VERSION)				\
-	$(srcdir)/rawshark.pod > rawshark.1
-
 rawshark.html: rawshark.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)                     \
 	--title="rawshark - The Wireshark Network Analyzer $(VERSION)"	\
@@ -275,12 +211,6 @@ rawshark.html: rawshark.pod ../config.h $(top_srcdir)/docbook/ws.css
 	--noindex							\
 	$(srcdir)/rawshark.pod > rawshark.html
 
-dftest.1: dftest.pod ../config.h
-	$(AM_V_POD2MAN)$(POD2MAN)			\
-	--center="The Wireshark Network Analyzer"	\
-	--release=$(VERSION)				\
-	$(srcdir)/dftest.pod > dftest.1
-
 dftest.html: dftest.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)                     \
 	--title="dftest - The Wireshark Network Analyzer $(VERSION)"	\
@@ -288,12 +218,6 @@ dftest.html: dftest.pod ../config.h $(top_srcdir)/docbook/ws.css
 	--noindex							\
 	$(srcdir)/dftest.pod > dftest.html
 
-randpkt.1: randpkt.pod ../config.h
-	$(AM_V_POD2MAN)$(POD2MAN)			\
-	--center="The Wireshark Network Analyzer"	\
-	--release=$(VERSION)				\
-	$(srcdir)/randpkt.pod > randpkt.1
-
 randpkt.html: randpkt.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(AM_V_POD2HTML)$(POD2HTML)                     \
 	--title="randpkt - The Wireshark Network Analyzer $(VERSION)"	\
@@ -302,37 +226,10 @@ randpkt.html: randpkt.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(srcdir)/randpkt.pod > randpkt.html
 
 CLEANFILES =		\
-	wireshark.pod \
-	wireshark-filter.4 \
-	wireshark-filter.html \
-	wireshark.1	\
-	wireshark.html	\
-	capinfos.1	\
-	capinfos.html	\
-	dftest.1	\
-	dftest.html	\
-	dumpcap.1	\
-	dumpcap.html	\
-	editcap.1	\
-	editcap.html	\
-	asn2deb.1	\
-	asn2deb.html	\
-	idl2deb.1	\
-	idl2deb.html	\
-	idl2wrs.1	\
-	idl2wrs.html	\
-	mergecap.1	\
-	mergecap.html	\
-	reordercap.1	\
-	reordercap.html	\
-	randpkt.1	\
-	randpkt.html	\
-	rawshark.1	\
-	rawshark.html	\
-	text2pcap.1	\
-	text2pcap.html	\
-	tshark.1	\
-	tshark.html
+	wireshark.pod	\
+	*.1		\
+	*.4		\
+	*.html
 
 DISTCLEANFILES =		\
 	pod2htmi.tmp		\
@@ -345,44 +242,44 @@ DISTCLEANFILES =		\
 MAINTAINERCLEANFILES = \
 	Makefile.in
 
-EXTRA_DIST = \
-	Makefile.nmake	\
-	README.binarytrees	\
-	README.capture	\
-	README.design	\
-	README.developer	\
-	README.display_filter	\
-	README.heuristic	\
-	README.idl2wrs	\
-	README.malloc	\
-	README.packaging	\
-	README.plugins	\
-	README.python \
-	README.regression   \
-	README.request_response_tracking	\
-	README.stats_tree	\
-	README.tapping	\
-	README.wmem	\
-	README.xml-output	\
-	doc.vcproj		\
-	make-authors-format.pl	\
-	make-authors-short.pl	\
-	perlnoutf.pl		\
-	capinfos.pod		\
-	dfilter2pod.pl		\
-	dftest.pod		\
-	dumpcap.pod		\
-	editcap.pod		\
-	eproto2sgml		\
-	idl2wrs.pod		\
-	mergecap.pod		\
-	randpkt.pod		\
-	randpkt.txt		\
-	rawshark.pod		\
-	reordercap.pod	\
-	sgml.doc.template	\
-	text2pcap.pod		\
-	tshark.pod		\
-	wireshark-filter.pod    \
+EXTRA_DIST =				\
+	Makefile.nmake			\
+	README.binarytrees		\
+	README.capture			\
+	README.design			\
+	README.developer		\
+	README.display_filter		\
+	README.heuristic		\
+	README.idl2wrs			\
+	README.malloc			\
+	README.packaging		\
+	README.plugins			\
+	README.python 			\
+	README.regression   		\
+	README.request_response_tracking\
+	README.stats_tree		\
+	README.tapping			\
+	README.wmem			\
+	README.xml-output		\
+	doc.vcproj			\
+	make-authors-format.pl		\
+	make-authors-short.pl		\
+	perlnoutf.pl			\
+	capinfos.pod			\
+	dfilter2pod.pl			\
+	dftest.pod			\
+	dumpcap.pod			\
+	editcap.pod			\
+	eproto2sgml			\
+	idl2wrs.pod			\
+	mergecap.pod			\
+	randpkt.pod			\
+	randpkt.txt			\
+	rawshark.pod			\
+	reordercap.pod			\
+	sgml.doc.template		\
+	text2pcap.pod			\
+	tshark.pod			\
+	wireshark-filter.pod    	\
 	wireshark.pod.template