New protocol: Stub dissector for ClearCase NFS protocol
[metze/wireshark/wip.git] / Makefile.am
index d96fdbd0d4786364c2e2f79e2a6d0fb5f7ea9859..3c90558bfa3395f1b37968304fa0d4a8d35ce3e8 100644 (file)
@@ -1,22 +1,22 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.433 2002/05/23 23:37:48 guy Exp $
+# $Id: Makefile.am,v 1.521 2002/11/15 22:45:52 sahlberg Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
 # Copyright 1998 Gerald Combs
-# 
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -63,12 +63,22 @@ ACLOCAL_AMFLAGS = `./aclocal-flags`
 bin_PROGRAMS = @ethereal_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@
-man_MANS = 
+man_MANS =
 
 EXTRA_PROGRAMS = ethereal ethereal_static tethereal tethereal_static editcap mergecap dftest text2pcap
 EXTRA_SCRIPTS = idl2eth
 
-sysconf_DATA = manuf dictionary.dtd dictionary.xml mobileipv4.xml \
+#
+# Install "manuf" in the directory for Ethereal configuration files.
+#
+sysconf_DATA = manuf
+
+#
+# Install the Diameter DTD and XML files in the "diameter" subdirectory
+# of that directory.
+#
+diameterdir = $(sysconfdir)/diameter
+diameter_DATA = dictionary.dtd dictionary.xml mobileipv4.xml \
        nasreq.xml sunping.xml
 
 DISSECTOR_SRC = \
@@ -76,7 +86,10 @@ DISSECTOR_SRC = \
        packet-afp.c   \
        packet-afs.c   \
        packet-aim.c   \
+       packet-ajp13.c          \
        packet-aodv.c  \
+       packet-aodv6.c \
+       packet-arcnet.c \
        packet-arp.c   \
        packet-asap.c  \
        packet-ascend.c\
@@ -94,28 +107,63 @@ DISSECTOR_SRC = \
        packet-cdp.c   \
        packet-cgmp.c  \
        packet-chdlc.c  \
+       packet-clearcase.c  \
        packet-clip.c  \
        packet-clnp.c  \
        packet-cops.c  \
+       packet-cosine.c  \
+       packet-cpha.c  \
        packet-cups.c  \
        packet-data.c  \
        packet-dccp.c \
        packet-dcerpc.c  \
+       packet-dcerpc-afs4int.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  \
+       packet-dcerpc-rs_attr.c  \
+       packet-dcerpc-rs_misc.c  \
+       packet-dcerpc-rs_pgo.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-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 \
@@ -132,13 +180,16 @@ DISSECTOR_SRC = \
        packet-eth.c   \
        packet-ethertype.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-gre.c   \
+       packet-gssapi.c \
        packet-gtp.c   \
        packet-gvrp.c  \
        packet-h1.c    \
@@ -146,7 +197,9 @@ DISSECTOR_SRC = \
        packet-hclnfsd.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   \
@@ -164,6 +217,7 @@ DISSECTOR_SRC = \
        packet-irc.c   \
        packet-isakmp.c\
        packet-iscsi.c \
+       packet-isdn.c \
        packet-isis.c  \
        packet-isis-clv.c \
        packet-isis-hello.c \
@@ -205,13 +259,16 @@ DISSECTOR_SRC = \
        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-nntp.c  \
+       packet-ntlmssp.c  \
        packet-ntp.c  \
        packet-null.c  \
        packet-osi.c   \
@@ -231,16 +288,18 @@ DISSECTOR_SRC = \
        packet-q931.c  \
        packet-qllc.c  \
        packet-quake.c \
-       packet-quakeworld.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-rmi.c \
        packet-rpc.c   \
+       packet-rpl.c   \
        packet-rquota.c \
        packet-rsh.c   \
        packet-rstat.c \
@@ -253,6 +312,7 @@ DISSECTOR_SRC = \
        packet-sadmind.c \
        packet-sap.c   \
        packet-sccp.c  \
+       packet-sccpmg.c  \
        packet-scsi.c  \
        packet-sctp.c  \
        packet-sdp.c   \
@@ -260,6 +320,7 @@ DISSECTOR_SRC = \
        packet-skinny.c   \
        packet-slimp3.c   \
        packet-sll.c   \
+       packet-slowprotocols.c \
        packet-smb.c   \
        packet-smb-browse.c \
        packet-smb-common.c \
@@ -272,6 +333,7 @@ DISSECTOR_SRC = \
        packet-snaeth.c \
        packet-snmp.c   \
        packet-socks.c \
+       packet-spnego.c \
        packet-spray.c \
        packet-srvloc.c \
        packet-sscop.c \
@@ -282,6 +344,7 @@ DISSECTOR_SRC = \
        packet-syslog.c \
        packet-tacacs.c \
        packet-tcp.c   \
+       packet-tds.c   \
        packet-telnet.c\
        packet-tftp.c  \
        packet-time.c  \
@@ -298,17 +361,19 @@ DISSECTOR_SRC = \
        packet-vlan.c \
        packet-vrrp.c \
        packet-vtp.c  \
+       packet-wap.c \
        packet-wccp.c \
        packet-wcp.c \
        packet-who.c  \
-       packet-wap.c \
-       packet-wtls.c \
+       packet-wlancap.c \
        packet-wsp.c \
+       packet-wtls.c \
        packet-wtp.c \
        packet-x11.c   \
        packet-x25.c   \
        packet-xdmcp.c \
        packet-xot.c   \
+       packet-xyplex.c   \
        packet-yhoo.c  \
        packet-ypbind.c \
        packet-yppasswd.c \
@@ -318,29 +383,81 @@ DISSECTOR_SRC = \
 
 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 \
-       plugins/giop/packet-cosnaming.c \
-       plugins/giop/packet-coseventcomm.c
+       plugins/pcli/packet-pcli.c
 
 plugin_static_ldadd = \
-       plugins/gryphon/packet-gryphon-static.o         \
-       plugins/mgcp/packet-mgcp-static.o               \
-       plugins/giop/packet-cosnaming-static.o          \
-       plugins/giop/packet-coseventcomm-static.o
+       plugins/docsis/packet-bpkmattr-static.o \
+       plugins/docsis/packet-bpkmreq-static.o \
+       plugins/docsis/packet-bpkmrsp-static.o \
+       plugins/docsis/packet-docsis-static.o \
+       plugins/docsis/packet-dsaack-static.o \
+       plugins/docsis/packet-dsareq-static.o \
+       plugins/docsis/packet-dsarsp-static.o \
+       plugins/docsis/packet-dscack-static.o \
+       plugins/docsis/packet-dscreq-static.o \
+       plugins/docsis/packet-dscrsp-static.o \
+       plugins/docsis/packet-dsdreq-static.o \
+       plugins/docsis/packet-dsdrsp-static.o \
+       plugins/docsis/packet-macmgmt-static.o \
+       plugins/docsis/packet-map-static.o \
+       plugins/docsis/packet-regack-static.o \
+       plugins/docsis/packet-regreq-static.o \
+       plugins/docsis/packet-regrsp-static.o \
+       plugins/docsis/packet-rngreq-static.o \
+       plugins/docsis/packet-rngrsp-static.o \
+       plugins/docsis/packet-tlv-static.o \
+       plugins/docsis/packet-uccreq-static.o \
+       plugins/docsis/packet-uccrsp-static.o \
+       plugins/docsis/packet-ucd-static.o \
+       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/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 \
-       plugins/giop/cosnaming.la \
-       plugins/giop/coseventcomm.la
+       plugins/pcli/pcli.la
 
 plugin_ldadd = \
        "-dlopen" self  \
+       "-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 \
-       "-dlopen" plugins/giop/cosnaming.la \
-       "-dlopen" plugins/giop/coseventcomm.la
+       "-dlopen" plugins/pcli/pcli.la
 else
 plugin_src =
 
@@ -353,28 +470,35 @@ endif
 
 noinst_HEADERS = \
        packet-afp.h   \
-       packet-afs.h   \
+       packet-afs-defs.h \
        packet-afs-macros.h \
        packet-afs-register-info.h \
-       packet-afs-defs.h \
+       packet-afs.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.h \
+       packet-dcerpc-browser.h \
+       packet-dcerpc-dce122.h \
        packet-dcerpc-dfs.h \
+       packet-dcerpc-dnsserver.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-tapi.h \
        packet-dcerpc-wkssvc.h \
+       packet-dcerpc.h \
        packet-ddtp.h  \
        packet-diameter-defs.h \
        packet-dns.h   \
@@ -385,6 +509,8 @@ noinst_HEADERS = \
        packet-frame.h  \
        packet-giop.h  \
        packet-gnutella.h \
+       packet-gssapi.h \
+       packet-gtp.h    \
        packet-hclnfsd.h  \
        packet-http.h  \
        packet-ieee80211.h \
@@ -394,12 +520,13 @@ noinst_HEADERS = \
        packet-ipsec.h \
        packet-ipv6.h  \
        packet-ipx.h   \
-       packet-isis.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   \
@@ -408,14 +535,15 @@ noinst_HEADERS = \
        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.h   \
        packet-osi-options.h \
+       packet-osi.h   \
        packet-pcnfsd.h \
        packet-pflog.h \
        packet-pim.h   \
@@ -425,6 +553,7 @@ noinst_HEADERS = \
        packet-q931.h  \
        packet-raw.h   \
        packet-ripng.h \
+       packet-rmi.h   \
        packet-rpc.h   \
        packet-rquota.h \
        packet-rsvp.h  \
@@ -442,8 +571,8 @@ noinst_HEADERS = \
        packet-sna.h   \
        packet-snmp.h   \
        packet-spray.h \
-       packet-stat.h   \
        packet-stat-notify.h \
+       packet-stat.h   \
        packet-tcp.h   \
        packet-tns.h \
        packet-tpkt.h  \
@@ -451,34 +580,38 @@ noinst_HEADERS = \
        packet-udp.h   \
        packet-vines.h \
        packet-vlan.h \
-       packet-wccp.h \
        packet-wap.h \
+       packet-wccp.h \
+       packet-wsp.h \
        packet-wtls.h \
        packet-wtp.h \
-       packet-wsp.h \
        packet-x11-keysym.h     \
        packet-yhoo.h  \
        packet-ypbind.h \
        packet-yppasswd.h \
        packet-ypserv.h \
-       packet-ypxfr.h 
+       packet-ypxfr.h
 
 ETHEREAL_COMMON_SRC = \
-       aftypes.h      \
-       alignment.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         \
+       color.h        \
        column.c       \
        column.h       \
-       color.h        \
        conditions.c   \
        conditions.h   \
-       capture_stop_conditions.h   \
-       capture_stop_conditions.c   \
        etypes.h       \
+       file.h         \
        follow.c       \
        follow.h       \
        format-oid.h   \
@@ -493,9 +626,9 @@ ETHEREAL_COMMON_SRC = \
        pcap-util.c    \
        pcap-util.h    \
        ppptypes.h     \
+       prefs-int.h    \
        prefs.c        \
        prefs.h        \
-       prefs-int.h    \
        print.c        \
        print.h        \
        ps.c           \
@@ -509,6 +642,8 @@ ETHEREAL_COMMON_SRC = \
        ringbuffer.h   \
        rpc_defrag.h   \
        smb.h          \
+       tap.c           \
+       tap.h           \
        util.c         \
        util.h         \
        x11-declarations.h \
@@ -530,7 +665,6 @@ ethereal_SOURCES = \
        capture.c      \
        capture.h      \
        file.c         \
-       file.h         \
        filters.c      \
        filters.h      \
        globals.h      \
@@ -551,7 +685,6 @@ ethereal_static_SOURCES = \
        capture.c      \
        capture.h      \
        file.c         \
-       file.h         \
        filters.c      \
        filters.h      \
        globals.h      \
@@ -563,7 +696,7 @@ ethereal_static_SOURCES = \
        statusbar.h    \
        summary.c      \
        summary.h      \
-       ui_util.h       
+       ui_util.h
 
 EXTRA_ethereal_SOURCES = \
        snprintf.c      \
@@ -628,20 +761,32 @@ ethereal_static_LDADD = \
        $(ethereal_optional_objects)    \
        $(ethereal_additional_libs)     \
        @SNMP_LIBS@ @SSL_LIBS@          \
-       @PCAP_LIBS@ @GTK_LIBS@          
+       @PCAP_LIBS@ @GTK_LIBS@
 
 ethereal_LDFLAGS = -export-dynamic
 ethereal_static_LDFLAGS = -Wl,-static
 
+TETHEREAL_TAP_SRC = \
+       tap-dcerpcstat.c        \
+       tap-iostat.c            \
+       tap-protocolinfo.c      \
+       tap-protohierstat.c     \
+       tap-rpcstat.c           \
+       tap-rpcprogs.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) \
+       $(TETHEREAL_TAP_SRC) \
+       tethereal-tap-register.c \
        register-static.c     \
        tethereal.c
 
@@ -661,7 +806,7 @@ tethereal_DEPENDENCIES = \
 
 tethereal_static_DEPENDENCIES = \
        $(ethereal_optional_objects)    \
-       $(tethereal_additional_libs)    
+       $(tethereal_additional_libs)
 
 # This automake variable adds to the link-line for the executable
 tethereal_LDADD = wiretap/libwiretap.a \
@@ -693,7 +838,8 @@ 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)
+text2pcap_LDADD = $(text2pcap_optional_objects) \
+       @GLIB_LIBS@ -lm
 
 mergecap_SOURCES = mergecap.c
 mergecap_DEPENDENCIES = wiretap/libwiretap.a
@@ -745,7 +891,8 @@ 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
@@ -756,6 +903,24 @@ 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
 
@@ -801,6 +966,7 @@ CLEANFILES =        \
        idl2eth
 
 DISTCLEANFILES =       \
+       aclocal-missing/*.m4 \
        register.c      \
        register-static.c \
        rdps            \
@@ -809,7 +975,24 @@ DISTCLEANFILES =   \
 
 EXTRA_DIST = \
        Ethereal.desktop        \
+       FAQ                     \
+       INSTALL.configure       \
+       Makefile.nmake          \
+       README.aix              \
+       README.bsd              \
+       README.hpux             \
+       README.irix             \
+       README.linux            \
+       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           \
+       autogen.sh              \
        capture-wpcap.c         \
        capture-wpcap.h         \
        cleanbld.bat            \
@@ -825,6 +1008,8 @@ EXTRA_DIST = \
        debian/postinst         \
        debian/prerm            \
        debian/rules            \
+       dictionary.dtd          \
+       dictionary.xml          \
        doc/Makefile.am         \
        doc/Makefile.nmake      \
        doc/README.design       \
@@ -844,10 +1029,6 @@ EXTRA_DIST = \
        editcap.c               \
        ethereal_be.py          \
        ethereal_gen.py         \
-       mergecap.c              \
-       text2pcap.c             \
-       text2pcap.h             \
-       text2pcap-scanner.l     \
        getopt.c                \
        getopt.h                \
        idl2eth.sh              \
@@ -876,36 +1057,30 @@ EXTRA_DIST = \
        image/lo32-app-ethereal.png     \
        image/lo48-app-ethereal.png     \
        image/mergecap.rc.in    \
+       image/nsis-checked.bmp  \
+       image/nsis-unchecked.bmp        \
        image/tethereal.rc.in   \
        image/text2pcap.rc.in   \
        image/up_arrow.xpm      \
-       INSTALL.configure       \
-       Makefile.nmake          \
        make-manuf              \
        make-reg-dotc           \
        make-reg-dotc.py        \
        manuf                   \
        manuf.tmpl              \
+       mergecap.c              \
+       mobileipv4.xml          \
+       nasreq.xml              \
        ncp2222.py              \
        packet-ncp2222.inc      \
        print.ps                \
        process-x11-fields.pl   \
-       README.aix              \
-       README.bsd              \
-       README.hpux             \
-       README.irix             \
-       README.linux            \
-       README.tru64            \
-       README.vmware           \
-       README.win32            \
        randpkt.c               \
        rdps.c                  \
-       TODO                    \
-       dictionary.dtd          \
-       dictionary.xml          \
-       mobileipv4.xml          \
-       nasreq.xml              \
        sunping.xml             \
+       text2pcap-scanner.l     \
+       text2pcap.c             \
+       text2pcap.h             \
+       wka.tmpl                \
        x11-fields
 
 if SETUID_INSTALL
@@ -935,6 +1110,13 @@ 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
+
 if HAVE_PLUGINS
 SUBDIRS = tools wiretap doc epan plugins packaging @ethereal_SUBDIRS@
 else
@@ -980,7 +1162,7 @@ host_os=@host_os@
 svr4-package: $(bin_SCRIPTS) $(lib_LTLIBRARIES)
        if test x$(HAVE_SVR4_PACKAGING) = xyes ; then \
                rm -rf $(stagedir) ; \
-               $(MAKE) DESTDIR=$(stagedir) install-strip; \
+               $(MAKE) DESTDIR=$(stagedir) install; \
                $(srcdir)/packaging/svr4/mkpkg \
                        $(PACKAGE) \
                        $(PACKAGE)-$(VERSION)-$(host_os)-$(host_cpu)-local \
@@ -997,7 +1179,7 @@ rpm_topdir=`cd $(top_srcdir) && pwd`/packaging/rpm
 rpm-package: dist
        if test x$(HAVE_RPM) = xyes ; then \
                cd $(rpm_topdir) ; \
-               mkdir BUILD RPMS SOURCES ; \
+               mkdir -p BUILD RPMS SOURCES ; \
                cd SOURCES ; \
                ln -s ../../../$(distdir).tar.gz ; \
                cd .. ; \
@@ -1009,7 +1191,7 @@ rpm-package: dist
 srpm-package: dist
        if test x$(HAVE_RPM) = xyes ; then \
                cd $(rpm_topdir) ; \
-               mkdir BUILD SRPMS SOURCES ; \
+               mkdir -p BUILD SRPMS SOURCES ; \
                cd SOURCES ; \
                ln -s ../../../$(distdir).tar.gz ; \
                cd .. ; \