aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-06-23 08:39:07 +0000
committerGuy Harris <guy@alum.mit.edu>2004-06-23 08:39:07 +0000
commitfc1023772c00989b292f1b11d315006dfc9e8ffa (patch)
tree88a6cbee3068439280427c5db1ec787f4bffa956
parentaacb8bc9b64f0ee93a865445f39429bfb90475e8 (diff)
Build and install the HTMLized man pages on UN*X.
svn path=/trunk/; revision=11217
-rw-r--r--Makefile.am34
-rw-r--r--configure.in11
-rw-r--r--doc/Makefile.am53
3 files changed, 93 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 168d1ebdc3..e324318e3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.735 2004/06/22 00:40:02 guy Exp $
+# $Id: Makefile.am,v 1.736 2004/06/23 08:39:06 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@@ -73,7 +73,9 @@ EXTRA_SCRIPTS = idl2eth
# Ethereal configuration files are put in $(pkgdatadir). It currently
# contains the "AUTHORS-SHORT" and "manuf" files and a "diameter" directory.
#
-pkgdata_DATA = AUTHORS-SHORT manuf
+pkgdata_DATA = AUTHORS-SHORT manuf ethereal.html tethereal.html \
+ ethereal-filter.html editcap.html idl2eth.html mergecap.html \
+ text2pcap.html
#
# Install the Diameter DTD and XML files in the "diameter" subdirectory
@@ -575,6 +577,34 @@ text2pcap.1: doc/text2pcap.pod
(cd doc ; \
$(MAKE) ../text2pcap.1 )
+ethereal.html: ethereal doc/ethereal.pod AUTHORS-SHORT
+ (cd doc ; \
+ $(MAKE) ../ethereal.html )
+
+tethereal.html: tethereal doc/tethereal.pod
+ (cd doc ; \
+ $(MAKE) ../tethereal.html )
+
+ethereal-filter.html: tethereal doc/ethereal-filter.pod.template
+ (cd doc ; \
+ $(MAKE) ../ethereal-filter.html )
+
+editcap.html: doc/editcap.pod
+ (cd doc ; \
+ $(MAKE) ../editcap.html )
+
+idl2eth.html: doc/idl2eth.pod
+ (cd doc ; \
+ $(MAKE) ../idl2eth.html )
+
+mergecap.html: doc/mergecap.pod
+ (cd doc ; \
+ $(MAKE) ../mergecap.html )
+
+text2pcap.html: doc/text2pcap.pod
+ (cd doc ; \
+ $(MAKE) ../text2pcap.html )
+
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
diff --git a/configure.in b/configure.in
index 0d517ea29b..644531314a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.271 2004/06/22 21:15:41 guy Exp $
+# $Id: configure.in,v 1.272 2004/06/23 08:39:06 guy Exp $
#
AC_INIT(etypes.h)
@@ -30,11 +30,20 @@ then
#
AC_MSG_ERROR(I couldn't find pod2man; make sure it's installed and in your path)
fi
+AC_PATH_PROG(POD2HTML, pod2html)
+if test "x$POD2HTML" = x
+then
+ #
+ # The alternative is not to build the HTML man pages....
+ #
+ AC_MSG_ERROR(I couldn't find pod2html; make sure it's installed and in your path)
+fi
AC_PATH_PROG(LEX, flex)
AC_PATH_PROG(PYTHON, python)
AC_SUBST(PERL)
AC_SUBST(POD2MAN)
+AC_SUBST(POD2HTML)
AC_SUBST(LEX)
AC_SUBST(FLEX_PATH)
AC_SUBST(PYTHON)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5803110d10..6a530209f9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal documentation
#
-# $Id: Makefile.am,v 1.23 2004/05/22 22:29:28 guy Exp $
+# $Id: Makefile.am,v 1.24 2004/06/23 08:39:07 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@@ -33,18 +33,36 @@ ethereal-tmp.pod: ethereal.pod ../AUTHORS-SHORT
--release=$(VERSION) \
$(srcdir)/ethereal-tmp.pod > ../ethereal.1
+../ethereal.html: ethereal-tmp.pod ../config.h
+ $(POD2HTML) \
+ --title="The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ ethereal-tmp.pod > ../ethereal.html
+
../tethereal.1: tethereal.pod ../config.h
$(POD2MAN) \
--center="The Ethereal Network Analyzer" \
--release=$(VERSION) \
$(srcdir)/tethereal.pod > ../tethereal.1
+../tethereal.html: tethereal.pod ../config.h
+ $(POD2HTML) \
+ --title="tethereal - The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ tethereal.pod > ../tethereal.html
+
../ethereal-filter.4: ethereal-filter.pod ../config.h
$(POD2MAN) \
--center="The Ethereal Network Analyzer" \
--release=$(VERSION) \
ethereal-filter.pod > ../ethereal-filter.4
+../ethereal-filter.html: ethereal-filter.pod ../config.h
+ $(POD2HTML) \
+ --title="ethereal-filter - The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ ethereal-filter.pod > ../ethereal-filter.html
+
ethereal-filter.pod: ethereal-filter.pod.template ../tethereal
../tethereal -G fields | $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/ethereal-filter.pod.template > ethereal-filter.pod
@@ -54,31 +72,62 @@ ethereal-filter.pod: ethereal-filter.pod.template ../tethereal
--release=$(VERSION) \
$(srcdir)/editcap.pod > ../editcap.1
+../editcap.html: editcap.pod ../config.h
+ $(POD2HTML) \
+ --title="editcap - The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ editcap.pod > ../editcap.html
+
../idl2eth.1: idl2eth.pod ../config.h
$(POD2MAN) \
--center="The Ethereal Network Analyzer" \
--release=$(VERSION) \
$(srcdir)/idl2eth.pod > ../idl2eth.1
+../idl2eth.html: idl2eth.pod ../config.h
+ $(POD2HTML) \
+ --title="idl2eth - The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ idl2eth.pod > ../idl2eth.html
+
../mergecap.1: mergecap.pod ../config.h
$(POD2MAN) \
--center="The Ethereal Network Analyzer" \
--release=$(VERSION) \
$(srcdir)/mergecap.pod > ../mergecap.1
+../mergecap.html: mergecap.pod ../config.h
+ $(POD2HTML) \
+ --title="mergecap - The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ mergecap.pod > ../mergecap.html
+
../text2pcap.1: text2pcap.pod ../config.h
$(POD2MAN) \
--center="The Ethereal Network Analyzer" \
--release=$(VERSION) \
$(srcdir)/text2pcap.pod > ../text2pcap.1
+../text2pcap.html: text2pcap.pod ../config.h
+ $(POD2HTML) \
+ --title="text2pcap - The Ethereal Network Analyzer $(VERSION)" \
+ --noindex \
+ text2pcap.pod > ../text2pcap.html
+
CLEANFILES = \
ethereal-filter.pod \
ethereal-tmp.pod \
../ethereal-filter.4 \
+ ../ethereal-filter.html \
../ethereal.1 \
+ ../ethereal.html \
../editcap.1 \
+ ../editcap.html \
../mergecap.1 \
+ ../mergecap.html \
../tethereal.1 \
+ ../tethereal.html \
../text2pcap.1 \
- ../idl2eth.1
+ ../text2pcap.html \
+ ../idl2eth.1 \
+ ../idl2eth.html