Trying to get buildbot Ubuntu-5.10-x86 distcheck to build again

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

diff --git a/epan/Makefile.am b/epan/Makefile.am
index 50c7edec4430a801865d2e9cf481f65bb5abb7ee..4e7aa40fa3bf1fa9dcb88c6e5c873aefad41a924 100644 (file)
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -22,7 +22,21 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-SUBDIRS = ftypes dfilter dissectors
+
+if HAVE_LIBLUA
+wslua_lib = wslua/libwslua.la
+wslua_dir = wslua
+wslua_dist_dir = 
+else            # HAVE_LIBLUA
+wslua_lib =
+wslua_dir =
+wslua_dist_dir = wslua
+endif           # HAVE_LIBLUA
+
+
+SUBDIRS = crypt ftypes dfilter dissectors $(wslua_dir)
+
+DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir)
 
 # EPAN will eventually be a shared library. While I move source code around,
 # however, it is an archive library.
@@ -30,11 +44,11 @@ SUBDIRS = ftypes dfilter dissectors
 ACLOCAL_AMFLAGS = `../aclocal-flags`
 
 lib_LTLIBRARIES = libwireshark.la
-libwireshark_la_LDFLAGS = -version-info 0:1:0
+libwireshark_la_LDFLAGS = -version-info 0:1:0 @SHAREDLIB_LDFLAGS@
 
 include Makefile.common
 
-INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$(LEMON) \
+INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$(LEMON) @LUA_INCLUDES@ \
        $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 libwireshark_la_SOURCES = \
@@ -54,6 +68,7 @@ EXTRA_DIST = \
        dtd_grammar.lemon \
        dtd_parse.l \
        dtd_preparse.l \
+       load_snmp_users_file.l \
        enterprise-numbers  \
        libwireshark.def        \
        Makefile.common \
@@ -75,6 +90,7 @@ DISTCLEANFILES = \
        dtd_grammar.h           \
        dtd_parse.c             \
        dtd_preparse.c          \
+       load_snmp_users_file.c          \
        radius_dict.c
        
 
@@ -82,13 +98,14 @@ MAINTAINERCLEANFILES = \
        Makefile.in             \
        sminmpec.c
 
+
 #
 # Add the object files for missing routines, if any.
 #
-libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
-libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
+libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
+libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la $(wslua_lib)
 
-tvbtest: tvbtest.o tvbuff.o except.o strutil.o
+tvbtest: tvbtest.o tvbuff.o except.o strutil.o emem.o
        $(LINK) $^ $(GLIB_LIBS) -lz
 
 exntest: exntest.o except.o
@@ -96,6 +113,9 @@ exntest: exntest.o except.o
 
 radius_dict.c: radius_dict.l
        $(LEX) $^
+
+load_snmp_users_file.c: load_snmp_users_file.l
+       $(LEX) -oload_snmp_users_file.c $(srcdir)/load_snmp_users_file.l
        
 dtd_parse.c : dtd_parse.l
        $(LEX) -odtd_parse.c $(srcdir)/dtd_parse.l
@@ -107,8 +127,8 @@ dtd_grammar.h: dtd_grammar.c
 
 LEMON=../tools/lemon
 
-dtd_grammar.c: dtd_grammar.lemon $(LEMON)/lemon
-       $(LEMON)/lemon t=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/dtd_grammar.lemon
+dtd_grammar.c: dtd_grammar.lemon $(LEMON)/lemon$(EXEEXT)
+       $(LEMON)/lemon$(EXEEXT) t=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/dtd_grammar.lemon
        
 tvbtest.o exntest.o: exceptions.h
 
@@ -120,7 +140,6 @@ if HAVE_PLUGINS
 if ENABLE_STATIC
 
 plugin_src = \
-       ../plugins/acn/packet-acn.c \
        ../plugins/artnet/packet-artnet.c \
        ../plugins/asn1/packet-asn1.c \
        ../plugins/docsis/packet-bpkmattr.c \