Wireshark · Ethereal-dev: [Ethereal-dev] Makefile patches

[aferen@xxxxxxxxxxxx (Andrew C. Feren)]

Currently the .html version of the man pages are only build during the
winows build.  I added targets to doc/Makefile.am to build them on
other platforms as well.

Other related changes
modified configure.in to find pod2html.
modified ./Makefile.am to build, but not install html files.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ethereal/Makefile.am,v
retrieving revision 1.416
diff -u -r1.416 Makefile.am
--- Makefile.am	2002/03/16 02:25:48	1.416
+++ Makefile.am	2002/03/18 17:10:50
@@ -65,6 +65,9 @@
 man1_MANS = @ethereal_man@ @editcap_man@ @mergecap_man@ @tethereal_man@ @text2pcap_man@ @idl2eth_man@
 man_MANS = 
 
+# What do we call the html versions of the man pages.
+noinst_DATA = ethereal.html editcap.html mergecap.html tethereal.html text2pcap.html idl2eth.html
+
 EXTRA_PROGRAMS = ethereal ethereal_static tethereal tethereal_static editcap mergecap dftest text2pcap
 EXTRA_SCRIPTS = idl2eth
 
@@ -934,25 +937,54 @@
 	(cd doc ; \
 	$(MAKE) ../ethereal.1 )
 
+ethereal.html: ethereal doc/ethereal.pod.template
+	(cd doc ; \
+	$(MAKE) ../$@ )
+
+
 tethereal.1: tethereal doc/tethereal.pod.template
 	(cd doc ; \
 	$(MAKE) ../tethereal.1 )
 
+tethereal.html: ethereal doc/ethereal.pod.template
+	(cd doc ; \
+	$(MAKE) ../$@ )
+
+
 editcap.1: doc/editcap.pod
 	(cd doc ; \
 	$(MAKE) ../editcap.1 )
 
+editcap.html: doc/editcap.pod
+	(cd doc ; \
+	$(MAKE) ../$@ )
+
+
 idl2eth.1: doc/idl2eth.pod
 	(cd doc ; \
 	$(MAKE) ../idl2eth.1 )
 
+idl2eth.html: doc/idl2eth.pod
+	(cd doc ; \
+	$(MAKE) ../$@ )
+
+
 mergecap.1: doc/mergecap.pod
 	(cd doc ; \
 	$(MAKE) ../mergecap.1 )
 
+mergecap.html: doc/mergecap.pod
+	(cd doc ; \
+	$(MAKE) ../$@ )
+
+
 text2pcap.1: doc/text2pcap.pod
 	(cd doc ; \
 	$(MAKE) ../text2pcap.1 )
+
+text2pcap.html: doc/text2pcap.pod
+	(cd doc ; \
+	$(MAKE) ../$@ )
 
 packet-ncp2222.c : ncp2222.py
 	$(PYTHON) $(srcdir)/ncp2222.py > $@

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ethereal/doc/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- Makefile.am	2002/02/05 18:39:06	1.13
+++ Makefile.am	2002/03/18 17:11:02
@@ -31,6 +31,13 @@
 	--release=$(VERSION)			 \
 	> ../ethereal.1
 
+../ethereal.html: ethereal.pod ../config.h
+	$(POD2HTML)	\
+	--infile=ethereal.pod	\
+	--outfile=$@	\
+	--noindex	\
+	--title="The Ethereal Network Analyzer $(VERSION)"
+
 ethereal.pod: ethereal.pod.template  ../ethereal
 	../ethereal -G | $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/ethereal.pod.template > ethereal.pod
 
@@ -40,6 +47,13 @@
 	--release=$(VERSION)			 \
 	> ../tethereal.1
 
+../tethereal.html: tethereal.pod ../config.h
+	$(POD2HTML)	\
+	--infile=tethereal.pod	\
+	--outfile=$@	\
+	--noindex	\
+	--title="The Ethereal Network Analyzer $(VERSION)"
+
 tethereal.pod: tethereal.pod.template  ../tethereal
 	../tethereal -G | $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/tethereal.pod.template > tethereal.pod
 
@@ -49,20 +63,53 @@
 	--release=$(VERSION)			 \
 	> ../editcap.1
 
+../editcap.html: editcap.pod ../config.h
+	$(POD2HTML)	\
+	--infile=editcap.pod	\
+	--outfile=$@	\
+	--noindex	\
+	--title="The Ethereal Network Analyzer $(VERSION)"
+
+
 ../idl2eth.1: idl2eth.pod ../config.h
 	$(POD2MAN) $(srcdir)/idl2eth.pod                     \
 	--center="The Ethereal Network Analyzer" \
 	--release=$(VERSION)			 \
 	> ../idl2eth.1
 
+../idl2eth.html: idl2eth.pod ../config.h
+	$(POD2HTML)	\
+	--infile=idl2eth.pod	\
+	--outfile=$@	\
+	--noindex	\
+	--title="The Ethereal Network Analyzer $(VERSION)"
+
+
 ../mergecap.1: mergecap.pod ../config.h
 	$(POD2MAN) $(srcdir)/mergecap.pod                     \
 	--center="The Ethereal Network Analyzer" \
 	--release=$(VERSION)			 \
 	> ../mergecap.1
 
+../mergecap.html: mergecap.pod ../config.h
+	$(POD2HTML)	\
+	--infile=mergecap.pod	\
+	--outfile=$@	\
+	--noindex	\
+	--title="The Ethereal Network Analyzer $(VERSION)"
+
+
 ../text2pcap.1: text2pcap.pod ../config.h
 	$(POD2MAN) $(srcdir)/text2pcap.pod                     \
 	--center="The Ethereal Network Analyzer" \
 	--release=$(VERSION)			 \
 	> ../text2pcap.1
+
+../text2pcap.html: text2pcap.pod ../config.h
+	$(POD2HTML)	\
+	--infile=text2pcap.pod	\
+	--outfile=$@	\
+	--noindex	\
+	--title="The Ethereal Network Analyzer $(VERSION)"
+
+

Index: configure.in
===================================================================
RCS file: /cvsroot/ethereal/configure.in,v
retrieving revision 1.159
diff -u -r1.159 configure.in
--- configure.in	2002/03/12 10:37:01	1.159
+++ configure.in	2002/03/18 17:10:53
@@ -25,6 +25,7 @@
 AC_PROG_YACC
 AM_PROG_LEX
 AC_PATH_PROG(PERL, perl)
+AC_PATH_PROG(POD2HTML, pod2html)
 AC_PATH_PROG(POD2MAN, pod2man)
 AC_PATH_PROG(LEX, flex)
 AC_PATH_PROG(PYTHON, python)


-- 
-Andrew Feren
 Cetacean Networks, Inc.
 Portsmouth, NH