replace *a lot* of file related calls by their GLib counterparts. This is necessary...
[obnox/wireshark/wip.git] / Makefile.am
index b94f84aacfcde0bbd91276c3025c8f03760864c5..6a3ee13d9a61ee795e7dc8608584430ecdb81fb9 100644 (file)
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.699 2004/01/21 21:46:58 jmayer Exp $
+# $Id$
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -60,36 +60,128 @@ 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@ @capinfos_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@ @capinfos_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 capinfos 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.
+# Ethereal configuration files are put in $(pkgdatadir).
 #
-pkgdata_DATA = manuf
+pkgdata_DATA = AUTHORS-SHORT manuf ethereal.html tethereal.html \
+       ethereal-filter.html capinfos.html editcap.html \
+       idl2eth.html mergecap.html text2pcap.html \
+       cfilters colorfilters dfilters
 
 #
 # 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 \
-       nasreq.xml sunping.xml
+diameter_DATA = \
+       diameter/dictionary.dtd \
+       diameter/dictionary.xml \
+       diameter/imscxdx.xml \
+       diameter/mobileipv4.xml \
+       diameter/nasreq.xml \
+       diameter/sunping.xml
+
+#
+# Install the DTDs directory files in the "dtds" subdirectory
+# of that directory
+#
+dtdsdir = $(pkgdatadir)/dtds
+dtds_DATA = \
+       dtds/dc.dtd \
+       dtds/itunes.dtd \
+       dtds/rss.dtd \
+       dtds/smil.dtd
+
+#
+# Install the RADIUS directory files in the "radius" subdirectory
+# of that directory.
+#
+radiusdir = $(pkgdatadir)/radius
+radius_DATA = \
+       radius/dictionary  \
+       radius/dictionary.3com  \
+       radius/dictionary.3gpp  \
+       radius/dictionary.3gpp2  \
+       radius/dictionary.acc  \
+       radius/dictionary.alcatel  \
+       radius/dictionary.alteon  \
+       radius/dictionary.altiga  \
+       radius/dictionary.aptis  \
+       radius/dictionary.ascend  \
+       radius/dictionary.bay  \
+       radius/dictionary.bintec  \
+       radius/dictionary.bristol  \
+       radius/dictionary.cablelabs  \
+       radius/dictionary.cabletron  \
+       radius/dictionary.cisco  \
+       radius/dictionary.cisco.bbsm  \
+       radius/dictionary.cisco.vpn3000  \
+       radius/dictionary.cisco.vpn5000  \
+       radius/dictionary.colubris  \
+       radius/dictionary.columbia_university  \
+       radius/dictionary.compat  \
+       radius/dictionary.cosine  \
+       radius/dictionary.ericsson  \
+       radius/dictionary.erx  \
+       radius/dictionary.extreme  \
+       radius/dictionary.foundry  \
+       radius/dictionary.freeradius  \
+       radius/dictionary.gandalf  \
+       radius/dictionary.garderos  \
+       radius/dictionary.gemtek  \
+       radius/dictionary.itk  \
+       radius/dictionary.juniper  \
+       radius/dictionary.karlnet  \
+       radius/dictionary.livingston  \
+       radius/dictionary.localweb  \
+       radius/dictionary.merit  \
+       radius/dictionary.microsoft  \
+       radius/dictionary.mikrotik  \
+       radius/dictionary.navini  \
+       radius/dictionary.netscreen  \
+       radius/dictionary.nokia  \
+       radius/dictionary.nomadix  \
+       radius/dictionary.propel  \
+       radius/dictionary.quintum  \
+       radius/dictionary.redback  \
+       radius/dictionary.redcreek  \
+       radius/dictionary.shasta  \
+       radius/dictionary.shiva  \
+       radius/dictionary.sonicwall  \
+       radius/dictionary.springtide  \
+       radius/dictionary.t_systems_nova  \
+       radius/dictionary.telebit  \
+       radius/dictionary.trapeze  \
+       radius/dictionary.tunnel  \
+       radius/dictionary.unisphere  \
+       radius/dictionary.unix  \
+       radius/dictionary.usr  \
+       radius/dictionary.valemount  \
+       radius/dictionary.versanet  \
+       radius/dictionary.wispr  \
+       radius/dictionary.xedia
+
+PLATFORM_SRC = pcap-util-unix.c
 
 include Makefile.common
 
 if HAVE_PLUGINS
 plugin_libs = \
        plugins/acn/acn.la \
+       plugins/agentx/agentx.la \
        plugins/artnet/artnet.la \
        plugins/asn1/asn1.la \
+       plugins/ciscosm/ciscosm.la \
        plugins/docsis/docsis.la \
        plugins/enttec/enttec.la \
        plugins/giop/cosnaming.la \
@@ -99,98 +191,26 @@ plugin_libs = \
        plugins/lwres/lwres.la \
        plugins/megaco/megaco.la \
        plugins/mgcp/mgcp.la \
+       plugins/opsi/opsi.la \
        plugins/pcli/pcli.la \
+       plugins/profinet/profinet.la \
        plugins/rdm/rdm.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/docsis/packet-bpkmattr.o \
-       plugins/docsis/packet-bpkmreq.o \
-       plugins/docsis/packet-bpkmrsp.o \
-       plugins/docsis/packet-docsis.o \
-       plugins/docsis/packet-dsaack.o \
-       plugins/docsis/packet-dsareq.o \
-       plugins/docsis/packet-dsarsp.o \
-       plugins/docsis/packet-dscack.o \
-       plugins/docsis/packet-dscreq.o \
-       plugins/docsis/packet-dscrsp.o \
-       plugins/docsis/packet-dsdreq.o \
-       plugins/docsis/packet-dsdrsp.o \
-       plugins/docsis/packet-macmgmt.o \
-       plugins/docsis/packet-map.o \
-       plugins/docsis/packet-regack.o \
-       plugins/docsis/packet-regreq.o \
-       plugins/docsis/packet-regrsp.o \
-       plugins/docsis/packet-rngreq.o \
-       plugins/docsis/packet-rngrsp.o \
-       plugins/docsis/packet-tlv.o \
-       plugins/docsis/packet-uccreq.o \
-       plugins/docsis/packet-uccrsp.o \
-       plugins/docsis/packet-ucd.o \
-       plugins/enttec/packet-enttec.o \
-       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/pcli/packet-pcli.o \
-       plugins/rdm/packet-rdm.o \
-       plugins/rtnet/packet-rtnet.o \
-       plugins/v5ua/packet-v5ua.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/irda/packet-irda.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/v5ua/packet-v5ua.c
+plugin_ldadd = $(plugin_libs)
 
 else           # ENABLE_STATIC
 plugin_ldadd = \
        "-dlopen" self  \
        "-dlopen" plugins/acn/acn.la \
+       "-dlopen" plugins/agentx/agentx.la \
        "-dlopen" plugins/artnet/artnet.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 \
@@ -200,322 +220,23 @@ plugin_ldadd = \
        "-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/profinet/profinet.la \
        "-dlopen" plugins/rdm/rdm.la \
+       "-dlopen" plugins/rlm/rlm.la \
        "-dlopen" plugins/rtnet/rtnet.la \
+       "-dlopen" plugins/rudp/rudp.la \
        "-dlopen" plugins/v5ua/v5ua.la
 
-plugin_src =
-
 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-ansi_map.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-gsm_a.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-igap.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-isup.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-pres.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-x11-keysymdef.h  \
-       packet-ypbind.h \
-       packet-yppasswd.h \
-       packet-ypserv.h \
-       packet-ypxfr.h
-
-DISSECTOR_SUPPORT_SRC = \
-       adler32.c      \
-       adler32.h      \
-       afn.c          \
-       afn.h          \
-       aftypes.h      \
-       arcnet_pids.h  \
-       asn1.c         \
-       asn1.h         \
-       bridged_pids.h \
-       chdlctypes.h   \
-       column.c       \
-       column.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    \
-       etypes.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 \
-       ppptypes.h     \
-       prefs-int.h    \
-       prefs.c        \
-       prefs.h        \
-       ptvcursor.c     \
-       ptvcursor.h     \
-       reassemble.c   \
-       reassemble.h   \
-       req_resp_hdrs.c \
-       req_resp_hdrs.h \
-       rpc_defrag.h   \
-       rtp_pt.h       \
-       sctpppids.h    \
-       smb.h          \
-       t35.c           \
-       t35.h           \
-       tap.c           \
-       tap.h           \
-       util.c         \
-       util.h         \
-       x264_prt_id.h  \
-       xdlc.c         \
-       xdlc.h         \
-       xmlstub.c      \
-       xmlstub.h
-
-BUILT_SOURCES = \
-       cvsversion.h    \
-       x11-declarations.h \
-       x11-register-info.h
-
-ETHEREAL_COMMON_SRC = \
-       $(DISSECTOR_SUPPORT_SRC) \
-       $(BUILT_SOURCES) \
-       capture_stop_conditions.c   \
-       capture_stop_conditions.h   \
-       cfile.c         \
-       cfile.h         \
-       color.h        \
-       conditions.c   \
-       conditions.h   \
-       disabled_protos.c      \
-       disabled_protos.h      \
-       file.h         \
-       pcap-util.c    \
-       pcap-util.h    \
-       pcap-util-int.h \
-       pcap-util-unix.c \
-       print.c        \
-       print.h        \
-       ps.c           \
-       ps.h           \
-       range.c         \
-       range.h         \
-       register.h     \
-       ringbuffer.c   \
-       ringbuffer.h   \
-       timestats.c     \
-       timestats.h     \
-       version_info.c  \
-       version_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      \
-       tap_dfilter_dlg.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
@@ -530,11 +251,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 = \
@@ -561,43 +280,14 @@ ethereal_LDADD = \
        $(ethereal_additional_libs)     \
        @SNMP_LIBS@ @SSL_LIBS@          \
        $(plugin_ldadd)                 \
-       @PCRE_LIBS@ \
-       @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@
-
-TETHEREAL_TAP_SRC = \
-       tap-ansi_astat.c        \
-       tap-bootpstat.c         \
-       tap-dcerpcstat.c        \
-       tap-gsm_astat.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 = \
@@ -611,9 +301,9 @@ tethereal_LDADD = \
        $(tethereal_additional_libs)    \
        @SNMP_LIBS@ @SSL_LIBS@          \
        $(plugin_ldadd)                 \
-       @PCRE_LIBS@ \
+       @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
@@ -625,24 +315,22 @@ 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 cvsversion.h
-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
+capinfos_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@
+capinfos_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
@@ -650,14 +338,24 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap
 #
 # Build the version string
 #
-cvsversion.h:
-       $(PERL) $(srcdir)/make-version.pl
+# FORCE is the portable version of .PHONY
+FORCE:
+
+svnversion.h: FORCE
+       $(PERL) $(srcdir)/make-version.pl $(srcdir)
 
 #
-# Build various header files for the X11 dissector.
+# 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 < $(srcdir)/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.
@@ -671,49 +369,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.
+# that calls the register routines for all tethereal 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.
@@ -729,25 +392,19 @@ ps.c: print.ps rdps
 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) \
-       $(DISSECTOR_SUPPORT_SRC) \
-       $(BUILT_SOURCES) \
-       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)    \
@@ -760,29 +417,48 @@ dftest_LDADD = \
        $(dftest_additional_libs)       \
        @SNMP_LIBS@ @SSL_LIBS@          \
        $(plugin_ldadd)                 \
-       @PCRE_LIBS@ \
-       @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 =   \
-       @rdps_bin@ \
-       idl2eth
+#
+# XXX - "svnversion.h" is distributed in the release tarball; should
+# we be deleting it with "make clean", or should we only do that with
+# "make maintainer-clean"?
+#
+CLEANFILES =           \
+       svnversion.h    \
+       @rdps_bin@      \
+       idl2eth         \
+       *~              \
+       vgcore.pid*
 
+#
+# XXX - "ps.c" is distributed in the source tarballs; why is it in the
+# list of files removed by "make distclean"?  (It's deliberately
+# included in that list.)
+#
 DISTCLEANFILES = \
-       aclocal-missing/*.m4 \
-       ps.c \
-       *~
+       AUTHORS-SHORT           \
+       AUTHORS-SHORT-FORMAT    \
+       ps.c
 
 MAINTAINERCLEANFILES =         \
-       register.c              \
-       ps.c
+       $(GENERATED_FILES)      \
+       Makefile.in             \
+       aclocal.m4              \
+       config.h.in             \
+       configure               \
+       depcomp                 \
+       install-sh              \
+       ltmain.sh               \
+       missing
 
 EXTRA_DIST = \
-       Ethereal.desktop        \
        FAQ                     \
-       INSTALL.configure       \
+       INSTALL.configure       \
        Makefile.common         \
        Makefile.nmake          \
        README.aix              \
@@ -790,20 +466,23 @@ EXTRA_DIST = \
        README.hpux             \
        README.irix             \
        README.linux            \
+       README.macos            \
        README.tru64            \
        README.vmware           \
        README.win32            \
-       TODO                    \
        aclocal-fallback/glib-2.0.m4 \
        aclocal-fallback/glib.m4 \
        aclocal-fallback/gtk-2.0.m4 \
        aclocal-fallback/gtk.m4 \
        aclocal-flags           \
-       aclocal-missing/dummy   \
        autogen.sh              \
+       capinfos.c              \
        capture-wpcap.c         \
        capture-wpcap.h         \
-       cleanbld.bat            \
+       capture_wpcap_packet.c  \
+       capture_wpcap_packet.h  \
+       cfilters                \
+       colorfilters            \
        config.h.win32          \
        config.nmake            \
        debian/README.debian    \
@@ -816,19 +495,19 @@ EXTRA_DIST = \
        debian/postinst         \
        debian/prerm            \
        debian/rules            \
-       dictionary.dtd          \
-       dictionary.xml          \
-       doc/Makefile.am         \
-       doc/Makefile.nmake      \
-       doc/README.capture      \
-       doc/README.design       \
-       doc/README.developer    \
-       doc/README.idl2eth      \
-       doc/README.plugins      \
+       dfilters                \
+       doc/Makefile.am         \
+       doc/Makefile.nmake      \
+       doc/README.capture      \
+       doc/README.design       \
+       doc/README.developer    \
+       doc/README.idl2eth      \
+       doc/README.plugins      \
        doc/README.regression   \
        doc/README.tapping      \
        doc/README.tvbuff       \
        doc/README.xml-output   \
+       doc/capinfos.pod                \
        doc/dfilter2pod.pl      \
        doc/editcap.pod         \
        doc/ethereal-filter.pod.template \
@@ -838,14 +517,20 @@ EXTRA_DIST = \
        doc/randpkt.txt         \
        doc/tethereal.pod       \
        doc/text2pcap.pod       \
+       docbook/Makefile.auto.am        \
+       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/capinfos.rc.in    \
        image/clist_ascend.xpm  \
        image/clist_descend.xpm \
        image/dn_arrow.xpm      \
@@ -856,7 +541,6 @@ EXTRA_DIST = \
        image/eicon3d48.xpm     \
        image/eicon3d64.xpm     \
        image/elogo3d48x48.png  \
-       image/ethereal.icns     \
        image/ethereal.ico      \
        image/ethereal.rc.in    \
        image/ethereal48x48-trans.png  \
@@ -866,51 +550,93 @@ 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/stock_dialog_stop_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/autoscroll_24.xpm \
+       image/toolbar/capture_filter_24.xpm     \
+       image/toolbar/capture_interfaces_24.xpm \
+       image/toolbar/capture_options_24.xpm    \
+       image/toolbar/capture_restart_24.xpm    \
+       image/toolbar/capture_start_24.xpm      \
+       image/toolbar/capture_stop_24.xpm       \
+       image/toolbar/checkbox_16.xpm   \
+       image/toolbar/colorize_24.xpm   \
+       image/toolbar/conversations_16.xpm      \
+       image/toolbar/decode_as_16.xpm  \
+       image/toolbar/display_filter_24.xpm     \
+       image/toolbar/endpoints_16.xpm  \
+       image/toolbar/file_set_list_16.xpm      \
+       image/toolbar/file_set_next_16.xpm      \
+       image/toolbar/file_set_previous_16.xpm  \
+       image/toolbar/graphs_16.xpm     \
+       image/toolbar/internet_24.xpm   \
+       image/toolbar/resize_columns_24.xpm     \
+       image/toolbar/stock_add_24.xpm  \
+       image/toolbar/stock_bottom_24.xpm       \
+       image/toolbar/stock_clear_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/toolbar/telephony_16.xpm  \
+       image/toolbar/time_24.xpm       \
+       image/toolbar/web_support_24.xpm        \
+       image/toolbar/wiki_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     \
+       make-authors-format.pl  \
+       make-authors-short.pl   \
        make-manuf              \
-       make-reg-dotc           \
-       make-reg-dotc.py        \
        make-tapreg-dotc        \
-       manuf                   \
+       make-version.pl         \
+       manuf                   \
        manuf.tmpl              \
        mergecap.c              \
-       mobileipv4.xml          \
-       nasreq.xml              \
-       ncp2222.py              \
-       packet-ncp2222.inc      \
-       print.ps                \
-       process-x11-fields.pl   \
+       perlnoutf.pl            \
+       print.ps                \
+       $(diameter_DATA)        \
+       $(dtds_DATA)            \
+       $(radius_DATA)          \
        randpkt.c               \
        rdps.c                  \
-       sunping.xml             \
-       text2pcap-scanner.l     \
-       text2pcap.c             \
-       text2pcap.h             \
-       wka.tmpl                \
-       x11-fields
+       text2pcap-scanner.l     \
+       text2pcap.c             \
+       text2pcap.h             \
+       wka.tmpl
 
 if SETUID_INSTALL
 install-exec-hook:
@@ -920,24 +646,6 @@ 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 help
 
 if HAVE_PLUGINS
@@ -946,11 +654,11 @@ else
 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 )
 
@@ -958,6 +666,10 @@ ethereal-filter.4: tethereal doc/ethereal-filter.pod.template
        (cd doc ; \
        $(MAKE) ../ethereal-filter.4 )
 
+capinfos.1: doc/capinfos.pod
+       (cd doc ; \
+       $(MAKE) ../capinfos.1 )
+
 editcap.1: doc/editcap.pod
        (cd doc ; \
        $(MAKE) ../editcap.1 )
@@ -974,8 +686,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 )
+
+capinfos.html: doc/capinfos.pod
+       (cd doc ; \
+       $(MAKE) ../capinfos.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
@@ -1009,8 +750,10 @@ rpm-package: dist
                mkdir -p BUILD RPMS SOURCES ; \
                cd SOURCES ; \
                ln -s ../../../$(distdir).tar.gz ; \
+               ln -s ../../../ethereal.desktop ; \
+               ln -s ../../../image/elogo3d64x64.png ethereal.png ; \
                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." ; \
@@ -1021,8 +764,10 @@ srpm-package: dist
                mkdir -p BUILD SRPMS SOURCES ; \
                cd SOURCES ; \
                ln -s ../../../$(distdir).tar.gz ; \
+               ln -s ../../../ethereal.desktop ; \
+               ln -s ../../../image/elogo3d64x64.png ethereal.png ; \
                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." ; \