Give the code that computes protocol statistics a progress dialog box,
[obnox/wireshark/wip.git] / Makefile.am
index 0446014462da646ef05d210fff1225c0cd8e6050..ae71558054b472b8835698345cb96a08965fcb02 100644 (file)
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.280 2001/01/28 04:43:24 guy Exp $
+# $Id: Makefile.am,v 1.296 2001/03/24 02:07:20 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -61,11 +61,11 @@ 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@ @tethereal_bin@
+bin_PROGRAMS = @ethereal_bin@ @editcap_bin@ @tethereal_bin@ @dftest_bin@ @randpkt_bin@
 man1_MANS = @ethereal_man@ @editcap_man@ @tethereal_man@
 man_MANS = 
 
-EXTRA_PROGRAMS = ethereal ethereal_static tethereal tethereal_static editcap
+EXTRA_PROGRAMS = ethereal ethereal_static tethereal tethereal_static editcap dftest
 
 sysconf_DATA = manuf
 
@@ -85,10 +85,13 @@ DISSECTOR_SOURCES = \
        packet-bxxp.c \
        packet-cdp.c   \
        packet-cgmp.c  \
+       packet-chdlc.c  \
        packet-clip.c  \
        packet-clnp.c  \
        packet-cops.c  \
+       packet-cups.c  \
        packet-data.c  \
+       packet-dcerpc.c  \
        packet-ddtp.c  \
        packet-dec-bpdu.c \
        packet-diameter.c \
@@ -121,6 +124,7 @@ DISSECTOR_SOURCES = \
        packet-ipx.c   \
        packet-irc.c   \
        packet-ieee80211.c \
+       packet-ieee8023.c \
        packet-isakmp.c\
        packet-isis.c  \
        packet-isis-clv.c \
@@ -137,6 +141,7 @@ DISSECTOR_SOURCES = \
        packet-ldap.c  \
        packet-ldp.c   \
        packet-llc.c   \
+       packet-lmi.c   \
        packet-lpd.c   \
        packet-m3ua.c  \
        packet-mapi.c  \
@@ -172,6 +177,7 @@ DISSECTOR_SOURCES = \
        packet-ripng.c \
        packet-rlogin.c \
        packet-rpc.c   \
+       packet-rquota.c \
        packet-rsh.c   \
        packet-rsvp.c  \
        packet-rtcp.c  \
@@ -196,6 +202,7 @@ DISSECTOR_SOURCES = \
        packet-srvloc.c \
        packet-sscop.c \
        packet-stat.c   \
+       packet-stat-notify.c \
        packet-sual.c   \
        packet-syslog.c \
        packet-tacacs.c \
@@ -214,7 +221,10 @@ DISSECTOR_SOURCES = \
        packet-vrrp.c \
        packet-vtp.c  \
        packet-wccp.c \
+       packet-wcp.c \
        packet-who.c  \
+       packet-wap.c \
+       packet-wtls.c \
        packet-wsp.c \
        packet-wtp.c \
        packet-x11.c   \
@@ -235,9 +245,9 @@ noinst_HEADERS = \
        packet-atalk.h \
        packet-bgp.h   \
        packet-bootparams.h \
+       packet-chdlc.h \
        packet-clip.h  \
        packet-ddtp.h  \
-       packet-diameter.h \
        packet-diameter-defs.h \
        packet-dns.h   \
        packet-esis.h  \
@@ -249,6 +259,7 @@ noinst_HEADERS = \
        packet-hclnfsd.h  \
        packet-http.h  \
        packet-ieee80211.h \
+       packet-ieee8023.h \
        packet-ip.h    \
        packet-ipsec.h \
        packet-ipv6.h  \
@@ -277,16 +288,22 @@ noinst_HEADERS = \
        packet-raw.h   \
        packet-ripng.h \
        packet-rpc.h   \
+       packet-rquota.h \
        packet-rtcp.h  \
        packet-rtp.h   \
        packet-rx.h  \
        packet-sll.h   \
        packet-smb.h   \
+       packet-smb-browse.h \
        packet-smb-common.h \
+       packet-smb-logon.h \
+       packet-smb-mailslot.h \
+       packet-smb-pipe.h \
        packet-sna.h   \
        packet-snmp.h   \
        packet-sscop.h \
        packet-stat.h   \
+       packet-stat-notify.h \
        packet-tcp.h   \
        packet-tns.h \
        packet-tpkt.h  \
@@ -294,14 +311,14 @@ noinst_HEADERS = \
        packet-udp.h   \
        packet-vines.h \
        packet-vlan.h \
-       packet-wap.h \
        packet-wccp.h \
-       packet-wsp.h \
+       packet-wap.h \
+       packet-wtls.h \
        packet-wtp.h \
+       packet-wsp.h \
        packet-x11-declarations.h       \
        packet-x11-register-info.h      \
        packet-x11-keysym.h     \
-       packet-x25.h   \
        packet-yhoo.h  \
        packet-ypbind.h \
        packet-ypserv.h \
@@ -356,6 +373,9 @@ ethereal_SOURCES = \
        filters.h      \
        globals.h      \
        menu.h         \
+       progress_dlg.h \
+       proto_hier_stats.h      \
+       proto_hier_stats.c      \
        simple_dialog.h \
        summary.c      \
        summary.h      \
@@ -388,7 +408,12 @@ 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
+ethereal_additional_libs = \
+       wiretap/libwiretap.a    \
+       gtk/libui.a             \
+       epan/libethereal.a      \
+       epan/ftypes/libftypes.a \
+       epan/dfilter/libdfilter.a
 
 # This is the automake dependency variable for the executable
 ethereal_DEPENDENCIES = \
@@ -411,15 +436,15 @@ ethereal_static_DEPENDENCIES = \
 ethereal_LDADD = \
        $(ethereal_optional_objects)    \
        $(ethereal_additional_libs)     \
-       @SNMP_LIBS@                     \
+       @SNMP_LIBS@ @SSL_LIBS@          \
        "-dlopen" self  \
        "-dlopen" plugins/gryphon/gryphon.la @PCAP_LIBS@ @GTK_LIBS@ \
        "-dlopen" plugins/mgcp/mgcp.la @PCAP_LIBS@ @GTK_LIBS@
 
 ethereal_static_LDADD = \
        $(ethereal_optional_objects)    \
-       $(ethereal_additional_libs) \
-       @SNMP_LIBS@                     \
+       $(ethereal_additional_libs)     \
+       @SNMP_LIBS@ @SSL_LIBS@          \
        @PCAP_LIBS@ @GTK_LIBS@
 
 ethereal_LDFLAGS = -export-dynamic
@@ -435,7 +460,11 @@ tethereal_static_SOURCES = \
 
 # 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
+tethereal_additional_libs =            \
+       wiretap/libwiretap.a            \
+       epan/libethereal.a              \
+       epan/ftypes/libftypes.a         \
+       epan/dfilter/libdfilter.a
 
 # This is the automake dependency variable for the executable
 tethereal_DEPENDENCIES = \
@@ -452,7 +481,7 @@ tethereal_static_DEPENDENCIES = \
 tethereal_LDADD = wiretap/libwiretap.a \
        $(ethereal_optional_objects)    \
        $(tethereal_additional_libs)    \
-       @SNMP_LIBS@                     \
+       @SNMP_LIBS@ @SSL_LIBS@          \
        "-dlopen" self  \
        "-dlopen" plugins/gryphon/gryphon.la @GLIB_LIBS@ -lm \
        "-dlopen" plugins/mgcp/mgcp.la @GLIB_LIBS@ -lm \
@@ -461,7 +490,7 @@ tethereal_LDADD = wiretap/libwiretap.a      \
 tethereal_static_LDADD = wiretap/libwiretap.a  \
        $(ethereal_optional_objects)    \
        $(tethereal_additional_libs)    \
-       @SNMP_LIBS@                     \
+       @SNMP_LIBS@ @SSL_LIBS@          \
        @GLIB_LIBS@ -lm \
        @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@
 
@@ -516,6 +545,35 @@ randpkt.o: randpkt.c
 randpkt: randpkt.o wiretap/libwiretap.a
        $(LINK) -o randpkt randpkt.o wiretap/libwiretap.a `glib-config --libs` -lz
 
+
+dftest_SOURCES = \
+       $(DISSECTOR_SOURCES) \
+       $(ETHEREAL_COMMON_SOURCES) \
+       dftest.c
+
+dftest_additional_libs =               \
+       epan/libethereal.a              \
+       epan/ftypes/libftypes.a         \
+       epan/dfilter/libdfilter.a
+
+dftest_DEPENDENCIES = \
+       $(ethereal_optional_objects)    \
+       $(dftest_additional_libs)       \
+       plugins/gryphon/gryphon.la \
+       plugins/mgcp/mgcp.la
+
+# This automake variable adds to the link-line for the executable
+dftest_LDADD = \
+       $(ethereal_optional_objects)    \
+       $(dftest_additional_libs)       \
+       @SNMP_LIBS@ @SSL_LIBS@          \
+       "-dlopen" self  \
+       "-dlopen" plugins/gryphon/gryphon.la @GLIB_LIBS@ -lm \
+       "-dlopen" plugins/mgcp/mgcp.la @GLIB_LIBS@ -lm \
+       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@
+
+dftest_LDFLAGS = -export-dynamic
+
 DISTCLEANFILES =       \
        register.c      \
        rdps            \
@@ -608,7 +666,7 @@ endif
 #dist-hook:
 #      @rm -f $(distdir)/register.c
 
-SUBDIRS = wiretap epan plugins packaging @ethereal_SUBDIRS@
+SUBDIRS = tools wiretap epan plugins packaging @ethereal_SUBDIRS@
 
 ethereal.1: ethereal doc/ethereal.pod.template
        (cd doc ; \