Revert 31864 and 31866: don't use suffix rules. Pattern rules would work but I don't know if they're portable enough.

svn path=/trunk/; revision=32431

1 files changed, 118 insertions, 7 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 523b82cca3..a235a0041c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -101,30 +101,141 @@ AUTHORS-SHORT-FORMAT: ../AUTHORS-SHORT $(srcdir)/make-authors-format.pl
 wireshark.pod: $(srcdir)/wireshark.pod.template AUTHORS-SHORT-FORMAT
 	cat $(srcdir)/wireshark.pod.template AUTHORS-SHORT-FORMAT > wireshark.pod
 
-.pod.1:
+wireshark.1: wireshark.pod ../config.h
 	$(POD2MAN)					\
 	--center="The Wireshark Network Analyzer"	\
 	--release=$(VERSION)				\
-	$< > $@
+	wireshark.pod  > wireshark.1
 
-.pod.4:
+wireshark.html: wireshark.pod ../config.h $(top_srcdir)/docbook/ws.css
+	$(POD2HTML)						\
+	--title="The Wireshark Network Analyzer $(VERSION)"	\
+	--css=$(top_srcdir)/docbook/ws.css			\
+	--noindex						\
+	wireshark.pod > wireshark.html
+
+tshark.1: tshark.pod ../config.h
 	$(POD2MAN)					\
-	--section=4					\
 	--center="The Wireshark Network Analyzer"	\
 	--release=$(VERSION)				\
-	$< > $@
+	$(srcdir)/tshark.pod > tshark.1
 
-.pod.html:
+tshark.html: tshark.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(POD2HTML)							\
 	--title="tshark - The Wireshark Network Analyzer $(VERSION)"	\
 	--css=$(top_srcdir)/docbook/ws.css				\
 	--noindex							\
-	$< > $@
+	$(srcdir)/tshark.pod > tshark.html
+
+wireshark-filter.4: wireshark-filter.pod ../config.h
+	$(POD2MAN)					\
+	--section=4					\
+	--center="The Wireshark Network Analyzer"	\
+	--release=$(VERSION)				\
+	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
 
+capinfos.1: capinfos.pod ../config.h
+	$(POD2MAN)					\
+	--center="The Wireshark Network Analyzer"	\
+	--release=$(VERSION)				\
+	$(srcdir)/capinfos.pod > capinfos.1
+
+capinfos.html: capinfos.pod ../config.h $(top_srcdir)/docbook/ws.css
+	$(POD2HTML)							\
+	--title="capinfos - The Wireshark Network Analyzer $(VERSION)"	\
+	--css=$(top_srcdir)/docbook/ws.css				\
+	--noindex							\
+	$(srcdir)/capinfos.pod > capinfos.html
+
+editcap.1: editcap.pod ../config.h
+	$(POD2MAN)					\
+	--center="The Wireshark Network Analyzer"	\
+	--release=$(VERSION)				\
+	$(srcdir)/editcap.pod > editcap.1
+
+editcap.html: editcap.pod ../config.h $(top_srcdir)/docbook/ws.css
+	$(POD2HTML)							\
+	--title="editcap - The Wireshark Network Analyzer $(VERSION)"	\
+	--css=$(top_srcdir)/docbook/ws.css				\
+	--noindex							\
+	$(srcdir)/editcap.pod > editcap.html
+
+idl2wrs.1: idl2wrs.pod ../config.h
+	$(POD2MAN)					\
+	--center="The Wireshark Network Analyzer"	\
+	--release=$(VERSION)				\
+	$(srcdir)/idl2wrs.pod > idl2wrs.1
+
+idl2wrs.html: idl2wrs.pod ../config.h $(top_srcdir)/docbook/ws.css
+	$(POD2HTML)							\
+	--title="idl2wrs - The Wireshark Network Analyzer $(VERSION)"	\
+	--css=$(top_srcdir)/docbook/ws.css				\
+	--noindex							\
+	$(srcdir)/idl2wrs.pod > idl2wrs.html
+
+mergecap.1: mergecap.pod ../config.h
+	$(POD2MAN)					\
+	--center="The Wireshark Network Analyzer"	\
+	--release=$(VERSION)				\
+	$(srcdir)/mergecap.pod > mergecap.1
+
+mergecap.html: mergecap.pod ../config.h $(top_srcdir)/docbook/ws.css
+	$(POD2HTML)							\
+	--title="mergecap - The Wireshark Network Analyzer $(VERSION)"	\
+	--css=$(top_srcdir)/docbook/ws.css				\
+	--noindex							\
+	$(srcdir)/mergecap.pod > mergecap.html
+
+text2pcap.1: text2pcap.pod ../config.h
+	$(POD2MAN)					\
+	--center="The Wireshark Network Analyzer"	\
+	--release=$(VERSION)				\
+	$(srcdir)/text2pcap.pod > text2pcap.1
+
+text2pcap.html: text2pcap.pod ../config.h $(top_srcdir)/docbook/ws.css
+	$(POD2HTML)                     \
+	--title="text2pcap - The Wireshark Network Analyzer $(VERSION)"	\
+	--css=$(top_srcdir)/docbook/ws.css				\
+	--noindex							\
+	$(srcdir)/text2pcap.pod > text2pcap.html
+
+dumpcap.1: dumpcap.pod ../config.h
+	$(POD2MAN)					\
+	--center="The Wireshark Network Analyzer"	\
+	--release=$(VERSION)				\
+	$(srcdir)/dumpcap.pod > dumpcap.1
+
+dumpcap.html: dumpcap.pod ../config.h $(top_srcdir)/docbook/ws.css
+	$(POD2HTML)                     \
+	--title="dumpcap - The Wireshark Network Analyzer $(VERSION)"	\
+	--css=$(top_srcdir)/docbook/ws.css				\
+	--noindex							\
+	$(srcdir)/dumpcap.pod > dumpcap.html
+
+rawshark.1: rawshark.pod ../config.h
+	$(POD2MAN)					\
+	--center="The Wireshark Network Analyzer"	\
+	--release=$(VERSION)				\
+	$(srcdir)/rawshark.pod > rawshark.1
+
+rawshark.html: rawshark.pod ../config.h $(top_srcdir)/docbook/ws.css
+	$(POD2HTML)                     \
+	--title="rawshark - The Wireshark Network Analyzer $(VERSION)"	\
+	--css=$(top_srcdir)/docbook/ws.css				\
+	--noindex							\
+	$(srcdir)/rawshark.pod > rawshark.html
+
 CLEANFILES =		\
 	wireshark-filter.pod \
 	wireshark.pod \