Autotools: Build rawshark.

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

diff --git a/Makefile.am b/Makefile.am
index 66c71e9b88c7e03c3abdd3479056818948b14377..330e6612344913f83306ea90c1c209de0e7c2773 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,19 +32,20 @@ COMMONCPPFLAGS =
 AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(COMMONCPPFLAGS)
 
 bin_PROGRAMS = \
-       @wireshark_bin@         \
-       @tshark_bin@            \
-       @tfshark_bin@           \
-       @text2pcap_bin@         \
-       @mergecap_bin@          \
        @capinfos_bin@          \
        @captype_bin@           \
+       @dumpcap_bin@           \
        @editcap_bin@           \
+       @mergecap_bin@          \
+       @mmdbresolve_bin@       \
        @randpkt_bin@           \
-       @dumpcap_bin@           \
-       @reordercap_bin@        \
        @rawshark_bin@          \
-       @sharkd_bin@
+       @reordercap_bin@        \
+       @sharkd_bin@            \
+       @text2pcap_bin@         \
+       @tfshark_bin@           \
+       @tshark_bin@            \
+       @wireshark_bin@
 
 noinst_PROGRAMS = \
        @dftest_bin@            \
@@ -52,13 +53,13 @@ noinst_PROGRAMS = \
 
 EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype \
        editcap mergecap dftest randpkt text2pcap dumpcap reordercap \
-       rawshark sharkd fuzzshark
+       mmdbresolve rawshark sharkd fuzzshark
 
 #
 # Wireshark configuration files are put in $(pkgdatadir).
 #
 dist_pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
-       smi_modules ipmap.html pdml2html.xsl enterprises.tsv wka
+       smi_modules pdml2html.xsl enterprises.tsv wka
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = wireshark.pc
@@ -380,8 +381,7 @@ SHARK_COMMON_SRC = \
        frame_tvbuff.c          \
        sync_pipe_write.c       \
        extcap.c                \
-       extcap_parser.c         \
-       extcap_spawn.c
+       extcap_parser.c
 
 # wireshark specifics
 WIRESHARK_COMMON_SRC = \
@@ -390,7 +390,6 @@ WIRESHARK_COMMON_SRC = \
        capture_opts.c          \
        file.c                  \
        fileset.c               \
-       summary.c               \
        version_info.c
 
 EPAN_EXTRA_LIBS = \
@@ -533,6 +532,11 @@ rawshark_LDADD = \
        @PCAP_LIBS@                     \
        ${EPAN_EXTRA_LIBS}
 
+mmdbresolve_SOURCES = mmdbresolve.c
+mmdbresolve_CPPFLAGS = $(AM_CPPFLAGS)
+mmdbresolve_LDFLAGS = $(AM_LDFLAGS)
+mmdbresolve_LDADD = @MAXMINDDB_LIBS@
+
 sharkd_SOURCES = \
        $(SHARK_COMMON_SRC)     \
        sharkd.c                \
@@ -572,11 +576,7 @@ text2pcap_SOURCES = \
 
 text2pcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
-# Don't turn on -Werror for text2pcap: its source includes text2pcap-scanner.c
-# which is generated (and therefore not always clean).
-# We could generate text2pcap.o as a library with -Werror but for now it
-# doesn't seem worth the effort.
-text2pcap_CFLAGS = $(GENERATED_CFLAGS)
+text2pcap_CFLAGS = $(AM_CFLAGS)
 
 # Libraries with which to link text2pcap.
 text2pcap_LDADD = \
@@ -727,11 +727,9 @@ noinst_HEADERS = \
        conditions.h            \
        extcap.h                \
        extcap_parser.h         \
-       extcap_spawn.h          \
        fileset.h               \
        frame_tvbuff.h          \
        ringbuffer.h            \
-       summary.h               \
        sync_pipe.h             \
        version_info.h
 
@@ -793,7 +791,6 @@ EXTRA_DIST = \
        fix                     \
        idl                     \
        image                   \
-       ipmap.html              \
        m4                      \
        macosx-support-lib-patches      \
        make-version.pl         \
@@ -1003,7 +1000,6 @@ shellcheck:
        $(SHELLCHECK) --external-sources \
          tools/fuzz-test.sh \
          tools/randpkt-test.sh \
-         tools/runa2x.sh \
          tools/test-captures.sh \
          tools/valgrind-wireshark.sh