Frame numbers are unsigned.
[obnox/wireshark/wip.git] / Makefile.am
index 18b63373fc2474f547eb64840e83d43afcbdde74..03584e8ab9eb37b06ecddb77b2fdd31e86b70859 100644 (file)
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.488 2002/09/12 08:48:39 sahlberg Exp $
+# $Id: Makefile.am,v 1.585 2003/05/29 14:05:41 gerald Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -65,33 +65,37 @@ bin_SCRIPTS = @idl2eth_bin@
 man1_MANS = @ethereal_man@ @editcap_man@ @mergecap_man@ @tethereal_man@ @text2pcap_man@ @idl2eth_man@
 man_MANS =
 
-EXTRA_PROGRAMS = ethereal ethereal_static tethereal tethereal_static editcap mergecap dftest text2pcap
+EXTRA_PROGRAMS = ethereal tethereal editcap mergecap dftest text2pcap
 EXTRA_SCRIPTS = idl2eth
 
 #
-# Install "manuf" in the directory for Ethereal configuration files.
+# Ethereal configuration files are put in $(pkgdatadir).  It currently
+# contains the "manuf" file and a "diameter" directory.
 #
-sysconf_DATA = manuf
+pkgdata_DATA = manuf
 
 #
 # Install the Diameter DTD and XML files in the "diameter" subdirectory
 # of that directory.
 #
-diameterdir = $(sysconfdir)/diameter
+diameterdir = $(pkgdatadir)/diameter
 diameter_DATA = dictionary.dtd dictionary.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-ans.c   \
        packet-aodv.c  \
-       packet-aodv6.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   \
@@ -99,13 +103,16 @@ DISSECTOR_SRC = \
        packet-bacnet.c   \
        packet-beep.c \
        packet-bgp.c   \
+       packet-bofl.c  \
        packet-bootp.c \
        packet-bootparams.c \
        packet-bpdu.c  \
+       packet-brdwlk.c \
        packet-bvlc.c \
        packet-cdp.c   \
        packet-cgmp.c  \
        packet-chdlc.c  \
+       packet-clearcase.c  \
        packet-clip.c  \
        packet-clnp.c  \
        packet-cops.c  \
@@ -114,25 +121,35 @@ DISSECTOR_SRC = \
        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-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-dtsprovider.c \
        packet-dcerpc-dtsstime_req.c \
        packet-dcerpc-epm.c  \
+       packet-dcerpc-fldb.c  \
+       packet-dcerpc-ftserver.c \
+       packet-dcerpc-krb5rpc.c \
        packet-dcerpc-lsa.c \
+       packet-dcerpc-lsa-ds.c \
        packet-dcerpc-mapi.c  \
        packet-dcerpc-mgmt.c  \
        packet-dcerpc-ndr.c  \
        packet-dcerpc-netlogon.c \
        packet-dcerpc-nspi.c \
-       packet-dcerpc-nt.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  \
@@ -144,15 +161,21 @@ DISSECTOR_SRC = \
        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-dcerpc.c  \
        packet-ddtp.c  \
        packet-dec-bpdu.c \
        packet-dhcpv6.c \
        packet-diameter.c \
+       packet-distcc.c \
        packet-dlsw.c  \
        packet-dns.c   \
        packet-dsi.c   \
@@ -160,10 +183,23 @@ DISSECTOR_SRC = \
        packet-eap.c \
        packet-eapol.c \
        packet-eigrp.c \
+       packet-enc.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-fcswils.c \
        packet-fddi.c  \
+       packet-fix.c  \
        packet-fr.c    \
        packet-frame.c  \
        packet-ftp.c   \
@@ -178,8 +214,10 @@ DISSECTOR_SRC = \
        packet-h1.c    \
        packet-h261.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  \
@@ -192,21 +230,27 @@ DISSECTOR_SRC = \
        packet-igrp.c  \
        packet-imap.c   \
        packet-ip.c    \
+       packet-ipfc.c    \
+       packet-ipmi.c  \
        packet-ipp.c   \
        packet-ipsec.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-isis.c  \
        packet-isl.c   \
+       packet-isns.c \
        packet-isup.c  \
        packet-iua.c   \
+       packet-kadm5.c \
        packet-kerberos.c \
        packet-klm.c   \
        packet-l2tp.c  \
@@ -224,22 +268,28 @@ DISSECTOR_SRC = \
        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   \
@@ -247,12 +297,13 @@ DISSECTOR_SRC = \
        packet-nfsauth.c \
        packet-nisplus.c \
        packet-nlm.c   \
+       packet-nlsp.c  \
        packet-nntp.c  \
        packet-ntlmssp.c  \
        packet-ntp.c  \
        packet-null.c  \
-       packet-osi-options.c \
        packet-osi.c   \
+       packet-osi-options.c \
        packet-ospf.c  \
        packet-pcnfsd.c \
        packet-pflog.c \
@@ -277,12 +328,16 @@ DISSECTOR_SRC = \
        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-rtsp.c  \
@@ -291,20 +346,23 @@ DISSECTOR_SRC = \
        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-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.c   \
+       packet-smb-sidsnooping.c \
        packet-smpp.c \
        packet-smtp.c \
        packet-sna.c   \
@@ -315,9 +373,10 @@ DISSECTOR_SRC = \
        packet-spray.c \
        packet-srvloc.c \
        packet-sscop.c \
+       packet-ssh.c   \
        packet-ssl.c   \
-       packet-stat-notify.c \
        packet-stat.c   \
+       packet-stat-notify.c \
        packet-sua.c   \
        packet-syslog.c \
        packet-tacacs.c \
@@ -331,6 +390,7 @@ DISSECTOR_SRC = \
        packet-tr.c    \
        packet-trmac.c \
        packet-tsp.c \
+       packet-tzsp.c  \
        packet-ucp.c   \
        packet-udp.c   \
        packet-v120.c \
@@ -340,18 +400,23 @@ DISSECTOR_SRC = \
        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 \
@@ -359,37 +424,19 @@ DISSECTOR_SRC = \
        packet-zebra.c
 
 if HAVE_PLUGINS
-plugin_src = \
-       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/giop/packet-cosnaming.c \
-       plugins/giop/packet-coseventcomm.c \
-       plugins/gryphon/packet-gryphon.c \
-       plugins/mgcp/packet-mgcp.c
-
+plugin_libs = \
+       plugins/artnet/artnet.la \
+       plugins/docsis/docsis.la \
+       plugins/giop/cosnaming.la \
+       plugins/giop/coseventcomm.la \
+       plugins/gryphon/gryphon.la \
+       plugins/megaco/megaco.la \
+       plugins/mgcp/mgcp.la \
+       plugins/pcli/pcli.la
 
-plugin_static_ldadd = \
+if ENABLE_STATIC
+plugin_ldadd = \
+       plugins/artnet/packet-artnet-static.o \
        plugins/docsis/packet-bpkmattr-static.o \
        plugins/docsis/packet-bpkmreq-static.o \
        plugins/docsis/packet-bpkmrsp-static.o \
@@ -416,31 +463,65 @@ plugin_static_ldadd = \
        plugins/giop/packet-cosnaming-static.o \
        plugins/giop/packet-coseventcomm-static.o \
        plugins/gryphon/packet-gryphon-static.o \
-       plugins/mgcp/packet-mgcp-static.o
+       plugins/megaco/packet-megaco-static.o \
+       plugins/mgcp/packet-mgcp-static.o \
+       plugins/pcli/packet-pcli-static.o
 
-plugin_libs = \
-       plugins/docsis/docsis.la \
-       plugins/giop/cosnaming.la \
-       plugins/giop/coseventcomm.la \
-       plugins/gryphon/gryphon.la \
-       plugins/mgcp/mgcp.la
+plugin_src = \
+       plugins/artnet/packet-artnet.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/giop/packet-cosnaming.c \
+       plugins/giop/packet-coseventcomm.c \
+       plugins/gryphon/packet-gryphon.c \
+       plugins/megaco/packet-megaco.c \
+       plugins/mgcp/packet-mgcp.c \
+       plugins/pcli/packet-pcli.c
 
+else           # ENABLE_STATIC
 plugin_ldadd = \
        "-dlopen" self  \
+       "-dlopen" plugins/artnet/artnet.la \
        "-dlopen" plugins/docsis/docsis.la \
        "-dlopen" plugins/giop/cosnaming.la \
        "-dlopen" plugins/giop/coseventcomm.la \
        "-dlopen" plugins/gryphon/gryphon.la \
-       "-dlopen" plugins/mgcp/mgcp.la
-else
+       "-dlopen" plugins/megaco/megaco.la \
+       "-dlopen" plugins/mgcp/mgcp.la \
+       "-dlopen" plugins/pcli/pcli.la
+
 plugin_src =
 
-plugin_static_ldadd =
+endif          # ENABLE_STATIC
+
+else           # HAVE_PLUGINS
+plugin_src =
 
 plugin_libs =
 
 plugin_ldadd =
-endif
+endif          # HAVE_PLUGINS
 
 noinst_HEADERS = \
        packet-afp.h   \
@@ -448,16 +529,20 @@ noinst_HEADERS = \
        packet-afs-macros.h \
        packet-afs-register-info.h \
        packet-afs.h   \
+       packet-arcnet.h \
        packet-arp.h   \
        packet-atalk.h \
        packet-atm.h   \
        packet-bgp.h   \
        packet-bootparams.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-dfs.h \
        packet-dcerpc-dnsserver.h \
        packet-dcerpc-lsa.h \
@@ -468,6 +553,7 @@ noinst_HEADERS = \
        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 \
@@ -477,6 +563,16 @@ noinst_HEADERS = \
        packet-dvmrp.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-fcswils.h \
        packet-fddi.h  \
        packet-frame.h  \
        packet-giop.h  \
@@ -484,11 +580,13 @@ noinst_HEADERS = \
        packet-gssapi.h \
        packet-gtp.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   \
@@ -502,16 +600,18 @@ noinst_HEADERS = \
        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-netflow.h \
        packet-nfs.h   \
        packet-nisplus.h \
        packet-nlm.h   \
+       packet-ntlmssp.h  \
        packet-ntp.h  \
        packet-null.h  \
        packet-osi-options.h \
@@ -540,6 +640,7 @@ noinst_HEADERS = \
        packet-smb-logon.h \
        packet-smb-mailslot.h \
        packet-smb-pipe.h \
+       packet-smb-sidsnooping.h \
        packet-sna.h   \
        packet-snmp.h   \
        packet-spray.h \
@@ -554,11 +655,11 @@ noinst_HEADERS = \
        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-yhoo.h  \
        packet-ypbind.h \
        packet-yppasswd.h \
        packet-ypserv.h \
@@ -569,6 +670,7 @@ ETHEREAL_COMMON_SRC = \
        afn.h          \
        aftypes.h      \
        alignment.h    \
+       arcnet_pids.h  \
        asn1.c         \
        asn1.h         \
        bridged_pids.h \
@@ -576,16 +678,28 @@ ETHEREAL_COMMON_SRC = \
        capture_stop_conditions.h   \
        cfile.c         \
        cfile.h         \
+       chdlctypes.h   \
        color.h        \
        column.c       \
        column.h       \
        conditions.c   \
        conditions.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    \
+       packet-dcerpc-nt.c \
        etypes.h       \
        file.h         \
        follow.c       \
        follow.h       \
        format-oid.h   \
+       g711.c          \
+       g711.h          \
        greproto.h     \
        in_cksum.c     \
        in_cksum.h     \
@@ -612,13 +726,12 @@ ETHEREAL_COMMON_SRC = \
        ringbuffer.c   \
        ringbuffer.h   \
        rpc_defrag.h   \
+       sctpppids.h    \
        smb.h          \
        tap.c           \
        tap.h           \
-       tap-rpcstat.c   \
-       tap-rpcstat.h   \
-       tap-rpcprogs.c  \
-       tap-rpcprogs.h  \
+       timestats.c     \
+       timestats.h     \
        util.c         \
        util.h         \
        x11-declarations.h \
@@ -644,30 +757,6 @@ ethereal_SOURCES = \
        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
-
-ethereal_static_SOURCES = \
-       $(DISSECTOR_SRC) \
-       $(ETHEREAL_COMMON_SRC) \
-       register-static.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      \
@@ -703,21 +792,12 @@ ethereal_optional_objects = @SNPRINTF_O@ @STRERROR_O@ \
 
 # Additional libs that I know how to build. These will be
 # linked into the ethereal executable.
-if USE_GTK2
-ethereal_additional_libs = \
-       wiretap/libwiretap.a    \
-       gtk2/libui.a            \
-       epan/libethereal.a      \
-       epan/ftypes/libftypes.a \
-       epan/dfilter/libdfilter.a
-else
 ethereal_additional_libs = \
        wiretap/libwiretap.a    \
        gtk/libui.a             \
        epan/libethereal.a      \
        epan/ftypes/libftypes.a \
        epan/dfilter/libdfilter.a
-endif
 
 # This is the automake dependency variable for the executable
 ethereal_DEPENDENCIES = \
@@ -725,10 +805,6 @@ ethereal_DEPENDENCIES = \
        $(ethereal_additional_libs)     \
        $(plugin_libs)
 
-ethereal_static_DEPENDENCIES = \
-       $(ethereal_optional_objects)    \
-       $(ethereal_additional_libs)
-
 # This automake variable adds to the link-line for the executable.
 #
 # Note that Ethereal doesn't have to be linked with @GLIB_LIBS@, as
@@ -736,36 +812,39 @@ ethereal_static_DEPENDENCIES = \
 # @SOCKET_LIBS@ or @NSL_LIBS@, as those should also be included in
 # @GTK_LIBS@ (as those are also needed for X applications, and GTK+
 # applications are X applications).
+
+if ENABLE_STATIC
+ethereal_LDFLAGS = -Wl,-static -all-static
+else
+ethereal_LDFLAGS = -export-dynamic
+endif
+
 ethereal_LDADD = \
        $(ethereal_optional_objects)    \
        $(ethereal_additional_libs)     \
        @SNMP_LIBS@ @SSL_LIBS@          \
        $(plugin_ldadd)                 \
-       @PCAP_LIBS@ @GTK_LIBS@
-
-ethereal_static_LDADD = \
-       "-all-static"                   \
-       $(plugin_static_ldadd)          \
-       $(ethereal_optional_objects)    \
-       $(ethereal_additional_libs)     \
-       @SNMP_LIBS@ @SSL_LIBS@          \
-       @PCAP_LIBS@ @GTK_LIBS@
-
-ethereal_LDFLAGS = -export-dynamic
-ethereal_static_LDFLAGS = -Wl,-static
+       @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@
+
+TETHEREAL_TAP_SRC = \
+       tap-dcerpcstat.c        \
+       tap-iostat.c            \
+       tap-iousers.c           \
+       tap-mgcpstat.c          \
+       tap-protocolinfo.c      \
+       tap-protohierstat.c     \
+       tap-rpcstat.c           \
+       tap-rpcprogs.c          \
+       tap-smbstat.c
 
 tethereal_SOURCES = \
        $(DISSECTOR_SRC) \
        $(ETHEREAL_COMMON_SRC) \
+       $(TETHEREAL_TAP_SRC) \
+       tethereal-tap-register.c \
        register.c     \
        tethereal.c
 
-tethereal_static_SOURCES = \
-       $(DISSECTOR_SRC) \
-       $(ETHEREAL_COMMON_SRC) \
-       register-static.c     \
-       tethereal.c
-
 # Additional libs that I know how to build. These will be
 # linked into the tethereal executable.
 tethereal_additional_libs =            \
@@ -780,31 +859,20 @@ tethereal_DEPENDENCIES = \
        $(tethereal_additional_libs)    \
        $(plugin_libs)
 
-tethereal_static_DEPENDENCIES = \
-       $(ethereal_optional_objects)    \
-       $(tethereal_additional_libs)
-
 # This automake variable adds to the link-line for the executable
-tethereal_LDADD = wiretap/libwiretap.a \
+tethereal_LDADD = \
        $(ethereal_optional_objects)    \
        $(tethereal_additional_libs)    \
        @SNMP_LIBS@ @SSL_LIBS@          \
        $(plugin_ldadd)                 \
-       @GLIB_LIBS@ -lm \
-       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@
-
-tethereal_static_LDADD = \
-       "-all-static"           \
-       $(plugin_static_ldadd)  \
-       wiretap/libwiretap.a    \
-       $(ethereal_optional_objects)    \
-       $(tethereal_additional_libs)    \
-       @SNMP_LIBS@ @SSL_LIBS@          \
-       @GLIB_LIBS@ -lm \
-       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@
+       @GLIB_LIBS@ -lm                 \
+       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@
 
+if ENABLE_STATIC
+tethereal_LDFLAGS = -Wl,-static -all-static
+else
 tethereal_LDFLAGS = -export-dynamic
-tethereal_static_LDFLAGS = -Wl,-static
+endif
 
 # Optional objects that I know how to build, and that are needed by
 # text2pcap.
@@ -867,16 +935,37 @@ SUFFIXES = .sh
 #
 # Therefore, we have a script to generate the "register.c" file.
 #
-# The first argument is the directory in which the source files live.
+# 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: $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc
-       @echo Making register.c
-       @$(srcdir)/make-reg-dotc register.c $(srcdir) $(DISSECTOR_SRC)
+register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc
+       @if test -n $(PYTHON); then \
+               echo Making register.c with python ; \
+               $(PYTHON) make-reg-dotc.py . $(DISSECTOR_SRC) ; \
+       else \
+               echo Making register.c with shell script ; \
+               $(srcdir)/make-reg-dotc register.c $(srcdir) \
+                       $(plugin_src) $(DISSECTOR_SRC) ; \
+       fi
 
-register-static.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc
-       @echo Making register-static.c
-       @$(srcdir)/make-reg-dotc register-static.c $(srcdir) $(plugin_src) $(DISSECTOR_SRC)
+#
+# 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 
+# "void " starting in column zero, and must not be inside #if.
+#
+# The first argument is the directory in which the source files live.
+# All subsequent arguments are the files to scan.
+#
+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
@@ -924,15 +1013,18 @@ CLEANFILES =     \
 
 DISTCLEANFILES =       \
        aclocal-missing/*.m4 \
-       register.c      \
-       register-static.c \
-       rdps            \
        ps.c            \
+       rdps            \
        *~
 
+MAINTAINERCLEANFILES =         \
+       register.c              \
+       ps.c
+
 EXTRA_DIST = \
        Ethereal.desktop        \
        FAQ                     \
+       FAQ.include             \
        INSTALL.configure       \
        Makefile.nmake          \
        README.aix              \
@@ -944,8 +1036,12 @@ EXTRA_DIST = \
        README.vmware           \
        README.win32            \
        TODO                    \
-       aclocal-fallback/*.m4   \
+       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              \
        capture-wpcap.c         \
        capture-wpcap.h         \
@@ -971,6 +1067,7 @@ EXTRA_DIST = \
        doc/README.idl2eth      \
        doc/README.plugins      \
        doc/README.regression   \
+       doc/README.tapping      \
        doc/README.tvbuff       \
        doc/dfilter2pod.pl      \
        doc/editcap.pod         \
@@ -1019,6 +1116,7 @@ EXTRA_DIST = \
        make-manuf              \
        make-reg-dotc           \
        make-reg-dotc.py        \
+       make-tapreg-dotc                \
        manuf                   \
        manuf.tmpl              \
        mergecap.c              \
@@ -1041,7 +1139,6 @@ if SETUID_INSTALL
 install-exec-hook:
        -chmod +s $(DESTDIR)$(bindir)/ethereal
        -chmod +s $(DESTDIR)$(bindir)/tethereal
-       -chmod +s $(DESTDIR)$(bindir)/ethereal_static
 else
 install-exec-hook:
 endif
@@ -1064,13 +1161,7 @@ endif
 #dist-hook:
 #      @rm -f $(distdir)/register.c
 
-# Hack around the problem that I haven't found a way to include an
-# empty directroy in the distribution tarball.
-dist-hook:
-       mkdir -p aclocal-missing
-
-DIST_SUBDIRS = tools wiretap doc epan plugins packaging \
-       gtk gtk2
+DIST_SUBDIRS = tools wiretap doc epan plugins packaging gtk
 
 if HAVE_PLUGINS
 SUBDIRS = tools wiretap doc epan plugins packaging @ethereal_SUBDIRS@
@@ -1161,3 +1252,12 @@ debian-package: debian/rules
 
 clean-local:
        rm -rf $(top_stagedir)
+
+test-splint: $(ethereal_SOURCES)
+       splint \
+               -gnu-extensions -D_U_=""        \
+               -I. `glib-config --cflags` \
+               -I./epan \
+               -I./tools/lemon \
+               -I./wiretap     \
+               $(ethereal_SOURCES)