Update Lua.

[obnox/wireshark/wip.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 45544e7c6ee82f65bee896cc36aa34a45c569b2d..b2adcb3ce5b1da3d504bf7949439874b6a209409 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -268,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
@@ -544,7 +544,6 @@ EXTRA_DIST = \
        doc/README.regression   \
        doc/README.stats_tree   \
        doc/README.tapping      \
-       doc/README.tvbuff       \
        doc/README.xml-output   \
        doc/capinfos.pod                \
        doc/dfilter2pod.pl      \
@@ -565,8 +564,6 @@ EXTRA_DIST = \
        ethereal_be.py          \
        ethereal_gen.py         \
        ethereal.desktop        \
-       getopt.c                \
-       getopt.h                \
        idl2eth.sh              \
        image/Ethereal.icns     \
        image/Makefile.nmake    \
@@ -683,14 +680,11 @@ EXTRA_DIST = \
        text2pcap-scanner.l     \
        text2pcap.c             \
        text2pcap.h             \
-       wka.tmpl \
-       template-init.lua \
-       make-init-lua.pl \
-       init.lua
+       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:
@@ -837,15 +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)
-
-init.lua: template-init.lua make-init-lua.pl epan/ftypes/ftypes.h wiretap/wtap.h
-       $(PERL) make-init-lua.pl template-init.lua > init.lua
-