From Olivier Jacques: Add #defines to disable XML validation.
[obnox/wireshark/wip.git] / Makefile.am
index 90f88f3f17728969228466fcda3d4cd5612d61e7..1f8899ae84877a21e2ec0cf338eff5db104ec28d 100644 (file)
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.661 2003/12/01 23:05:08 guy Exp $
+# $Id$
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -60,444 +60,65 @@ ACLOCAL_AMFLAGS = `./aclocal-flags`
 # automake will arrange that the Makefile define it as the union of all
 # the "man{section}_MANS" variables.
 #
-bin_PROGRAMS = @ethereal_bin@ @editcap_bin@ @mergecap_bin@ @tethereal_bin@ @dftest_bin@ @randpkt_bin@ @text2pcap_bin@
+bin_PROGRAMS = @ethereal_bin@ @capinfo_bin@ @editcap_bin@ @mergecap_bin@ @tethereal_bin@ @dftest_bin@ @randpkt_bin@ @text2pcap_bin@
 bin_SCRIPTS = @idl2eth_bin@
-man1_MANS = @ethereal_man@ @editcap_man@ @mergecap_man@ @tethereal_man@ @text2pcap_man@ @idl2eth_man@
+man1_MANS = @ethereal_man@ @capinfo_man@ @editcap_man@ @mergecap_man@ @tethereal_man@ @text2pcap_man@ @idl2eth_man@
 man4_MANS = @etherealfilter_man@
 man_MANS =
 
-EXTRA_PROGRAMS = ethereal tethereal editcap mergecap dftest text2pcap
+EXTRA_PROGRAMS = ethereal tethereal capinfo editcap mergecap dftest \
+       randpkt text2pcap
 EXTRA_SCRIPTS = idl2eth
 
 #
 # Ethereal configuration files are put in $(pkgdatadir).  It currently
-# contains the "manuf" file and a "diameter" directory.
+# contains the "AUTHORS-SHORT" and "manuf" files and a "diameter" directory.
 #
-pkgdata_DATA = manuf
+pkgdata_DATA = AUTHORS-SHORT manuf ethereal.html tethereal.html \
+       ethereal-filter.html capinfo.html editcap.html \
+       idl2eth.html mergecap.html text2pcap.html
 
 #
 # Install the Diameter DTD and XML files in the "diameter" subdirectory
 # of that directory.
 #
 diameterdir = $(pkgdatadir)/diameter
-diameter_DATA = dictionary.dtd dictionary.xml mobileipv4.xml \
+diameter_DATA = dictionary.dtd dictionary.xml imscxdx.xml mobileipv4.xml \
        nasreq.xml sunping.xml
 
-DISSECTOR_SRC = \
-       packet-aarp.c  \
-       packet-acap.c  \
-       packet-afp.c   \
-       packet-afs.c   \
-       packet-aim.c   \
-       packet-ajp13.c          \
-       packet-alcap.c \
-       packet-ans.c   \
-       packet-ansi_a.c   \
-       packet-ansi_637.c   \
-       packet-ansi_683.c   \
-       packet-ansi_map.c   \
-       packet-aodv.c  \
-       packet-arcnet.c \
-       packet-arp.c   \
-       packet-asap.c  \
-       packet-ascend.c\
-       packet-asf.c   \
-       packet-atalk.c \
-       packet-atm.c   \
-       packet-auto_rp.c   \
-       packet-bacapp.c   \
-       packet-bacnet.c   \
-       packet-beep.c \
-       packet-bfd.c   \
-       packet-bgp.c   \
-       packet-bofl.c  \
-       packet-bootp.c \
-       packet-bootparams.c \
-       packet-bpdu.c  \
-       packet-brdwlk.c \
-       packet-bssap.c \
-       packet-bssgp.c \
-       packet-bvlc.c \
-       packet-ccsds.c \
-       packet-cdp.c   \
-       packet-cgmp.c  \
-       packet-chdlc.c  \
-       packet-cisco-oui.c \
-       packet-clearcase.c  \
-       packet-clip.c  \
-       packet-clnp.c  \
-       packet-cops.c  \
-       packet-cosine.c  \
-       packet-cpfi.c  \
-       packet-cpha.c  \
-       packet-cups.c  \
-       packet-data.c  \
-       packet-dccp.c \
-       packet-dcerpc.c  \
-       packet-dcerpc-afs4int.c  \
-       packet-dcerpc-atsvc.c \
-       packet-dcerpc-bossvr.c  \
-       packet-dcerpc-browser.c  \
-       packet-dcerpc-budb.c  \
-       packet-dcerpc-butc.c  \
-       packet-dcerpc-cds_clerkserver.c  \
-       packet-dcerpc-cds_solicit.c  \
-       packet-dcerpc-conv.c  \
-       packet-dcerpc-cprpc_server.c  \
-       packet-dcerpc-dce122.c \
-       packet-dcerpc-dfs.c \
-       packet-dcerpc-dnsserver.c \
-       packet-dcerpc-drsuapi.c \
-       packet-dcerpc-dtsprovider.c \
-       packet-dcerpc-dtsstime_req.c \
-       packet-dcerpc-epm.c  \
-       packet-dcerpc-epm4.c  \
-       packet-dcerpc-fldb.c  \
-       packet-dcerpc-ftserver.c \
-       packet-dcerpc-icl_rpc.c \
-       packet-dcerpc-initshutdown.c \
-       packet-dcerpc-krb5rpc.c \
-       packet-dcerpc-lsa.c \
-       packet-dcerpc-lsa-ds.c \
-       packet-dcerpc-mapi.c  \
-       packet-dcerpc-messenger.c  \
-       packet-dcerpc-mgmt.c  \
-       packet-dcerpc-ndr.c  \
-       packet-dcerpc-netlogon.c \
-       packet-dcerpc-nspi.c \
-       packet-dcerpc-oxid.c  \
-       packet-dcerpc-reg.c \
-       packet-dcerpc-remact.c  \
-       packet-dcerpc-rep_proc.c  \
-       packet-dcerpc-roverride.c  \
-       packet-dcerpc-rpriv.c  \
-       packet-dcerpc-rs_acct.c  \
-       packet-dcerpc-rs_attr.c  \
-       packet-dcerpc-rs_bind.c  \
-       packet-dcerpc-rs_misc.c  \
-       packet-dcerpc-rs_plcy.c  \
-       packet-dcerpc-rs_pgo.c  \
-       packet-dcerpc-rs_prop_acct.c \
-       packet-dcerpc-rs_repadm.c  \
-       packet-dcerpc-rs_replist.c  \
-       packet-dcerpc-rs_unix.c  \
-       packet-dcerpc-rsec_login.c  \
-       packet-dcerpc-samr.c \
-       packet-dcerpc-secidmap.c \
-       packet-dcerpc-spoolss.c \
-       packet-dcerpc-srvsvc.c \
-       packet-dcerpc-svcctl.c \
-       packet-dcerpc-tapi.c \
-       packet-dcerpc-tkn4int.c \
-       packet-dcerpc-ubikdisk.c \
-       packet-dcerpc-ubikvote.c \
-       packet-dcerpc-update.c \
-       packet-dcerpc-wkssvc.c \
-       packet-ddtp.c  \
-       packet-dec-bpdu.c \
-       packet-dhcpv6.c \
-       packet-diameter.c \
-       packet-diffserv-mpls-common.c \
-       packet-distcc.c \
-       packet-dlsw.c  \
-       packet-dns.c   \
-       packet-dsi.c   \
-       packet-dvmrp.c \
-       packet-eap.c \
-       packet-eapol.c \
-       packet-echo.c \
-       packet-edonkey.c \
-       packet-eigrp.c \
-       packet-enc.c    \
-       packet-enip.c   \
-       packet-esis.c  \
-       packet-eth.c   \
-       packet-etherip.c        \
-       packet-ethertype.c   \
-       packet-fc.c \
-       packet-fcct.c \
-       packet-fcdns.c \
-       packet-fcels.c \
-       packet-fcfcs.c \
-       packet-fcfzs.c \
-       packet-fcip.c \
-       packet-fclctl.c \
-       packet-fcp.c \
-       packet-fcsb3.c \
-       packet-fcsp.c \
-       packet-fcswils.c \
-       packet-fddi.c  \
-       packet-fix.c  \
-       packet-fr.c    \
-       packet-frame.c  \
-       packet-ftp.c   \
-       packet-fw1.c   \
-       packet-giop.c  \
-       packet-gmrp.c \
-       packet-gnutella.c \
-       packet-gprs-ns.c \
-       packet-gre.c   \
-       packet-gsm_a.c   \
-       packet-gsm_sms.c   \
-       packet-gssapi.c \
-       packet-gtp.c   \
-       packet-gvrp.c  \
-       packet-h1.c    \
-       packet-h225.c  \
-       packet-h245.c  \
-       packet-h261.c  \
-       packet-h263.c  \
-       packet-h450.c  \
-       packet-hclnfsd.c  \
-       packet-hpext.c \
-       packet-hsrp.c  \
-       packet-http.c  \
-       packet-hyperscsi.c \
-       packet-iapp.c  \
-       packet-ib.c  \
-       packet-icap.c  \
-       packet-icmpv6.c\
-       packet-icp.c   \
-       packet-icq.c   \
-       packet-ieee80211.c \
-       packet-ieee8023.c \
-       packet-igmp.c  \
-       packet-igrp.c  \
-       packet-imap.c   \
-       packet-ip.c    \
-       packet-ipfc.c    \
-       packet-ipmi.c  \
-       packet-ipp.c   \
-       packet-ipsec.c \
-       packet-ipsec-udp.c \
-       packet-ipv6.c  \
-       packet-ipx.c   \
-       packet-ipxwan.c \
-       packet-irc.c   \
-       packet-isakmp.c\
-       packet-iscsi.c \
-       packet-isdn.c \
-       packet-isis.c  \
-       packet-isis-clv.c \
-       packet-isis-hello.c \
-       packet-isis-lsp.c \
-       packet-isis-snp.c \
-       packet-isl.c   \
-       packet-isns.c \
-       packet-isup.c  \
-       packet-iua.c   \
-       packet-jabber.c \
-       packet-kadm5.c \
-       packet-kerberos.c \
-       packet-klm.c   \
-       packet-kpasswd.c   \
-       packet-l2tp.c  \
-       packet-lapb.c  \
-       packet-lapbether.c \
-       packet-lapd.c  \
-       packet-laplink.c  \
-       packet-ldap.c  \
-       packet-ldp.c   \
-       packet-llc.c   \
-       packet-lmi.c   \
-       packet-lmp.c   \
-       packet-lpd.c   \
-       packet-lwapp.c \
-       packet-m2pa.c  \
-       packet-m2tp.c  \
-       packet-m2ua.c  \
-       packet-m3ua.c  \
-       packet-mbtcp.c \
-       packet-mdshdr.c \
-       packet-mip.c  \
-       packet-mip6.c  \
-       packet-mmse.c  \
-       packet-mount.c \
-       packet-mpeg1.c  \
-       packet-mpls.c \
-       packet-mrdisc.c \
-       packet-msdp.c  \
-       packet-msn-messenger.c \
-       packet-msnip.c \
-       packet-msproxy.c \
-       packet-mtp2.c \
-       packet-mtp3.c \
-       packet-mtp3mg.c \
-       packet-mysql.c \
-       packet-nbipx.c \
-       packet-nbns.c  \
-       packet-ncp.c   \
-       packet-ncp2222.c   \
-       packet-ndmp.c  \
-       packet-ndps.c  \
-       packet-netbios.c \
-       packet-netflow.c \
-       packet-nfs.c   \
-       packet-nfsacl.c \
-       packet-nfsauth.c \
-       packet-nisplus.c \
-       packet-nlm.c   \
-       packet-nlsp.c  \
-       packet-nntp.c  \
-       packet-nt-oui.c \
-       packet-nt-sonmp.c \
-       packet-nt-tpcp.c \
-       packet-ntlmssp.c  \
-       packet-ntp.c  \
-       packet-null.c  \
-       packet-osi.c   \
-       packet-osi-options.c \
-       packet-ospf.c  \
-       packet-pcnfsd.c \
-       packet-per.c \
-       packet-pflog.c \
-       packet-pgm.c   \
-       packet-pim.c   \
-       packet-pop.c   \
-       packet-portmap.c   \
-       packet-ppp.c   \
-       packet-pppoe.c \
-       packet-pptp.c  \
-       packet-prism.c \
-       packet-q2931.c \
-       packet-q931.c  \
-       packet-q933.c  \
-       packet-qllc.c  \
-       packet-quake.c \
-       packet-quake2.c \
-       packet-quake3.c \
-       packet-quakeworld.c \
-       packet-radius.c\
-       packet-ranap.c \
-       packet-raw.c   \
-       packet-rip.c   \
-       packet-ripng.c \
-       packet-rlogin.c \
-       packet-rmcp.c  \
-       packet-rmi.c \
-       packet-rmp.c   \
-       packet-rpc.c   \
-       packet-rpl.c   \
-       packet-rquota.c \
-       packet-rsh.c   \
-       packet-rstat.c \
-       packet-rsvp.c  \
-       packet-rsync.c \
-       packet-rtcp.c  \
-       packet-rtp.c   \
-       packet-rtp-events.c \
-       packet-rtsp.c  \
-       packet-rwall.c \
-       packet-rx.c  \
-       packet-sadmind.c \
-       packet-sap.c   \
-       packet-sccp.c  \
-       packet-sccpmg.c  \
-       packet-scsi.c  \
-       packet-sctp.c  \
-       packet-sdlc.c  \
-       packet-sdp.c   \
-       packet-sebek.c   \
-       packet-ses.c   \
-       packet-sflow.c \
-       packet-sip.c   \
-       packet-skinny.c   \
-       packet-slimp3.c   \
-       packet-sll.c   \
-       packet-slowprotocols.c \
-       packet-smb.c   \
-       packet-smb-browse.c \
-       packet-smb-common.c \
-       packet-smb-logon.c \
-       packet-smb-mailslot.c \
-       packet-smb-pipe.c \
-       packet-smb-sidsnooping.c \
-       packet-smpp.c \
-       packet-smtp.c \
-       packet-sna.c   \
-       packet-snaeth.c \
-       packet-snmp.c   \
-       packet-socks.c \
-       packet-spnego.c \
-       packet-spray.c \
-       packet-srvloc.c \
-       packet-sscop.c \
-       packet-ssh.c   \
-       packet-ssl.c   \
-       packet-stat.c   \
-       packet-stat-notify.c \
-       packet-stun.c  \
-       packet-sua.c   \
-       packet-syslog.c \
-       packet-t38.c    \
-       packet-tacacs.c \
-       packet-tcap.c   \
-       packet-tcp.c   \
-       packet-tds.c   \
-       packet-telnet.c\
-       packet-teredo.c\
-       packet-tftp.c  \
-       packet-time.c  \
-       packet-tns.c \
-       packet-tpkt.c  \
-       packet-tr.c    \
-       packet-trmac.c \
-       packet-tsp.c \
-       packet-tzsp.c  \
-       packet-ucp.c   \
-       packet-udp.c   \
-       packet-v120.c \
-       packet-vines.c \
-       packet-vj.c   \
-       packet-vlan.c \
-       packet-vrrp.c \
-       packet-vtp.c  \
-       packet-wap.c \
-       packet-wbxml.c \
-       packet-wccp.c \
-       packet-wcp.c \
-       packet-wfleet-hdlc.c \
-       packet-who.c  \
-       packet-wlancap.c \
-       packet-wsp.c \
-       packet-wtls.c \
-       packet-wtp.c \
-       packet-x11.c   \
-       packet-x25.c   \
-       packet-x29.c   \
-       packet-xdmcp.c \
-       packet-xot.c   \
-       packet-xyplex.c   \
-       packet-yhoo.c  \
-       packet-ymsg.c  \
-       packet-ypbind.c \
-       packet-yppasswd.c \
-       packet-ypserv.c \
-       packet-ypxfr.c \
-       packet-zebra.c
+PLATFORM_SRC = pcap-util-unix.c
+
+include Makefile.common
 
 if HAVE_PLUGINS
 plugin_libs = \
        plugins/acn/acn.la \
        plugins/artnet/artnet.la \
-        plugins/asn1/asn1.la \
+       plugins/asn1/asn1.la \
+       plugins/ciscosm/ciscosm.la \
        plugins/docsis/docsis.la \
        plugins/enttec/enttec.la \
        plugins/giop/cosnaming.la \
        plugins/giop/coseventcomm.la \
        plugins/gryphon/gryphon.la \
+       plugins/irda/irda.la \
        plugins/lwres/lwres.la \
        plugins/megaco/megaco.la \
        plugins/mgcp/mgcp.la \
+       plugins/opsi/opsi.la \
        plugins/pcli/pcli.la \
        plugins/rdm/rdm.la \
-       plugins/rtnet/rtnet.la 
+       plugins/rlm/rlm.la \
+       plugins/rtnet/rtnet.la \
+       plugins/rudp/rudp.la \
+       plugins/v5ua/v5ua.la
 
 if ENABLE_STATIC
 plugin_ldadd = \
        plugins/acn/packet-acn.o \
        plugins/artnet/packet-artnet.o \
-        plugins/asn1/packet-asn1.o \
+       plugins/asn1/packet-asn1.o \
+       plugins/ciscosm/packet-sm.o \
        plugins/docsis/packet-bpkmattr.o \
        plugins/docsis/packet-bpkmreq.o \
        plugins/docsis/packet-bpkmrsp.o \
@@ -525,365 +146,50 @@ plugin_ldadd = \
        plugins/giop/packet-cosnaming.o \
        plugins/giop/packet-coseventcomm.o \
        plugins/gryphon/packet-gryphon.o \
+       plugins/irda/packet-irda.o \
        plugins/lwres/packet-lwres.o \
        plugins/megaco/packet-megaco.o \
        plugins/mgcp/packet-mgcp.o \
+       plugins/opsi/packet-opsi.o \
        plugins/pcli/packet-pcli.o \
        plugins/rdm/packet-rdm.o \
-       plugins/rtnet/packet-rtnet.o 
-
-plugin_src = \
-       plugins/acn/packet-acn.c \
-       plugins/artnet/packet-artnet.c \
-        plugins/asn1/packet-asn1.c \
-       plugins/docsis/packet-bpkmattr.c \
-       plugins/docsis/packet-bpkmreq.c \
-       plugins/docsis/packet-bpkmrsp.c \
-       plugins/docsis/packet-docsis.c \
-       plugins/docsis/packet-dsaack.c \
-       plugins/docsis/packet-dsareq.c \
-       plugins/docsis/packet-dsarsp.c \
-       plugins/docsis/packet-dscack.c \
-       plugins/docsis/packet-dscreq.c \
-       plugins/docsis/packet-dscrsp.c \
-       plugins/docsis/packet-dsdreq.c \
-       plugins/docsis/packet-dsdrsp.c \
-       plugins/docsis/packet-macmgmt.c \
-       plugins/docsis/packet-map.c \
-       plugins/docsis/packet-regack.c \
-       plugins/docsis/packet-regreq.c \
-       plugins/docsis/packet-regrsp.c \
-       plugins/docsis/packet-rngreq.c \
-       plugins/docsis/packet-rngrsp.c \
-       plugins/docsis/packet-tlv.c \
-       plugins/docsis/packet-uccreq.c \
-       plugins/docsis/packet-uccrsp.c \
-       plugins/docsis/packet-ucd.c \
-       plugins/enttec/packet-enttec.c \
-       plugins/giop/packet-cosnaming.c \
-       plugins/giop/packet-coseventcomm.c \
-       plugins/gryphon/packet-gryphon.c \
-       plugins/lwres/packet-lwres.c \
-       plugins/megaco/packet-megaco.c \
-       plugins/mgcp/packet-mgcp.c \
-       plugins/pcli/packet-pcli.c \
-       plugins/rdm/packet-rdm.c \
-       plugins/rtnet/packet-rtnet.c 
+       plugins/rlm/packet-rlm.o \
+       plugins/rtnet/packet-rtnet.o \
+       plugins/rudp/packet-rudp.o \
+       plugins/v5ua/packet-v5ua.o
 
 else           # ENABLE_STATIC
 plugin_ldadd = \
        "-dlopen" self  \
        "-dlopen" plugins/acn/acn.la \
        "-dlopen" plugins/artnet/artnet.la \
-        "-dlopen" plugins/asn1/asn1.la \
+       "-dlopen" plugins/asn1/asn1.la \
+       "-dlopen" plugins/ciscosm/ciscosm.la \
        "-dlopen" plugins/docsis/docsis.la \
        "-dlopen" plugins/enttec/enttec.la \
        "-dlopen" plugins/giop/cosnaming.la \
        "-dlopen" plugins/giop/coseventcomm.la \
        "-dlopen" plugins/gryphon/gryphon.la \
+       "-dlopen" plugins/irda/irda.la \
        "-dlopen" plugins/lwres/lwres.la \
        "-dlopen" plugins/megaco/megaco.la \
        "-dlopen" plugins/mgcp/mgcp.la \
+       "-dlopen" plugins/opsi/opsi.la \
        "-dlopen" plugins/pcli/pcli.la \
        "-dlopen" plugins/rdm/rdm.la \
-       "-dlopen" plugins/rtnet/rtnet.la 
-
-plugin_src =
+       "-dlopen" plugins/rlm/rlm.la \
+       "-dlopen" plugins/rtnet/rtnet.la \
+       "-dlopen" plugins/rudp/rudp.la \
+       "-dlopen" plugins/v5ua/v5ua.la
 
 endif          # ENABLE_STATIC
 
 else           # HAVE_PLUGINS
-plugin_src =
-
 plugin_libs =
 
 plugin_ldadd =
 endif          # HAVE_PLUGINS
 
-noinst_HEADERS = \
-       packet-afp.h   \
-       packet-afs-defs.h \
-       packet-afs-macros.h \
-       packet-afs-register-info.h \
-       packet-afs.h   \
-       packet-ansi_a.h \
-       packet-arcnet.h \
-       packet-arp.h   \
-       packet-atalk.h \
-       packet-atm.h   \
-       packet-bgp.h   \
-       packet-bootparams.h \
-       packet-bssap.h \
-       packet-chdlc.h \
-       packet-clearcase.h  \
-       packet-clip.h  \
-       packet-data.h \
-       packet-dccp.h \
-       packet-dcerpc-atsvc.h \
-       packet-dcerpc-browser.h \
-       packet-dcerpc-dce122.h \
-       packet-dcerpc-dcom.h \
-       packet-dcerpc-dfs.h \
-       packet-dcerpc-dnsserver.h \
-       packet-dcerpc-drsuapi.h \
-       packet-dcerpc-initshutdown.h \
-       packet-dcerpc-lsa.h \
-       packet-dcerpc-mapi.h \
-       packet-dcerpc-netlogon.h \
-       packet-dcerpc-nt.h \
-       packet-dcerpc-reg.h \
-       packet-dcerpc-samr.h \
-       packet-dcerpc-spoolss.h \
-       packet-dcerpc-srvsvc.h \
-       packet-dcerpc-svcctl.h \
-       packet-dcerpc-tapi.h \
-       packet-dcerpc-wkssvc.h \
-       packet-dcerpc.h \
-       packet-ddtp.h  \
-       packet-diameter-defs.h \
-       packet-diffserv-mpls-common.h \
-       packet-dns.h   \
-       packet-dvmrp.h \
-       packet-edonkey.h \
-       packet-esis.h  \
-       packet-eth.h   \
-       packet-fc.h \
-       packet-fcbls.h \
-       packet-fcct.h \
-       packet-fcdns.h \
-       packet-fcels.h \
-       packet-fcfcs.h \
-       packet-fcfzs.h \
-       packet-fclctl.h \
-       packet-fcp.h \
-       packet-fcsb3.h \
-       packet-fcsp.h \
-       packet-fcswils.h \
-       packet-fddi.h  \
-       packet-frame.h  \
-       packet-giop.h  \
-       packet-gnutella.h \
-       packet-gssapi.h \
-       packet-gtp.h    \
-       packet-h225.h    \
-       packet-h245.h    \
-       packet-hclnfsd.h  \
-       packet-hpext.h  \
-       packet-http.h  \
-       packet-ieee80211.h \
-       packet-ieee8023.h \
-       packet-igmp.h  \
-       packet-ip.h    \
-       packet-ipfc.h  \
-       packet-ipsec.h \
-       packet-ipv6.h  \
-       packet-ipx.h   \
-       packet-isis-clv.h \
-       packet-isis-hello.h \
-       packet-isis-lsp.h \
-       packet-isis-snp.h \
-       packet-isis.h  \
-       packet-isl.h   \
-       packet-kerberos.h \
-       packet-klm.h   \
-       packet-ldap.h  \
-       packet-llc.h   \
-       packet-mip6.h  \
-       packet-mount.h \
-       packet-mrdisc.h \
-       packet-msnip.h \
-       packet-mtp3.h  \
-       packet-ncp-int.h \
-       packet-ndps.h    \
-       packet-netbios.h \
-       packet-nfs.h   \
-       packet-nisplus.h \
-       packet-nlm.h   \
-       packet-ntp.h  \
-       packet-null.h  \
-       packet-osi-options.h \
-       packet-osi.h   \
-       packet-pcnfsd.h \
-       packet-per.h   \
-       packet-pflog.h \
-       packet-pim.h   \
-       packet-portmap.h   \
-       packet-ppp.h   \
-       packet-prism.h \
-       packet-q931.h  \
-       packet-raw.h   \
-       packet-ripng.h \
-       packet-rmi.h   \
-       packet-rpc.h   \
-       packet-rquota.h \
-       packet-rsvp.h  \
-       packet-rtcp.h  \
-       packet-rtp.h   \
-       packet-rtp-events.h \
-       packet-rwall.h  \
-       packet-rx.h  \
-       packet-scsi.h  \
-       packet-ses.h   \
-       packet-sll.h   \
-       packet-smb-browse.h \
-       packet-smb-common.h \
-       packet-smb-mailslot.h \
-       packet-smb-pipe.h \
-       packet-smb-sidsnooping.h \
-       packet-sna.h   \
-       packet-snmp.h   \
-       packet-spray.h \
-       packet-stat-notify.h \
-       packet-stat.h   \
-       packet-tacacs.h \
-       packet-tcap.h  \
-       packet-tcp.h   \
-       packet-tns.h \
-       packet-tpkt.h  \
-       packet-tr.h    \
-       packet-udp.h   \
-       packet-vines.h \
-       packet-vlan.h \
-       packet-wap.h \
-       packet-wccp.h \
-       packet-wlancap.h \
-       packet-wsp.h \
-       packet-wtls.h \
-       packet-wtp.h \
-       packet-x11-keysym.h     \
-       packet-ypbind.h \
-       packet-yppasswd.h \
-       packet-ypserv.h \
-       packet-ypxfr.h
-
-ETHEREAL_COMMON_SRC = \
-       adler32.c      \
-       adler32.h      \
-       afn.c          \
-       afn.h          \
-       aftypes.h      \
-       alignment.h    \
-       arcnet_pids.h  \
-       asn1.c         \
-       asn1.h         \
-       bridged_pids.h \
-       capture_stop_conditions.c   \
-       capture_stop_conditions.h   \
-       cfile.c         \
-       cfile.h         \
-       chdlctypes.h   \
-       color.h        \
-       column.c       \
-       column.h       \
-       conditions.c   \
-       conditions.h   \
-       crc32.c        \
-       crc32.h        \
-       crypt-des.c    \
-       crypt-des.h    \
-       crypt-md4.c    \
-       crypt-md4.h    \
-       crypt-md5.c    \
-       crypt-md5.h    \
-       crypt-rc4.c    \
-       crypt-rc4.h    \
-       disabled_protos.c      \
-       disabled_protos.h      \
-       etypes.h       \
-       file.h         \
-       follow.c       \
-       follow.h       \
-       format-oid.h   \
-       g711.c          \
-       g711.h          \
-       greproto.h     \
-       h225-persistentdata.c \
-       h225-persistentdata.h \
-       in_cksum.c     \
-       in_cksum.h     \
-       ip_opts.h      \
-       ipproto.c      \
-       ipproto.h      \
-       llcsaps.h      \
-       nlpid.h        \
-       oui.h          \
-       packet-dcerpc-nt.c \
-       pcap-util.c    \
-       pcap-util.h    \
-       pcap-util-int.h \
-       pcap-util-unix.c \
-       ppptypes.h     \
-       prefs-int.h    \
-       prefs.c        \
-       prefs.h        \
-       print.c        \
-       print.h        \
-       ps.c           \
-       ps.h           \
-       ptvcursor.c     \
-       ptvcursor.h     \
-       reassemble.c   \
-       reassemble.h   \
-       register.h     \
-       ringbuffer.c   \
-       ringbuffer.h   \
-       rpc_defrag.h   \
-       rtp_pt.h       \
-       sctpppids.h    \
-       smb.h          \
-       t35.c           \
-       t35.h           \
-       tap.c           \
-       tap.h           \
-       timestats.c     \
-       timestats.h     \
-       util.c         \
-       util.h         \
-       x11-declarations.h \
-       x11-register-info.h \
-       x264_prt_id.h  \
-       xdlc.c         \
-       xdlc.h         \
-       xmlstub.c      \
-       xmlstub.h
-
-BUILT_SOURCES = \
-       x11-declarations.h \
-       x11-register-info.h
-
-ethereal_SOURCES = \
-       $(DISSECTOR_SRC) \
-       $(ETHEREAL_COMMON_SRC) \
-       register.c     \
-       capture.c      \
-       capture.h      \
-       file.c         \
-       filters.c      \
-       filters.h      \
-       globals.h      \
-       menu.h         \
-       progress_dlg.h \
-       proto_hier_stats.h      \
-       proto_hier_stats.c      \
-       simple_dialog.h \
-       statusbar.h    \
-       summary.c      \
-       summary.h      \
-       ui_util.h
-
-EXTRA_ethereal_SOURCES = \
-       snprintf.c      \
-       snprintf.h      \
-       snprintf-imp.h  \
-       strerror.c      \
-       strerror.h      \
-       strcasecmp.c    \
-       strncasecmp.c   \
-       mkstemp.c       \
-       mkstemp.h       \
-       strptime.c      \
-       strptime.h
-
 # Optional objects that I know how to build. These will be
 # linked into the ethereal executable.
 # They will also be linked into the tethereal executable; if this
@@ -898,11 +204,9 @@ ethereal_optional_objects = @SNPRINTF_O@ @STRERROR_O@ \
 # Additional libs that I know how to build. These will be
 # linked into the ethereal executable.
 ethereal_additional_libs = \
-       wiretap/libwiretap.a    \
        gtk/libui.a             \
-       epan/libethereal.a      \
-       epan/ftypes/libftypes.a \
-       epan/dfilter/libdfilter.a
+       wiretap/libwiretap.la   \
+       epan/libethereal.la
 
 # This is the automake dependency variable for the executable
 ethereal_DEPENDENCIES = \
@@ -929,41 +233,14 @@ ethereal_LDADD = \
        $(ethereal_additional_libs)     \
        @SNMP_LIBS@ @SSL_LIBS@          \
        $(plugin_ldadd)                 \
-       @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@
-
-TETHEREAL_TAP_SRC = \
-       tap-ansi_astat.c        \
-       tap-bootpstat.c         \
-       tap-dcerpcstat.c        \
-       tap-h225counter.c       \
-       tap-h225rassrt.c        \
-       tap-httpstat.c          \
-       tap-iostat.c            \
-       tap-iousers.c           \
-       tap-mgcpstat.c          \
-       tap-protocolinfo.c      \
-       tap-protohierstat.c     \
-       tap-rpcstat.c           \
-       tap-rpcprogs.c          \
-       tap-smbsids.c           \
-       tap-smbstat.c           \
-       tap-wspstat.c
-
-tethereal_SOURCES = \
-       $(DISSECTOR_SRC) \
-       $(ETHEREAL_COMMON_SRC) \
-       $(TETHEREAL_TAP_SRC) \
-       tethereal-tap-register.c \
-       register.c     \
-       tethereal.c
+       @PCRE_LIBS@                     \
+       @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@
 
 # Additional libs that I know how to build. These will be
 # linked into the tethereal executable.
 tethereal_additional_libs =            \
-       wiretap/libwiretap.a            \
-       epan/libethereal.a              \
-       epan/ftypes/libftypes.a         \
-       epan/dfilter/libdfilter.a
+       wiretap/libwiretap.la           \
+       epan/libethereal.la
 
 # This is the automake dependency variable for the executable
 tethereal_DEPENDENCIES = \
@@ -977,8 +254,9 @@ tethereal_LDADD = \
        $(tethereal_additional_libs)    \
        @SNMP_LIBS@ @SSL_LIBS@          \
        $(plugin_ldadd)                 \
+       @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
-       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@
+       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@
 
 if ENABLE_STATIC
 tethereal_LDFLAGS = -Wl,-static -all-static
@@ -990,33 +268,47 @@ endif
 # text2pcap.
 text2pcap_optional_objects = @STRERROR_O@ @STRPTIME_O@
 
-text2pcap_SOURCES = text2pcap.c text2pcap-scanner.l
 text2pcap_DEPENDENCIES = text2pcap.h
 
 # This automake variable adds to the link-line for the executable
 text2pcap_LDADD = $(text2pcap_optional_objects) \
        @GLIB_LIBS@ -lm
 
-mergecap_SOURCES = mergecap.c
-mergecap_DEPENDENCIES = wiretap/libwiretap.a
-
-editcap_SOURCES = editcap.c
+mergecap_DEPENDENCIES = wiretap/libwiretap.la
 
 # This is the automake dependency variable for the executable
-editcap_DEPENDENCIES = wiretap/libwiretap.a
+capinfo_DEPENDENCIES = wiretap/libwiretap.la
+editcap_DEPENDENCIES = wiretap/libwiretap.la
 
 # This automake variable adds to the link-line for the executable
-editcap_LDADD = wiretap/libwiretap.a @GLIB_LIBS@
-mergecap_LDADD = wiretap/libwiretap.a @GLIB_LIBS@
+capinfo_LDADD = wiretap/libwiretap.la @GLIB_LIBS@
+editcap_LDADD = wiretap/libwiretap.la @GLIB_LIBS@
+mergecap_LDADD = wiretap/libwiretap.la @GLIB_LIBS@
 
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap
 
 #
-# Build various header files for the X11 dissector.
+# Build the version string
+#
+# FORCE is the portable version of .PHONY
+FORCE:
+
+svnversion.h: FORCE
+       $(PERL) $(srcdir)/make-version.pl
+
+#
+# Build the short version of the authors file for the about dialog
 #
-x11-declarations.h x11-register-info.h: x11-fields process-x11-fields.pl
-       $(PERL) $(srcdir)/process-x11-fields.pl <$(srcdir)/x11-fields
+AUTHORS-SHORT: AUTHORS make-authors-short.pl
+       $(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-short.pl < AUTHORS > AUTHORS-SHORT
+
+#
+# Build the short version of the authors file with formatting codes for the
+# man page
+#
+AUTHORS-SHORT-FORMAT: AUTHORS-SHORT make-authors-format.pl
+       $(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT
 
 #
 # Build shell scripts by doing variable substitution.
@@ -1030,49 +322,14 @@ SUFFIXES = .sh
        $(editsh) $< > $@.tmp && chmod +x $@.tmp && mv $@.tmp $@
 
 #
-# Build "register.c", which contains a function "register_all_protocols()"
-# that calls the register routines for all protocols.
-#
-# We do this by grepping through sources.  If that turns out to be too slow,
-# maybe we could just require every .o file to have an register routine
-# of a given name (packet-aarp.o -> proto_register_aarp, etc.).
-#
-# Formatting conventions:  The name of the proto_register_* routines must
-# start in column zero, or must be preceded only by "void " starting in
-# column zero, and must not be inside #if.
-#
-# We assume that all dissector routines are in "packet-XXX.c" files.
-#
-# For some unknown reason, having a big "for" loop in the Makefile
-# to scan all the "packet-XXX.c" files doesn't work with some "make"s;
-# they seem to pass only the first few names in the list to the shell,
-# for some reason.
-#
-# Therefore, we have a script to generate the "register.c" file.
-#
-# The first argument is the name of the file to write.
-# The second argument is the directory in which the source files live.
-# All subsequent arguments are the files to scan.
-#
-register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc
-       @if test -n $(PYTHON); then \
-               echo Making register.c with python ; \
-               $(PYTHON) $(srcdir)/make-reg-dotc.py $(srcdir) $(DISSECTOR_SRC) ; \
-       else \
-               echo Making register.c with shell script ; \
-               $(srcdir)/make-reg-dotc register.c $(srcdir) \
-                       $(plugin_src) $(DISSECTOR_SRC) ; \
-       fi
-
-#
-# Build "tethereal-tap-register.c", which contains a function 
+# Build "tethereal-tap-register.c", which contains a function
 # "register_all_tap_listeners()"
 # that calls the register routines for all tehtereal tap listeners.
 #
 # We do this by grepping through sources.
 #
-# Formatting conventions:  The name of the tap_listener_register_* 
-# routines must start in column zero, or must be preceded only by 
+# Formatting conventions:  The name of the tap_listener_register_*
+# routines must start in column zero, or must be preceded only by
 # "void " starting in column zero, and must not be inside #if.
 #
 # The first argument is the directory in which the source files live.
@@ -1081,31 +338,26 @@ register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc
 tethereal-tap-register.c: $(TETHEREAL_TAP_SRC) $(srcdir)/make-tapreg-dotc
        @echo Making tethereal-tap-register.c
        @$(srcdir)/make-tapreg-dotc tethereal-tap-register.c $(srcdir) $(TETHEREAL_TAP_SRC)
-
 ps.c: print.ps rdps
        ./rdps $(srcdir)/print.ps ps.c
 
 rdps: rdps.c
        $(CC) $(CFLAGS) -o rdps $(srcdir)/rdps.c
 
-randpkt.o: randpkt.c
-       $(CC) -DHAVE_CONFIG_H -I. `glib-config --cflags` -c $(srcdir)/randpkt.c
-
-randpkt: randpkt.o wiretap/libwiretap.a
-       $(LINK) -o randpkt randpkt.o wiretap/libwiretap.a `glib-config --libs` -lz
+randpkt_additional_libs = wiretap/libwiretap.la
 
+randpkt_DEPENDENCIES = \
+       $(randpkt_additional_libs)
 
-dftest_SOURCES = \
-       $(DISSECTOR_SRC) \
-       $(ETHEREAL_COMMON_SRC) \
-       register.c     \
-       dftest.c
+randpkt_LDADD = \
+       $(randpkt_additional_libs) \
+       @GLIB_LIBS@ -lm                 \
+       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@
 
 dftest_additional_libs =               \
-       wiretap/libwiretap.a            \
-       epan/libethereal.a              \
-       epan/ftypes/libftypes.a         \
-       epan/dfilter/libdfilter.a
+       wiretap/libwiretap.la           \
+       epan/libethereal.la
 
 dftest_DEPENDENCIES = \
        $(ethereal_optional_objects)    \
@@ -1116,37 +368,39 @@ dftest_DEPENDENCIES = \
 dftest_LDADD = \
        $(ethereal_optional_objects)    \
        $(dftest_additional_libs)       \
-       @SNMP_LIBS@ @SSL_LIBS@          \
+       @SNMP_LIBS@ @SSL_LIBS@          \
        $(plugin_ldadd)                 \
-       @GLIB_LIBS@ -lm \
-       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@
+       @PCRE_LIBS@                     \
+       @GLIB_LIBS@ -lm                 \
+       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@
 
 dftest_LDFLAGS = -export-dynamic
 
 CLEANFILES =   \
+       svnversion.h \
+       @rdps_bin@ \
        idl2eth
 
-DISTCLEANFILES =       \
-       aclocal-missing/*.m4 \
-       ps.c            \
-       rdps            \
+DISTCLEANFILES = \
+       ps.c \
        *~
 
 MAINTAINERCLEANFILES =         \
-       register.c              \
        ps.c
 
 EXTRA_DIST = \
-       Ethereal.desktop        \
+       AUTHORS-SHORT           \
+       AUTHORS-SHORT-FORMAT    \
        FAQ                     \
-       FAQ.include             \
        INSTALL.configure       \
+       Makefile.common         \
        Makefile.nmake          \
        README.aix              \
        README.bsd              \
        README.hpux             \
        README.irix             \
        README.linux            \
+       README.macos            \
        README.tru64            \
        README.vmware           \
        README.win32            \
@@ -1156,8 +410,8 @@ EXTRA_DIST = \
        aclocal-fallback/gtk-2.0.m4 \
        aclocal-fallback/gtk.m4 \
        aclocal-flags           \
-       aclocal-missing/dummy   \
        autogen.sh              \
+       capinfo.c               \
        capture-wpcap.c         \
        capture-wpcap.h         \
        cleanbld.bat            \
@@ -1177,6 +431,7 @@ EXTRA_DIST = \
        dictionary.xml          \
        doc/Makefile.am         \
        doc/Makefile.nmake      \
+       doc/README.capture      \
        doc/README.design       \
        doc/README.developer    \
        doc/README.idl2eth      \
@@ -1184,6 +439,8 @@ EXTRA_DIST = \
        doc/README.regression   \
        doc/README.tapping      \
        doc/README.tvbuff       \
+       doc/README.xml-output   \
+       doc/capinfo.pod         \
        doc/dfilter2pod.pl      \
        doc/editcap.pod         \
        doc/ethereal-filter.pod.template \
@@ -1193,14 +450,19 @@ EXTRA_DIST = \
        doc/randpkt.txt         \
        doc/tethereal.pod       \
        doc/text2pcap.pod       \
+       doxygen.cfg.in          \
        editcap.c               \
+       epan/libethereal.def    \
        ethereal_be.py          \
        ethereal_gen.py         \
+       ethereal.desktop        \
        getopt.c                \
        getopt.h                \
        idl2eth.sh              \
+       image/Ethereal.icns     \
        image/Makefile.nmake    \
        image/README.image      \
+       image/capinfo.rc.in     \
        image/clist_ascend.xpm  \
        image/clist_descend.xpm \
        image/dn_arrow.xpm      \
@@ -1220,51 +482,72 @@ EXTRA_DIST = \
        image/hi48-app-ethereal.png     \
        image/icon-ethereal.xpm \
        image/icon-excl.xpm     \
+       image/libethereal.rc.in \
        image/lo16-app-ethereal.png     \
        image/lo32-app-ethereal.png     \
        image/lo48-app-ethereal.png     \
        image/mergecap.rc.in    \
        image/nsis-checked.bmp  \
        image/nsis-unchecked.bmp        \
+       image/stock_dialog_error_48.xpm \
+       image/stock_dialog_warning_48.xpm       \
+       image/stock_dialog_question_48.xpm      \
+       image/stock_dialog_info_48.xpm  \
        image/tethereal.rc.in   \
        image/text2pcap.rc.in   \
        image/toolbar/capture_24.xpm    \
        image/toolbar/cfilter_24.xpm    \
        image/toolbar/dfilter_24.xpm    \
+       image/toolbar/stock_add_24.xpm  \
+       image/toolbar/stock_bottom_24.xpm \
        image/toolbar/stock_close_24.xpm        \
        image/toolbar/stock_colorselector_24.xpm        \
        image/toolbar/stock_help_24.xpm \
        image/toolbar/stock_jump_to_24.xpm      \
+       image/toolbar/stock_left_arrow_24.xpm \
+       image/toolbar/stock_ok_20.xpm   \
        image/toolbar/stock_open_24.xpm \
        image/toolbar/stock_preferences_24.xpm  \
        image/toolbar/stock_print_24.xpm        \
+       image/toolbar/stock_properties_24.xpm   \
        image/toolbar/stock_refresh_24.xpm      \
        image/toolbar/stock_right_arrow_24.xpm  \
        image/toolbar/stock_save_24.xpm \
+       image/toolbar/stock_save_as_24.xpm \
        image/toolbar/stock_search_24.xpm       \
        image/toolbar/stock_stop_24.xpm \
+       image/toolbar/stock_top_24.xpm \
+       image/toolbar/stock_zoom_1_24.xpm \
+       image/toolbar/stock_zoom_in_24.xpm \
+       image/toolbar/stock_zoom_out_24.xpm \
        image/up_arrow.xpm      \
+       image/icon_layout_1.xpm \
+       image/icon_layout_2.xpm \
+       image/icon_layout_3.xpm \
+       image/icon_layout_4.xpm \
+       image/icon_layout_5.xpm \
+       image/icon_layout_6.xpm \
+       image/wiretap.rc.in     \
+       imscxdx.xml             \
+       make-authors-format.pl  \
+       make-authors-short.pl   \
        make-manuf              \
-       make-reg-dotc           \
-       make-reg-dotc.py        \
        make-tapreg-dotc        \
+       make-version.pl         \
        manuf                   \
        manuf.tmpl              \
        mergecap.c              \
        mobileipv4.xml          \
        nasreq.xml              \
-       ncp2222.py              \
-       packet-ncp2222.inc      \
+       perlnoutf.pl            \
        print.ps                \
-       process-x11-fields.pl   \
        randpkt.c               \
        rdps.c                  \
        sunping.xml             \
        text2pcap-scanner.l     \
        text2pcap.c             \
        text2pcap.h             \
-       wka.tmpl                \
-       x11-fields
+       wka.tmpl
 
 if SETUID_INSTALL
 install-exec-hook:
@@ -1274,37 +557,19 @@ else
 install-exec-hook:
 endif
 
-#
-# Currently register.c can be included in the distribution because
-# we always build all protocol dissectors. We used to have to check
-# whether or not to build the snmp dissector. If we again need to
-# variably build something, making register.c non-portable, uncomment
-# the dist-hook line below.
-#
-# Oh, yuk.  We don't want to include "register.c" in the distribution, as
-# its contents depend on the configuration, and therefore we want it
-# to be built when the first "make" is done; however, Automake insists
-# on putting *all* source into the distribution.
-#
-# We work around this by having a "dist-hook" rule that deletes
-# "register.c", so that "dist" won't pick it up.
-#
-#dist-hook:
-#      @rm -f $(distdir)/register.c
-
-DIST_SUBDIRS = tools wiretap doc epan plugins packaging gtk
+DIST_SUBDIRS = tools wiretap doc epan plugins packaging gtk help
 
 if HAVE_PLUGINS
-SUBDIRS = tools wiretap doc epan plugins packaging @ethereal_SUBDIRS@
+SUBDIRS = tools wiretap doc epan plugins packaging help @ethereal_SUBDIRS@
 else
-SUBDIRS = tools wiretap doc epan packaging @ethereal_SUBDIRS@
+SUBDIRS = tools wiretap doc epan packaging help @ethereal_SUBDIRS@
 endif
 
-ethereal.1: ethereal doc/ethereal.pod
+ethereal.1: doc/ethereal.pod AUTHORS-SHORT-FORMAT
        (cd doc ; \
        $(MAKE) ../ethereal.1 )
 
-tethereal.1: tethereal doc/tethereal.pod
+tethereal.1: doc/tethereal.pod
        (cd doc ; \
        $(MAKE) ../tethereal.1 )
 
@@ -1312,6 +577,10 @@ ethereal-filter.4: tethereal doc/ethereal-filter.pod.template
        (cd doc ; \
        $(MAKE) ../ethereal-filter.4 )
 
+capinfo.1: doc/capinfo.pod
+       (cd doc ; \
+       $(MAKE) ../capinfo.1 )
+
 editcap.1: doc/editcap.pod
        (cd doc ; \
        $(MAKE) ../editcap.1 )
@@ -1328,8 +597,37 @@ text2pcap.1: doc/text2pcap.pod
        (cd doc ; \
        $(MAKE) ../text2pcap.1 )
 
-packet-ncp2222.c : ncp2222.py
-       $(PYTHON) $(srcdir)/ncp2222.py -o $@
+ethereal.html: doc/ethereal.pod AUTHORS-SHORT-FORMAT
+       (cd doc ; \
+       $(MAKE) ../ethereal.html )
+
+tethereal.html: doc/tethereal.pod
+       (cd doc ; \
+       $(MAKE) ../tethereal.html )
+
+ethereal-filter.html: tethereal doc/ethereal-filter.pod.template
+       (cd doc ; \
+       $(MAKE) ../ethereal-filter.html )
+
+capinfo.html: doc/capinfo.pod
+       (cd doc ; \
+       $(MAKE) ../capinfo.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
@@ -1341,7 +639,7 @@ host_cpu=@host_cpu@
 host_os=@host_os@
 
 svr4-package: $(bin_SCRIPTS) $(lib_LTLIBRARIES)
-       if test x$(HAVE_SVR4_PACKAGING) = xyes ; then \
+       @if test x$(HAVE_SVR4_PACKAGING) = xyes ; then \
                rm -rf $(stagedir) ; \
                $(MAKE) DESTDIR=$(stagedir) install; \
                $(srcdir)/packaging/svr4/mkpkg \
@@ -1364,7 +662,7 @@ rpm-package: dist
                cd SOURCES ; \
                ln -s ../../../$(distdir).tar.gz ; \
                cd .. ; \
-               rpm --define "_topdir `cd . && pwd`" -bb SPECS/ethereal.spec && \
+               rpmbuild --define "_topdir `cd . && pwd`" -bb SPECS/ethereal.spec && \
                        echo "Package successfully built in `pwd`/RPMS." ; \
        else \
                echo "Error: RPM executable and/or source directory not found." ; \
@@ -1376,7 +674,7 @@ srpm-package: dist
                cd SOURCES ; \
                ln -s ../../../$(distdir).tar.gz ; \
                cd .. ; \
-               rpm --define "_topdir `cd . && pwd`" -bs SPECS/ethereal.spec && \
+               rpmbuild --define "_topdir `cd . && pwd`" -bs SPECS/ethereal.spec && \
                        echo "Package successfully built in `pwd`/SRPMS." ; \
        else \
                echo "Error: RPM executable and/or source directory not found." ; \