Update Lua.
[obnox/wireshark/wip.git] / Makefile.am
index 130b9e82b4ab38e4d3869b39a35fb1d4681becb4..b2adcb3ce5b1da3d504bf7949439874b6a209409 100644 (file)
@@ -60,14 +60,14 @@ 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@ @capinfos_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@ @dumpcap_bin@
 bin_SCRIPTS = @idl2eth_bin@
-man1_MANS = @ethereal_man@ @capinfos_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@ @dumpcap_man@ @idl2eth_man@
 man4_MANS = @etherealfilter_man@
 man_MANS =
 
 EXTRA_PROGRAMS = ethereal tethereal capinfos editcap mergecap dftest \
-       randpkt text2pcap
+       randpkt text2pcap dumpcap
 EXTRA_SCRIPTS = idl2eth
 
 #
@@ -75,7 +75,7 @@ EXTRA_SCRIPTS = idl2eth
 #
 pkgdata_DATA = AUTHORS-SHORT manuf ethereal.html tethereal.html \
        ethereal-filter.html capinfos.html editcap.html \
-       idl2eth.html mergecap.html text2pcap.html \
+       idl2eth.html mergecap.html text2pcap.html dumpcap.html \
        cfilters colorfilters dfilters
 
 #
@@ -83,14 +83,108 @@ pkgdata_DATA = AUTHORS-SHORT manuf ethereal.html tethereal.html \
 # of that directory.
 #
 diameterdir = $(pkgdatadir)/diameter
-diameter_DATA = dictionary.dtd dictionary.xml imscxdx.xml mobileipv4.xml \
-       nasreq.xml sunping.xml
+diameter_DATA = \
+       diameter/chargecontrol.xml \
+       diameter/dictionary.dtd \
+       diameter/dictionary.xml \
+       diameter/imscxdx.xml \
+       diameter/mobileipv4.xml \
+       diameter/nasreq.xml \
+       diameter/sunping.xml \
+       diameter/TGPPSh.xml
 
-PLATFORM_SRC = pcap-util-unix.c
+#
+# 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 = capture-pcap-util-unix.c
 
 include Makefile.common
 
 if HAVE_PLUGINS
+
+if HAVE_LIBLUA
+lua_lib = plugins/lua/lua.la
+else           # HAVE_LIBLUA
+lua_lib =
+endif          # HAVE_LIBLUA
+
 plugin_libs = \
        plugins/acn/acn.la \
        plugins/agentx/agentx.la \
@@ -103,7 +197,9 @@ plugin_libs = \
        plugins/giop/coseventcomm.la \
        plugins/gryphon/gryphon.la \
        plugins/irda/irda.la \
+       $(lua_lib) \
        plugins/lwres/lwres.la \
+       plugins/mate/mate.la \
        plugins/megaco/megaco.la \
        plugins/mgcp/mgcp.la \
        plugins/opsi/opsi.la \
@@ -113,59 +209,20 @@ plugin_libs = \
        plugins/rlm/rlm.la \
        plugins/rtnet/rtnet.la \
        plugins/rudp/rudp.la \
+       plugins/stats_tree/stats_tree.la \
        plugins/v5ua/v5ua.la
 
 if ENABLE_STATIC
 plugin_ldadd = $(plugin_libs)
 
-dummyddd = \
-       plugins/acn/packet-acn.o \
-       plugins/agentx/packet-agentx.o \
-       plugins/artnet/packet-artnet.o \
-       plugins/asn1/packet-asn1.o \
-       plugins/ciscosm/packet-sm.o \
-       plugins/docsis/packet-bpkmattr.o \
-       plugins/docsis/packet-bpkmreq.o \
-       plugins/docsis/packet-bpkmrsp.o \
-       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/irda/packet-ircomm.o \
-       plugins/irda/packet-sir.o \
-       plugins/lwres/packet-lwres.o \
-       plugins/megaco/packet-megaco.o \
-       plugins/mgcp/packet-mgcp.o \
-       plugins/opsi/packet-opsi.o \
-       plugins/pcli/packet-pcli.o \
-       plugins/rdm/packet-rdm.o \
-       plugins/rlm/packet-rlm.o \
-       plugins/rtnet/packet-rtnet.o \
-       plugins/rudp/packet-rudp.o \
-       plugins/v5ua/packet-v5ua.o
-
 else           # ENABLE_STATIC
+
+if HAVE_LIBLUA
+lua_ldadd = "-dlopen" plugins/lua/lua.la
+else           # HAVE_LIBLUA
+lua_ldadd =
+endif          # HAVE_LIBLUA
+
 plugin_ldadd = \
        "-dlopen" self  \
        "-dlopen" plugins/acn/acn.la \
@@ -178,8 +235,11 @@ plugin_ldadd = \
        "-dlopen" plugins/giop/cosnaming.la \
        "-dlopen" plugins/giop/coseventcomm.la \
        "-dlopen" plugins/gryphon/gryphon.la \
+       "-dlopen" plugins/h223/h223.la \
        "-dlopen" plugins/irda/irda.la \
+       $(lua_ldadd) \
        "-dlopen" plugins/lwres/lwres.la \
+       "-dlopen" plugins/mate/mate.la \
        "-dlopen" plugins/megaco/megaco.la \
        "-dlopen" plugins/mgcp/mgcp.la \
        "-dlopen" plugins/opsi/opsi.la \
@@ -189,6 +249,7 @@ plugin_ldadd = \
        "-dlopen" plugins/rlm/rlm.la \
        "-dlopen" plugins/rtnet/rtnet.la \
        "-dlopen" plugins/rudp/rudp.la \
+       "-dlopen" plugins/stats_tree/stats_tree.la \
        "-dlopen" plugins/v5ua/v5ua.la
 
 endif          # ENABLE_STATIC
@@ -207,7 +268,7 @@ endif               # HAVE_PLUGINS
 # we should probably split this into stuff needed both
 # by ethereal and tethereal and stuff needed only by one or the
 # other.
-ethereal_optional_objects = @SNPRINTF_O@ @STRERROR_O@ \
+ethereal_optional_objects = @GETOPT_O@ @SNPRINTF_O@ @STRERROR_O@ \
        @STRCASECMP_O@ @STRNCASECMP_O@ @MKSTEMP_O@ @STRPTIME_O@
 
 # Additional libs that I know how to build. These will be
@@ -243,7 +304,8 @@ ethereal_LDADD = \
        @SNMP_LIBS@ @SSL_LIBS@          \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
-       @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@
+       @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@ \
+       @LIBGNUTLS_LIBS@
 
 # Additional libs that I know how to build. These will be
 # linked into the tethereal executable.
@@ -265,7 +327,8 @@ tethereal_LDADD = \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
-       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@
+       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+       @LIBGNUTLS_LIBS@
 
 if ENABLE_STATIC
 tethereal_LDFLAGS = -Wl,-static -all-static
@@ -333,7 +396,7 @@ SUFFIXES = .sh
 #
 # 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.
 #
@@ -347,7 +410,7 @@ SUFFIXES = .sh
 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
 
@@ -377,14 +440,26 @@ dftest_DEPENDENCIES = \
 dftest_LDADD = \
        $(ethereal_optional_objects)    \
        $(dftest_additional_libs)       \
-       @SNMP_LIBS@ @SSL_LIBS@          \
+       @SNMP_LIBS@ @SSL_LIBS@          \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
        @GLIB_LIBS@ -lm                 \
-       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@
+       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+       @LIBGNUTLS_LIBS@
 
 dftest_LDFLAGS = -export-dynamic
 
+dumpcap_additional_libs = \
+       wiretap/libwiretap.la
+
+dumpcap_DEPENDENCIES = \
+       $(dumpcap_additional_libs)
+
+dumpcap_LDADD = \
+       $(dumpcap_additional_libs)      \
+       @GLIB_LIBS@                     \
+       @PCAP_LIBS@
+
 #
 # XXX - "svnversion.h" is distributed in the release tarball; should
 # we be deleting it with "make clean", or should we only do that with
@@ -394,7 +469,8 @@ CLEANFILES =                \
        svnversion.h    \
        @rdps_bin@      \
        idl2eth         \
-       *~
+       *~              \
+       vgcore.pid*
 
 #
 # XXX - "ps.c" is distributed in the source tarballs; why is it in the
@@ -407,11 +483,19 @@ DISTCLEANFILES = \
        ps.c
 
 MAINTAINERCLEANFILES =         \
-       $(GENERATED_FILES)
+       $(GENERATED_FILES)      \
+       Makefile.in             \
+       aclocal.m4              \
+       config.h.in             \
+       configure               \
+       depcomp                 \
+       install-sh              \
+       ltmain.sh               \
+       missing
 
 EXTRA_DIST = \
        FAQ                     \
-       INSTALL.configure       \
+       INSTALL.configure       \
        Makefile.common         \
        Makefile.nmake          \
        README.aix              \
@@ -434,8 +518,7 @@ EXTRA_DIST = \
        capture-wpcap.h         \
        capture_wpcap_packet.c  \
        capture_wpcap_packet.h  \
-       cfilters                        \
-       cleanbld.bat            \
+       cfilters                \
        colorfilters            \
        config.h.win32          \
        config.nmake            \
@@ -449,19 +532,18 @@ EXTRA_DIST = \
        debian/postinst         \
        debian/prerm            \
        debian/rules            \
-       dfilters                        \
-       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.malloc       \
+       doc/README.plugins      \
        doc/README.regression   \
+       doc/README.stats_tree   \
        doc/README.tapping      \
-       doc/README.tvbuff       \
        doc/README.xml-output   \
        doc/capinfos.pod                \
        doc/dfilter2pod.pl      \
@@ -473,15 +555,15 @@ EXTRA_DIST = \
        doc/randpkt.txt         \
        doc/tethereal.pod       \
        doc/text2pcap.pod       \
+       doc/dumpcap.pod \
        docbook/Makefile.auto.am        \
        doxygen.cfg.in          \
+       dumpcap.c       \
        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    \
@@ -490,13 +572,18 @@ EXTRA_DIST = \
        image/clist_ascend.xpm  \
        image/clist_descend.xpm \
        image/dn_arrow.xpm      \
+       image/dumpcap.rc.in     \
        image/editcap.rc.in     \
        image/eexcl3d64.xpm     \
        image/eicon3d16.xpm     \
        image/eicon3d32.xpm     \
        image/eicon3d48.xpm     \
        image/eicon3d64.xpm     \
+       image/eiconcap16.xpm    \
+       image/eiconcap32.xpm    \
+       image/eiconcap48.xpm    \
        image/elogo3d48x48.png  \
+       image/ethereal.exe.manifest.in \
        image/ethereal.ico      \
        image/ethereal.rc.in    \
        image/ethereal48x48-trans.png  \
@@ -517,6 +604,7 @@ EXTRA_DIST = \
        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/autoscroll_24.xpm \
@@ -572,31 +660,31 @@ EXTRA_DIST = \
        image/icon_layout_4.xpm \
        image/icon_layout_5.xpm \
        image/icon_layout_6.xpm \
+       image/win32-file-dlg.rc \
        image/wiretap.rc.in     \
-       imscxdx.xml             \
        make-authors-format.pl  \
        make-authors-short.pl   \
        make-manuf              \
        make-tapreg-dotc        \
        make-version.pl         \
-       manuf                   \
+       manuf                   \
        manuf.tmpl              \
        mergecap.c              \
-       mobileipv4.xml          \
-       nasreq.xml              \
        perlnoutf.pl            \
-       print.ps                \
+       print.ps                \
+       $(diameter_DATA)        \
+       $(dtds_DATA)            \
+       $(radius_DATA)          \
        randpkt.c               \
        rdps.c                  \
-       sunping.xml             \
-       text2pcap-scanner.l     \
-       text2pcap.c             \
-       text2pcap.h             \
+       text2pcap-scanner.l     \
+       text2pcap.c             \
+       text2pcap.h             \
        wka.tmpl
 
 if SETUID_INSTALL
 install-exec-hook:
-       -chmod +s $(DESTDIR)$(bindir)/ethereal
+       -chmod +s $(DESTDIR)$(bindir)/dumpcap
        -chmod +s $(DESTDIR)$(bindir)/tethereal
 else
 install-exec-hook:
@@ -642,6 +730,10 @@ text2pcap.1: doc/text2pcap.pod
        (cd doc ; \
        $(MAKE) ../text2pcap.1 )
 
+dumpcap.1: doc/dumpcap.pod
+       (cd doc ; \
+       $(MAKE) ../dumpcap.1 )
+
 ethereal.html: doc/ethereal.pod AUTHORS-SHORT-FORMAT
        (cd doc ; \
        $(MAKE) ../ethereal.html )
@@ -674,6 +766,10 @@ text2pcap.html: doc/text2pcap.pod
        (cd doc ; \
        $(MAKE) ../text2pcap.html )
 
+dumpcap.html: doc/dumpcap.pod
+       (cd doc ; \
+       $(MAKE) ../dumpcap.html )
+
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
@@ -706,6 +802,8 @@ 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 .. ; \
                rpmbuild --define "_topdir `cd . && pwd`" -bb SPECS/ethereal.spec && \
                        echo "Package successfully built in `pwd`/RPMS." ; \
@@ -718,6 +816,8 @@ 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 .. ; \
                rpmbuild --define "_topdir `cd . && pwd`" -bs SPECS/ethereal.spec && \
                        echo "Package successfully built in `pwd`/SRPMS." ; \
@@ -731,11 +831,3 @@ 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)