git.samba.org / obnox / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Move some code (including the optional objects) into libwsutil
[obnox/wireshark/wip.git] / epan / Makefile.am
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 4fbaaa22a6bb66a5a8fc423dd125a9dce01998cc..3200047410549386a7c2f3a386d1c8cc3ee91fac 100644 (file)
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -34,10 +34,21 @@ wslua_dir =
 wslua_dist_dir = wslua
 endif           # HAVE_LIBLUA
 
+if HAVE_LIBPY
+wspython_lib = wspython/libwspython.la
+wspython_dir = wspython
+wspython_dist_dir =
+py_dissectors_dir = -DPYTHON_DIR=\"@pythondir@\"
+else
+wspython_lib =
+wspython_dir =
+wspython_dist_dir = wspython
+py_dissectors_dir = -DPYTHONDIR=
+endif
 
-SUBDIRS = crypt ftypes dfilter dissectors $(wslua_dir)
+SUBDIRS = crc crypt ftypes dfilter dissectors $(wslua_dir) $(wspython_dir)
 
-DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir)
+DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir) $(wspython_dist_dir)
 
 ACLOCAL_AMFLAGS = `../aclocal-flags`
 
@@ -48,7 +59,8 @@ libwireshark_la_LDFLAGS = -version-info 0:1:0 @LDFLAGS_SHAREDLIB@
 include Makefile.common
 
 INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$(LEMON) @LUA_INCLUDES@ \
-       $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS)
+       $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) \
+       $(LIBGEOIP_CFLAGS)
 
 
 if HAVE_WARNINGS_AS_ERRORS
@@ -62,7 +74,7 @@ endif
 libwireshark_la_SOURCES = \
        $(LIBWIRESHARK_SRC)     \
        $(LIBWIRESHARK_INCLUDES)
-libwireshark_la_CFLAGS = $(AM_NON_GENERATED_CFLAGS)
+libwireshark_la_CFLAGS = $(AM_NON_GENERATED_CFLAGS) $(py_dissectors_dir)
 
 libwireshark_generated_la_SOURCES = \
        $(LIBWIRESHARK_GENERATED_SRC) \
@@ -75,10 +87,6 @@ libwireshark_asmopt_la_SOURCES = \
        asm_utils.h             \
        asm_utils_win32_x86.asm
 
-EXTRA_libwireshark_la_SOURCES =        \
-       inet_aton.c             \
-       inet_aton.h
-
 EXTRA_DIST = \
        diam_dict.l             \
        dtd_grammar.lemon       \
@@ -89,21 +97,21 @@ EXTRA_DIST = \
        libwireshark.def        \
        Makefile.common         \
        Makefile.nmake          \
-       make-sminmpec.pl        \
        radius_dict.l           \
        tvbtest.c               \
        reassemble_test.c       \
        uat_load.l              \
        exntest.c               \
-       doxygen.cfg.in
+       doxygen.cfg.in          \
+       CMakeLists.txt
 
 CLEANFILES = \
        libwireshark.a                  \
        libwireshark.la                 \
        libwireshark_generated.a        \
        libwireshark_generated.la       \
-       libwireshark_asmopt.a   \
-       libwireshark_asmopt.la  \
+       libwireshark_asmopt.a           \
+       libwireshark_asmopt.la          \
        *~
 
 DISTCLEANFILES = \
@@ -120,29 +128,32 @@ MAINTAINERCLEANFILES = \
 #
 # Add the object files for missing routines, if any.
 #
-libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ \
+libwireshark_la_LIBADD = \
        @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
-       libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
-       dfilter/libdfilter.la dissectors/libcleandissectors.la \
-       dissectors/libdissectors.la dissectors/libasndissectors.la \
-       dissectors/libpidldissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
-       @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ \
-       @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm
-libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ \
+       libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
+       ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
+       dissectors/libdirtydissectors.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
+       @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
+       @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \
+       ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \
+       ${top_builddir}/wsutil/libwsutil.la -lm
+
+libwireshark_la_DEPENDENCIES = \
        @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
-       libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
-       dfilter/libdfilter.la dissectors/libcleandissectors.la \
-       dissectors/libdissectors.la dissectors/libasndissectors.la \
-       dissectors/libpidldissectors.la $(wslua_lib)
+       libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
+       ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
+       dissectors/libdirtydissectors.la $(wslua_lib) $(wspython_lib) \
+       ${top_builddir}/wsutil/libwsutil.la \
+       ${top_builddir}/wiretap/libwiretap.la
 
 #EXTRA_PROGRAMS = reassemble_test
 #reassemble_test_LDADD = $(GLIB_LIBS)
 
-reassemble_test: reassemble_test.o tvbuff.o except.o strutil.o emem.o \
+reassemble_test: reassemble_test.o tvbuff.o except.o to_str.o strutil.o emem.o \
                  reassemble.o
        $(LINK) $^ $(GLIB_LIBS) -lz
 
-tvbtest: tvbtest.o tvbuff.o except.o strutil.o emem.o
+tvbtest: tvbtest.o tvbuff.o except.o to_str.o strutil.o emem.o
        $(LINK) $^ $(GLIB_LIBS) -lz
 
 exntest: exntest.o except.o
@@ -169,16 +180,16 @@ dtd_grammar.c: $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/dtd
 
 tvbtest.o exntest.o: exceptions.h
 
-sminmpec.c: enterprise-numbers make-sminmpec.pl
-       $(PERL) $(srcdir)/make-sminmpec.pl $(srcdir)/enterprise-numbers sminmpec.c
+sminmpec.c: enterprise-numbers ../tools/make-sminmpec.pl
+       $(PERL) $(srcdir)/../tools/make-sminmpec.pl $(srcdir)/enterprise-numbers sminmpec.c
 
 if HAVE_PLUGINS
 
 if ENABLE_STATIC
-
+-include ../plugins/Custom.make
 plugin_src = \
-       ../plugins/artnet/packet-artnet.c \
        ../plugins/asn1/packet-asn1.c \
+       ../plugins/docsis/packet-bintrngreq.c \
        ../plugins/docsis/packet-bpkmattr.c \
        ../plugins/docsis/packet-bpkmreq.c \
        ../plugins/docsis/packet-bpkmrsp.c \
@@ -204,19 +215,15 @@ plugin_src = \
        ../plugins/docsis/packet-uccreq.c \
        ../plugins/docsis/packet-uccrsp.c \
        ../plugins/docsis/packet-ucd.c \
-       ../plugins/enttec/packet-enttec.c \
        ../plugins/giop/packet-cosnaming.c \
        ../plugins/giop/packet-coseventcomm.c \
        ../plugins/gryphon/packet-gryphon.c \
-       ../plugins/infiniband/packet-infiniband.c \
+       ../plugins/interlink/packet-interlink.c \
        ../plugins/irda/packet-irda.c \
-       ../plugins/lwres/packet-lwres.c \
        ../plugins/m2m/packet-m2m.c \
        ../plugins/m2m/wimax_tlv.c \
        ../plugins/mgcp/packet-mgcp.c \
-       ../plugins/pcli/packet-pcli.c \
        ../plugins/rdm/packet-rdm.c \
-       ../plugins/rtnet/packet-rtnet.c \
        ../plugins/sercosiii/packet-sercosiii_1v1_at.c \
        ../plugins/sercosiii/packet-sercosiii_1v1_at_devstat.c \
        ../plugins/sercosiii/packet-sercosiii_1v1.c \
@@ -225,7 +232,6 @@ plugin_src = \
        ../plugins/sercosiii/packet-sercosiii_1v1_mdt_devctrl.c \
        ../plugins/sercosiii/packet-sercosiii_1v1_mst.c \
        ../plugins/sercosiii/packet-sercosiii_1v1_svc.c \
-       ../plugins/v5ua/packet-v5ua.c \
         ../plugins/wimax/crc.c \
         ../plugins/wimax/crc_data.c \
         ../plugins/wimax/mac_hd_generic_decoder.c \
@@ -285,3 +291,6 @@ doxygen:
 if HAVE_DOXYGEN
        $(DOXYGEN) doxygen.cfg
 endif          # HAVE_DOXYGEN
+
+checkapi:
+       $(PERL) ../tools/checkAPIs.pl -g termoutput $(LIBWIRESHARK_SRC)
git mirror of the wireshark svn