plugins: Add backward compatibility for personal lua scripts
[metze/wireshark/wip.git] / Makefile.am
index 0a8be58b3b4364a0b5006d6041c0af146e86ac08..b7db8736efdcfb50a96ddf7e16da44cc92723fa8 100644 (file)
@@ -24,7 +24,7 @@ include ./Makefile.am.inc
 AM_DISTCHECK_CONFIGURE_FLAGS=@GUI_CONFIGURE_FLAGS@
 # Make sure to keep ACLOCAL_AMFLAGS in Makefile.am and AC_CONFIG_MACRO_DIRS
 # in configure.ac in sync, otherwise there will be an error running autogen.sh.
-ACLOCAL_AMFLAGS = `./aclocal-flags`
+ACLOCAL_AMFLAGS = -I m4
 
 # Common headers
 COMMONCPPFLAGS =
@@ -45,17 +45,20 @@ bin_PROGRAMS = \
        @dumpcap_bin@           \
        @reordercap_bin@        \
        @rawshark_bin@          \
-       @echld_test_bin@
+       @sharkd_bin@
 
 EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype \
        editcap mergecap dftest randpkt text2pcap dumpcap reordercap \
-       rawshark echld_test
+       rawshark sharkd
 
 #
 # Wireshark configuration files are put in $(pkgdatadir).
 #
 dist_pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
-       smi_modules ipmap.html pdml2html.xsl
+       smi_modules ipmap.html pdml2html.xsl enterprises.tsv wka
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = wireshark.pc
 
 #
 # Install global profiles in the "profiles" subdirectory
@@ -63,6 +66,7 @@ dist_pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
 profilesdir = $(pkgdatadir)
 nobase_dist_profiles_DATA = \
        profiles/Bluetooth/colorfilters \
+       profiles/Bluetooth/preferences \
        profiles/Classic/colorfilters
 
 #
@@ -74,12 +78,15 @@ include diameter/Custom.make
 dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \
        diameter/chargecontrol.xml \
        diameter/Cisco.xml \
+       diameter/CiscoSystems.xml \
        diameter/Custom.xml \
        diameter/dictionary.dtd \
        diameter/dictionary.xml \
        diameter/eap.xml \
        diameter/Ericsson.xml \
        diameter/etsie2e4.xml \
+       diameter/Inovar.xml \
+       diameter/Juniper.xml \
        diameter/mobileipv4.xml \
        diameter/mobileipv6.xml \
        diameter/nasreq.xml \
@@ -129,13 +136,13 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        radius/dictionary.3gpp2 \
        radius/dictionary.acc \
        radius/dictionary.acme \
-       radius/dictionary.airespace \
        radius/dictionary.actelis \
        radius/dictionary.aerohive \
+       radius/dictionary.airespace \
        radius/dictionary.alcatel \
+       radius/dictionary.alcatel-lucent.aaa \
        radius/dictionary.alcatel.esam \
        radius/dictionary.alcatel.sr \
-       radius/dictionary.alcatel-lucent.aaa \
        radius/dictionary.alteon \
        radius/dictionary.altiga \
        radius/dictionary.alvarion \
@@ -150,16 +157,16 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        radius/dictionary.avaya \
        radius/dictionary.azaire \
        radius/dictionary.bay \
-       radius/dictionary.bluecoat \
        radius/dictionary.bintec \
+       radius/dictionary.bluecoat \
+       radius/dictionary.bristol \
        radius/dictionary.broadsoft \
        radius/dictionary.brocade \
        radius/dictionary.bskyb \
-       radius/dictionary.bristol \
        radius/dictionary.bt \
-       radius/dictionary.camiant \
        radius/dictionary.cablelabs \
        radius/dictionary.cabletron \
+       radius/dictionary.camiant \
        radius/dictionary.chillispot \
        radius/dictionary.cisco \
        radius/dictionary.cisco.asa \
@@ -168,15 +175,17 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        radius/dictionary.cisco.vpn5000 \
        radius/dictionary.citrix \
        radius/dictionary.clavister \
+       radius/dictionary.cnergee \
        radius/dictionary.colubris \
        radius/dictionary.columbia_university \
-       radius/dictionary.compatible \
        radius/dictionary.compat \
+       radius/dictionary.compatible \
        radius/dictionary.cosine \
        radius/dictionary.dante \
+       radius/dictionary.dellemc \
        radius/dictionary.dhcp \
-       radius/dictionary.dlink \
        radius/dictionary.digium \
+       radius/dictionary.dlink \
        radius/dictionary.dragonwave \
        radius/dictionary.efficientip \
        radius/dictionary.eltex \
@@ -185,7 +194,6 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        radius/dictionary.ericsson \
        radius/dictionary.ericsson.ab \
        radius/dictionary.ericsson.packet.core.networks \
-       radius/dictionary.erx \
        radius/dictionary.extreme \
        radius/dictionary.f5 \
        radius/dictionary.fdxtended \
@@ -210,8 +218,8 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        radius/dictionary.itk \
        radius/dictionary.jradius \
        radius/dictionary.juniper \
-       radius/dictionary.kineto \
        radius/dictionary.karlnet \
+       radius/dictionary.kineto \
        radius/dictionary.lancom \
        radius/dictionary.livingston \
        radius/dictionary.localweb \
@@ -220,6 +228,7 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        radius/dictionary.meinberg \
        radius/dictionary.merit \
        radius/dictionary.meru \
+       radius/dictionary.microsemi \
        radius/dictionary.microsoft \
        radius/dictionary.mikrotik \
        radius/dictionary.motorola \
@@ -276,11 +285,13 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        radius/dictionary.rfc7155 \
        radius/dictionary.rfc7268 \
        radius/dictionary.rfc7499 \
+       radius/dictionary.rfc7930 \
        radius/dictionary.riverbed \
        radius/dictionary.riverstone \
        radius/dictionary.roaringpenguin \
        radius/dictionary.ruckus \
        radius/dictionary.ruggedcom \
+       radius/dictionary.sangoma \
        radius/dictionary.sg \
        radius/dictionary.shasta \
        radius/dictionary.shiva \
@@ -301,6 +312,7 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        radius/dictionary.travelping \
        radius/dictionary.tropos \
        radius/dictionary.ukerna \
+       radius/dictionary.unisphere \
        radius/dictionary.unix \
        radius/dictionary.usr \
        radius/dictionary.utstarcom \
@@ -360,7 +372,49 @@ plugin_ldadd =
 
 endif          # HAVE_PLUGINS
 
-include Makefile.common
+# "BUILT_SOURCES" are built before any "make all" or "make check" targets.
+BUILT_HEADER_FILES = \
+       version.h
+
+BUILT_C_FILES =
+
+BUILT_SOURCES =        $(BUILT_C_FILES) $(BUILT_HEADER_FILES)
+
+# Header files generated from source files.
+GENERATED_HEADER_FILES = \
+       text2pcap-scanner_lex.h \
+       $(BUILT_HEADER_FILES)
+
+# C source files generated from source files.
+GENERATED_C_FILES =
+
+# All the generated files.
+GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
+
+EXTCAP_COMMON_SRC = \
+       extcap.c                \
+       extcap_parser.c         \
+       extcap_spawn.c
+
+# sources common for wireshark, tshark, and rawshark
+SHARK_COMMON_SRC = \
+       cfile.c                 \
+       frame_tvbuff.c          \
+       sync_pipe_write.c
+
+# wireshark specifics
+WIRESHARK_COMMON_SRC = \
+       $(SHARK_COMMON_SRC)     \
+       capture_info.c          \
+       capture_opts.c          \
+       file.c                  \
+       fileset.c               \
+       summary.c               \
+       ws_version_info.c
+
+if HAVE_EXTCAP
+SHARK_COMMON_SRC += $(EXTCAP_COMMON_SRC)
+endif
 
 if ENABLE_STATIC
 EXTRALINKFLAGS = -Wl,-static -all-static
@@ -368,14 +422,16 @@ else
 EXTRALINKFLAGS = -export-dynamic
 endif
 
+EPAN_EXTRA_LIBS = \
+       @SSL_LIBS@                      \
+       @C_ARES_LIBS@                   \
+       @KRB5_LIBS@                     \
+       @LIBGCRYPT_LIBS@                \
+       @LIBGNUTLS_LIBS@                \
+       @LIBSMI_LDFLAGS@
+
 # Libraries and plugin flags with which to link wireshark.
 #
-# Note that Wireshark, when built with a version of GTK+ that runs
-# atop X11, doesn't have to be linked with @SOCKET_LIBS@ or @NSL_LIBS@,
-# as those should also be included in @GTK_LIBS@ (as those are also
-# needed for X applications, and GTK+ applications are X applications
-# if the version of GTK+ they're built with runs atop X11).
-#
 # GTK_CFLAGS/GTK_LIBS is a strict superset of GLIB_CFLAGS/GLIB_LIBS
 # (see configure.ac for pkg-config modules used).
 #
@@ -388,18 +444,12 @@ wireshark_common_ldadd = \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
-       @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @PCAP_LIBS@                     \
-       @C_ARES_LIBS@                   \
-       @ADNS_LIBS@                     \
-       @KRB5_LIBS@                     \
        @APPLICATIONSERVICES_FRAMEWORKS@        \
        @SYSTEMCONFIGURATION_FRAMEWORKS@        \
        @COREFOUNDATION_FRAMEWORKS@     \
-       @LIBGCRYPT_LIBS@                \
-       @LIBGNUTLS_LIBS@                \
-       @LIBSMI_LDFLAGS@                \
+       $(EPAN_EXTRA_LIBS)                      \
        @LIBNL_LIBS@
 
 if HAVE_Qt
@@ -414,7 +464,11 @@ wireshark_LDADD = \
        $(wireshark_common_ldadd)       \
        $(GLIB_LIBS)                    \
        $(Qt_LIBS)
+
+if HAVE_SPEEXDSP
+wireshark_LDADD += $(SPEEXDSP_LIBS)
 endif
+endif  # HAVE_Qt
 
 if HAVE_GTK
 wireshark_gtk_SOURCES = $(WIRESHARK_COMMON_SRC)
@@ -430,6 +484,12 @@ wireshark_gtk_LDADD = \
        @PORTAUDIO_LIBS@
 endif
 
+tshark_SOURCES = \
+       $(SHARK_COMMON_SRC)     \
+       capture_opts.c          \
+       tshark.c                \
+       ws_version_info.c
+
 tshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
 tshark_LDFLAGS = $(AM_LDFLAGS) $(EXTRALINKFLAGS)
@@ -443,20 +503,17 @@ tshark_LDADD = \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
-       @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @GLIB_LIBS@                     \
        @PCAP_LIBS@                     \
-       @SOCKET_LIBS@                   \
-       @NSL_LIBS@                      \
-       @C_ARES_LIBS@                   \
-       @ADNS_LIBS@                     \
-       @KRB5_LIBS@                     \
+       ${EPAN_EXTRA_LIBS}      \
        @SYSTEMCONFIGURATION_FRAMEWORKS@        \
-       @COREFOUNDATION_FRAMEWORKS@     \
-       @LIBGCRYPT_LIBS@                \
-       @LIBGNUTLS_LIBS@                \
-       @LIBSMI_LDFLAGS@
+       @COREFOUNDATION_FRAMEWORKS@
+
+tfshark_SOURCES = \
+       $(SHARK_COMMON_SRC)     \
+       tfshark.c               \
+       ws_version_info.c
 
 tfshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -469,17 +526,17 @@ tfshark_LDADD = \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
-       @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @GLIB_LIBS@                     \
        @PCAP_LIBS@                     \
-       @SOCKET_LIBS@                   \
-       @NSL_LIBS@                      \
-       @KRB5_LIBS@                     \
+       ${EPAN_EXTRA_LIBS}      \
        @SYSTEMCONFIGURATION_FRAMEWORKS@        \
-       @COREFOUNDATION_FRAMEWORKS@     \
-       @LIBGNUTLS_LIBS@                \
-       @LIBSMI_LDFLAGS@
+       @COREFOUNDATION_FRAMEWORKS@
+
+rawshark_SOURCES = \
+       $(SHARK_COMMON_SRC)     \
+       rawshark.c              \
+       ws_version_info.c
 
 rawshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -492,20 +549,52 @@ rawshark_LDADD = \
        wiretap/libwiretap.la           \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
-       @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @GLIB_LIBS@                     \
        @PCAP_LIBS@                     \
-       @SOCKET_LIBS@                   \
-       @NSL_LIBS@                      \
-       @C_ARES_LIBS@                   \
-       @ADNS_LIBS@                     \
-       @KRB5_LIBS@                     \
+       ${EPAN_EXTRA_LIBS}      \
        @SYSTEMCONFIGURATION_FRAMEWORKS@        \
-       @COREFOUNDATION_FRAMEWORKS@     \
-       @LIBGCRYPT_LIBS@                \
-       @LIBGNUTLS_LIBS@                \
-       @LIBSMI_LDFLAGS@
+       @COREFOUNDATION_FRAMEWORKS@
+
+sharkd_SOURCES = \
+       $(SHARK_COMMON_SRC)     \
+       sharkd.c                \
+       sharkd.h                \
+       sharkd_daemon.c         \
+       sharkd_session.c        \
+       ws_version_info.c
+
+sharkd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
+if HAVE_SPEEXDSP
+sharkd_CPPFLAGS += $(SPEEXDSP_CFLAGS)
+endif
+
+sharkd_LDFLAGS = $(AM_LDFLAGS) $(EXTRALINKFLAGS)
+
+# Libraries and plugin flags with which to link sharkd.
+sharkd_LDADD = \
+       ui/cli/libcliui.a               \
+       ui/libui.a                      \
+       codecs/libwscodecs.la           \
+       wiretap/libwiretap.la           \
+       epan/libwireshark.la            \
+       wsutil/libwsutil.la             \
+       $(plugin_ldadd)                 \
+       @GLIB_LIBS@                     \
+       @PCAP_LIBS@                     \
+       ${EPAN_EXTRA_LIBS}      \
+       @SYSTEMCONFIGURATION_FRAMEWORKS@        \
+       @COREFOUNDATION_FRAMEWORKS@
+
+if HAVE_SPEEXDSP
+sharkd_LDADD += $(SPEEXDSP_LIBS)
+endif
+
+text2pcap_SOURCES = \
+       text2pcap.c             \
+       text2pcap-scanner.l     \
+       ws_version_info.c
 
 text2pcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -517,63 +606,95 @@ text2pcap_CFLAGS = $(GENERATED_CFLAGS)
 
 # Libraries with which to link text2pcap.
 text2pcap_LDADD = \
+       writecap/libwritecap.a          \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@
 
+mergecap_SOURCES = \
+       mergecap.c      \
+       ws_version_info.c
+
 mergecap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
 # Libraries with which to link mergecap.
 mergecap_LDADD = \
+       ui/libui.a                      \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@
 
+capinfos_SOURCES = \
+       capinfos.c      \
+       ws_version_info.c
+
 capinfos_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
 # Libraries with which to link capinfos.
 capinfos_LDADD = \
+       ui/libui.a                      \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@                     \
        @LIBGCRYPT_LIBS@
 
+captype_SOURCES = \
+       captype.c       \
+       ws_version_info.c
+
 captype_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
 # Libraries with which to link captype.
 captype_LDADD = \
+       ui/libui.a                      \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@
 
+editcap_SOURCES = \
+       editcap.c       \
+       ws_version_info.c
+
 editcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
 # Libraries with which to link editcap.
 editcap_LDADD = \
+       ui/libui.a                      \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
-       @GLIB_LIBS@
+       @GLIB_LIBS@                     \
+       @LIBGCRYPT_LIBS@
+
+reordercap_SOURCES = \
+       reordercap.c    \
+       ws_version_info.c
 
 reordercap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
 # Libraries with which to link reordercap.
 reordercap_LDADD = \
+       ui/libui.a                      \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@
 
+randpkt_SOURCES = \
+       randpkt.c       \
+       ws_version_info.c
+
 randpkt_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
 # Libraries with which to link randpkt.
 randpkt_LDADD = \
        randpkt_core/librandpkt_core.a  \
+       ui/libui.a                      \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@                     \
        @PCAP_LIBS@                     \
-       @SOCKET_LIBS@                   \
-       @NSL_LIBS@                      \
-       @C_ARES_LIBS@                   \
-       @ADNS_LIBS@
+       @C_ARES_LIBS@
+
+dftest_SOURCES = \
+       dftest.c
 
 dftest_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -583,35 +704,19 @@ dftest_LDADD = \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        epan/libwireshark.la            \
-       @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @GLIB_LIBS@                     \
        @PCAP_LIBS@                     \
-       @SOCKET_LIBS@                   \
-       @NSL_LIBS@                      \
-       @C_ARES_LIBS@                   \
-       @ADNS_LIBS@                     \
-       @KRB5_LIBS@                     \
-       @LIBGCRYPT_LIBS@                \
-       @LIBGNUTLS_LIBS@                \
-       @LIBSMI_LDFLAGS@
+       ${EPAN_EXTRA_LIBS}
 
-echld_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
-
-echld_test_LDADD = \
-       epan/libwireshark.la            \
-       echld/libechld.la               \
-       wsutil/libwsutil.la             \
-       @GLIB_LIBS@                     \
-       @PCAP_LIBS@                     \
-       @SOCKET_LIBS@                   \
-       @NSL_LIBS@                      \
-       @C_ARES_LIBS@                   \
-       @ADNS_LIBS@
-
-echld_test_DEPENDENCIES = \
-       echld/libechld.la \
-       epan/libwireshark.la
+dumpcap_SOURCES = \
+       capture_opts.c                  \
+       capture_stop_conditions.c       \
+       conditions.c                    \
+       dumpcap.c                       \
+       ringbuffer.c                    \
+       sync_pipe_write.c               \
+       ws_version_info.c
 
 dumpcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -622,16 +727,42 @@ dumpcap_LDFLAGS = $(AM_LDFLAGS) $(PIE_LDFLAGS)
 # Libraries with which to link dumpcap.
 dumpcap_LDADD = \
        caputils/libcaputils.a          \
+       ui/libui.a                      \
+       writecap/libwritecap.a          \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@                     \
        @PCAP_LIBS@                     \
-       @SOCKET_LIBS@                   \
-       @NSL_LIBS@                      \
        @SYSTEMCONFIGURATION_FRAMEWORKS@        \
        @COREFOUNDATION_FRAMEWORKS@     \
        @LIBCAP_LIBS@                   \
        @LIBNL_LIBS@
 
+pkginclude_HEADERS = \
+       cfile.h                 \
+       file.h                  \
+       register.h              \
+       globals.h               \
+       log.h                   \
+       ws_symbol_export.h      \
+       ws_attributes.h         \
+       ws_diag_control.h
+
+# this target needed for distribution only
+noinst_HEADERS = \
+       capture_info.h          \
+       capture_opts.h          \
+       capture_stop_conditions.h       \
+       conditions.h            \
+       fileset.h               \
+       frame_tvbuff.h          \
+       ringbuffer.h            \
+       summary.h               \
+       sync_pipe.h             \
+       extcap.h                \
+       extcap_parser.h         \
+       extcap_spawn.h          \
+       ws_version_info.h
+
 #
 # Build the version string
 #
@@ -655,7 +786,7 @@ SUFFIXES = .sh
 services:
        $(PYTHON) $(srcdir)/tools/make-services.py
 
-CLEANFILES =           \
+CLEANFILES = \
        *~              \
        doxygen-core.tag        \
        vgcore.*
@@ -674,7 +805,7 @@ DISTCLEANFILES = \
        ps.c                    \
        version.h
 
-MAINTAINERCLEANFILES =         \
+MAINTAINERCLEANFILES = \
        $(GENERATED_FILES)      \
        Makefile.in             \
        aclocal.m4              \
@@ -692,653 +823,49 @@ EXTRA_DIST = \
        .mailmap                \
        INSTALL.configure       \
        Makefile.am.inc         \
-       Makefile.common         \
-       Makefile.nmake          \
-       Makefile.nmake.inc      \
        README.aix              \
        README.bsd              \
        README.DECT             \
        README.hpux             \
        README.linux            \
        README.macos            \
-       README.tru64            \
-       README.vmware           \
+       README.md               \
        README.windows          \
        abi-descriptor.template \
-       aclocal-fallback/ax_append_flag.m4              \
-       aclocal-fallback/ax_check_compile_flag.m4       \
-       aclocal-fallback/ax_compiler_vendor.m4          \
-       aclocal-fallback/ax_ext.m4                      \
-       aclocal-fallback/ax_gcc_x86_cpuid.m4            \
-       aclocal-fallback/ax_gcc_x86_avx_xgetbv.m4       \
-       aclocal-fallback/libsmi.m4                      \
-       aclocal-fallback/libgcrypt.m4                   \
-       aclocal-flags           \
-       adns_dll.dep            \
-       adns_dll.rc             \
        autogen.sh              \
-       capinfos.c              \
-       captype.c               \
        cfilters                \
        colorfilters            \
-       config.h.win32          \
-       config.nmake            \
-       debian/changelog        \
-       debian/compat           \
-       debian/control          \
-       debian/copyright        \
-       debian/dirs             \
-       debian/ethereal-common.NEWS     \
-       debian/geoip_db_paths   \
-       debian/headers-check.c  \
-       debian/libwireshark0.install    \
-       debian/libwireshark0.symbols    \
-       debian/libwireshark-data.install        \
-       debian/libwireshark-dev.install \
-       debian/libwiretap0.docs \
-       debian/libwiretap0.install      \
-       debian/libwiretap0.symbols      \
-       debian/libwiretap-dev.install   \
-       debian/libwscodecs0.install     \
-       debian/libwscodecs0.symbols     \
-       debian/libwsutil0.install       \
-       debian/libwsutil0.symbols       \
-       debian/libwsutil-dev.install    \
-       debian/license-text-about-dialog        \
-       debian/patches/02_use_packaged_openlayers_js.patch      \
-       debian/patches/04_asn2wrs_ply.patch     \
-       debian/patches/05_note-README-when-running-as-root.patch        \
-       debian/patches/06_release-version.patch \
-       debian/patches/09_idl2wrs.patch \
-       debian/patches/16_licence_about_location.patch  \
-       debian/patches/series   \
-       debian/po/POTFILES.in   \
-       debian/po/cs.po \
-       debian/po/da.po \
-       debian/po/de.po \
-       debian/po/es.po \
-       debian/po/eu.po \
-       debian/po/fi.po \
-       debian/po/fr.po \
-       debian/po/hu.po \
-       debian/po/id.po \
-       debian/po/it.po \
-       debian/po/ja.po \
-       debian/po/ko.po \
-       debian/po/nl.po \
-       debian/po/pt.po \
-       debian/po/pt_BR.po      \
-       debian/po/ru.po \
-       debian/po/sk.po \
-       debian/po/sv.po \
-       debian/po/templates.pot \
-       debian/po/vi.po \
-       debian/postinst         \
-       debian/README.Debian    \
-       debian/README.Debian.security   \
-       debian/rules            \
-       debian/source/format    \
-       debian/templates        \
-       debian/tshark.docs      \
-       debian/tshark.install   \
-       debian/tshark.manpages  \
-       debian/wireshark-common.config  \
-       debian/wireshark-common.install \
-       debian/wireshark-common.manpages \
-       debian/wireshark-common.postinst        \
-       debian/wireshark-common.postrm  \
-       debian/wireshark-dev.docs \
-       debian/wireshark-dev.install    \
-       debian/wireshark-dev.manpages \
-       debian/wireshark-dev.prerm \
-       debian/wireshark-doc.docs       \
-       debian/wireshark-gtk.docs       \
-       debian/wireshark-gtk.install    \
-       debian/wireshark-qt.docs        \
-       debian/wireshark-qt.install     \
-       debian/wireshark-qt.manpages \
+       debian                  \
        dfilters                \
        doxygen_global.cfg      \
        doxygen.cfg.in          \
-       dumpcap.c               \
-       editcap.c               \
-       epan/print.ps           \
-       fix/FIX.xml             \
-       fix/FIX40.xml           \
-       fix/FIX41.xml           \
-       fix/FIX42.xml           \
-       fix/FIX43.xml           \
-       fix/FIX44.xml           \
-       fix/FIX50.xml           \
-       fix/FIX50SP1.xml        \
-       fix/FIX50SP2.xml        \
-       fix/README              \
-       fix/Values.xsl          \
-       fix/hfDecl.xsl          \
-       fix/hfField.xsl         \
-       fix/hfList.xsl          \
-       idl/coseventcomm.idl    \
-       idl/cosnaming.idl       \
-       idl/tango.idl   \
-       idl/parlay/am.idl       \
-       idl/parlay/cccs.idl     \
-       idl/parlay/cm.idl       \
-       idl/parlay/common_cc_data.idl   \
-       idl/parlay/cs.idl       \
-       idl/parlay/dsc.idl      \
-       idl/parlay/fw_data.idl  \
-       idl/parlay/fw_if.idl    \
-       idl/parlay/fw_if_access.idl     \
-       idl/parlay/fw_if_app.idl        \
-       idl/parlay/fw_if_entop.idl      \
-       idl/parlay/fw_if_service.idl    \
-       idl/parlay/gcc_data.idl \
-       idl/parlay/gcc_interfaces.idl   \
-       idl/parlay/gms.idl      \
-       idl/parlay/mm.idl       \
-       idl/parlay/mmccs.idl    \
-       idl/parlay/mmm.idl      \
-       idl/parlay/mpcc_data.idl        \
-       idl/parlay/mpcc_interfaces.idl  \
-       idl/parlay/osa.idl      \
-       idl/parlay/pam_data.idl \
-       idl/parlay/pam_interfaces.idl   \
-       idl/parlay/Parlay.idl   \
-       idl/parlay/policy_data.idl      \
-       idl/parlay/policy_interfaces.idl        \
-       idl/parlay/README.parlay        \
-       idl/parlay/termcap.idl  \
-       idl/parlay/ui_data.idl  \
-       idl/parlay/ui_interfaces.idl    \
-       image/capinfos.rc.in    \
-       image/captype.rc.in     \
-       image/capture_comment.svg       \
-       image/capture_comment_add.png   \
-       image/capture_comment_disabled.png      \
-       image/capture_comment_update.png        \
-       image/capture_comment_update.svg        \
-       image/clist_ascend.xpm                  \
-       image/clist_descend.xpm                 \
-       image/copy-8.png                        \
-       image/dumpcap.rc.in     \
-       image/editcap.rc.in     \
-       image/file_dlg_win32.rc \
-       image/hi16-app-wireshark.png    \
-       image/hi32-app-wireshark.png    \
-       image/hi48-app-wireshark.png    \
-       image/languages/de.svg          \
-       image/languages/en.svg          \
-       image/languages/fr.svg          \
-       image/languages/it.svg          \
-       image/languages/ja_JP.svg       \
-       image/languages/pl.svg          \
-       image/languages/zh_CN.svg       \
-       image/layout_1.png              \
-       image/layout_1@2x.png           \
-       image/layout_2.png              \
-       image/layout_2@2x.png           \
-       image/layout_3.png              \
-       image/layout_3@2x.png           \
-       image/layout_4.png              \
-       image/layout_4@2x.png           \
-       image/layout_5.png              \
-       image/layout_5@2x.png           \
-       image/layout_6.png              \
-       image/layout_6@2x.png           \
-       image/libwscodecs.rc.in         \
-       image/libwireshark.rc.in        \
-       image/libwsutil.rc.in           \
-       image/lo16-app-wireshark.png    \
-       image/lo32-app-wireshark.png    \
-       image/lo48-app-wireshark.png    \
-       image/Makefile.nmake                    \
-       image/mergecap.rc.in                    \
-       image/minus-8.png                       \
-       image/nsis-checked.bmp                  \
-       image/nsis-unchecked.bmp                \
-       image/openhand-16.png                   \
-       image/plus-8.png                        \
-       image/rawshark.rc.in                    \
-       image/README.image                      \
-       image/reordercap.rc.in                  \
-       image/rubberband-16.png                 \
-       image/stock_dialog_error_48.xpm         \
-       image/stock_dialog_info_48.xpm          \
-       image/stock_dialog_question_48.xpm      \
-       image/stock_dialog_stop_48.xpm          \
-       image/stock_dialog_warning_48.xpm       \
-       image/text2pcap.rc.in                   \
-       image/tfshark.rc.in                     \
-       image/expert_ok.png                     \
-       image/toolbar/14x14/x-capture-comment-update.png        \
-       image/toolbar/14x14/x-capture-comment-update.svg        \
-       image/toolbar/14x14/x-capture-comment-update@2x.png     \
-       image/toolbar/14x14/x-capture-filter-bookmark.active.png \
-       image/toolbar/14x14/x-capture-filter-bookmark.active.svg \
-       image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png \
-       image/toolbar/14x14/x-capture-filter-bookmark.png \
-       image/toolbar/14x14/x-capture-filter-bookmark.selected.png \
-       image/toolbar/14x14/x-capture-filter-bookmark.selected.svg \
-       image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png \
-       image/toolbar/14x14/x-capture-filter-bookmark.svg \
-       image/toolbar/14x14/x-capture-filter-bookmark@2x.png \
-       image/toolbar/14x14/x-display-filter-bookmark.active.png \
-       image/toolbar/14x14/x-display-filter-bookmark.active.svg \
-       image/toolbar/14x14/x-display-filter-bookmark.active@2x.png \
-       image/toolbar/14x14/x-display-filter-bookmark.png \
-       image/toolbar/14x14/x-display-filter-bookmark.selected.png \
-       image/toolbar/14x14/x-display-filter-bookmark.selected.svg \
-       image/toolbar/14x14/x-display-filter-bookmark.selected@2x.png \
-       image/toolbar/14x14/x-display-filter-bookmark.svg \
-       image/toolbar/14x14/x-display-filter-bookmark@2x.png \
-       image/toolbar/14x14/x-expert-chat.png   \
-       image/toolbar/14x14/x-expert-chat@2x.png        \
-       image/toolbar/14x14/x-expert-error.png  \
-       image/toolbar/14x14/x-expert-error@2x.png       \
-       image/toolbar/14x14/x-expert-indicators-all.svg \
-       image/toolbar/14x14/x-expert-none.png   \
-       image/toolbar/14x14/x-expert-none@2x.png        \
-       image/toolbar/14x14/x-expert-note.png   \
-       image/toolbar/14x14/x-expert-note@2x.png        \
-       image/toolbar/14x14/x-expert-warn.png   \
-       image/toolbar/14x14/x-expert-warn@2x.png        \
-       image/toolbar/14x14/x-filter-clear.active.png \
-       image/toolbar/14x14/x-filter-clear.active.svg \
-       image/toolbar/14x14/x-filter-clear.active@2x.png \
-       image/toolbar/14x14/x-filter-clear.png \
-       image/toolbar/14x14/x-filter-clear.selected.png \
-       image/toolbar/14x14/x-filter-clear.selected.svg \
-       image/toolbar/14x14/x-filter-clear.selected@2x.png \
-       image/toolbar/14x14/x-filter-clear.svg \
-       image/toolbar/14x14/x-filter-clear@2x.png \
-       image/toolbar/14x14/x-filter-dropdown.png \
-       image/toolbar/14x14/x-filter-dropdown.svg \
-       image/toolbar/14x14/x-filter-dropdown@2x.png \
-       image/toolbar/14x14/x-filter-matching-bookmark.active.png \
-       image/toolbar/14x14/x-filter-matching-bookmark.active.svg \
-       image/toolbar/14x14/x-filter-matching-bookmark.active@2x.png \
-       image/toolbar/14x14/x-filter-matching-bookmark.png \
-       image/toolbar/14x14/x-filter-matching-bookmark.selected.png \
-       image/toolbar/14x14/x-filter-matching-bookmark.selected.svg \
-       image/toolbar/14x14/x-filter-matching-bookmark.selected@2x.png \
-       image/toolbar/14x14/x-filter-matching-bookmark.svg \
-       image/toolbar/14x14/x-filter-matching-bookmark@2x.png \
-       image/toolbar/16x16/edit-find.png               \
-       image/toolbar/16x16/edit-find.svg               \
-       image/toolbar/16x16/edit-find@2x.png            \
-       image/toolbar/16x16/go-first.png                \
-       image/toolbar/16x16/go-first.svg                \
-       image/toolbar/16x16/go-first@2x.png             \
-       image/toolbar/16x16/go-jump.png                 \
-       image/toolbar/16x16/go-jump.svg                 \
-       image/toolbar/16x16/go-jump@2x.png              \
-       image/toolbar/16x16/go-last.png                 \
-       image/toolbar/16x16/go-last.svg                 \
-       image/toolbar/16x16/go-last@2x.png              \
-       image/toolbar/16x16/go-next.png                 \
-       image/toolbar/16x16/go-next.svg                 \
-       image/toolbar/16x16/go-next@2x.png              \
-       image/toolbar/16x16/go-previous.png             \
-       image/toolbar/16x16/go-previous.svg             \
-       image/toolbar/16x16/go-previous@2x.png          \
-       image/toolbar/16x16/x-capture-file-close.png    \
-       image/toolbar/16x16/x-capture-file-close.svg    \
-       image/toolbar/16x16/x-capture-file-close@2x.png \
-       image/toolbar/16x16/x-capture-file-close@2x.svg \
-       image/toolbar/16x16/x-capture-file-reload.png   \
-       image/toolbar/16x16/x-capture-file-reload.svg   \
-       image/toolbar/16x16/x-capture-file-reload@2x.png        \
-       image/toolbar/16x16/x-capture-file-reload@2x.svg        \
-       image/toolbar/16x16/x-capture-file-save.png     \
-       image/toolbar/16x16/x-capture-file-save.svg     \
-       image/toolbar/16x16/x-capture-file-save@2x.png  \
-       image/toolbar/16x16/x-capture-file-save@2x.svg  \
-       image/toolbar/16x16/x-capture-options-gear.svg  \
-       image/toolbar/16x16/x-capture-options-wrench.svg        \
-       image/toolbar/16x16/x-capture-options.png       \
-       image/toolbar/16x16/x-capture-options@2x.png    \
-       image/toolbar/16x16/x-capture-restart-fin.svg   \
-       image/toolbar/16x16/x-capture-restart-triangle1.svg     \
-       image/toolbar/16x16/x-capture-restart-triangle2.svg     \
-       image/toolbar/16x16/x-capture-restart-turn1.svg \
-       image/toolbar/16x16/x-capture-restart-turn2.svg \
-       image/toolbar/16x16/x-capture-restart.png       \
-       image/toolbar/16x16/x-capture-restart@2x.png    \
-       image/toolbar/16x16/x-capture-start.on.png      \
-       image/toolbar/16x16/x-capture-start.on.svg      \
-       image/toolbar/16x16/x-capture-start.on@2x.png   \
-       image/toolbar/16x16/x-capture-start.png         \
-       image/toolbar/16x16/x-capture-start.svg         \
-       image/toolbar/16x16/x-capture-start@2x.png      \
-       image/toolbar/16x16/x-capture-stop-red.svg      \
-       image/toolbar/16x16/x-capture-stop-white.svg    \
-       image/toolbar/16x16/x-capture-stop.png          \
-       image/toolbar/16x16/x-capture-stop@2x.png       \
-       image/toolbar/16x16/x-colorize-packets.png      \
-       image/toolbar/16x16/x-colorize-packets.svg      \
-       image/toolbar/16x16/x-colorize-packets@2x.png   \
-       image/toolbar/16x16/x-resize-columns.png        \
-       image/toolbar/16x16/x-resize-columns.svg        \
-       image/toolbar/16x16/x-resize-columns@2x.png     \
-       image/toolbar/16x16/x-stay-last.png             \
-       image/toolbar/16x16/x-stay-last.svg             \
-       image/toolbar/16x16/x-stay-last@2x.png          \
-       image/toolbar/16x16/zoom-in.png                 \
-       image/toolbar/16x16/zoom-in.svg                 \
-       image/toolbar/16x16/zoom-in@2x.png              \
-       image/toolbar/16x16/zoom-original.png           \
-       image/toolbar/16x16/zoom-original.svg           \
-       image/toolbar/16x16/zoom-original@2x.png        \
-       image/toolbar/16x16/zoom-out.png                \
-       image/toolbar/16x16/zoom-out.svg                \
-       image/toolbar/16x16/zoom-out@2x.png             \
-       image/toolbar/24x14/x-filter-apply.active.png \
-       image/toolbar/24x14/x-filter-apply.active.svg \
-       image/toolbar/24x14/x-filter-apply.active@2x.png \
-       image/toolbar/24x14/x-filter-apply.png \
-       image/toolbar/24x14/x-filter-apply.selected.png \
-       image/toolbar/24x14/x-filter-apply.selected.svg \
-       image/toolbar/24x14/x-filter-apply.selected@2x.png \
-       image/toolbar/24x14/x-filter-apply.svg \
-       image/toolbar/24x14/x-filter-apply@2x.png \
-       image/toolbar/24x24/edit-find.png       \
-       image/toolbar/24x24/edit-find.svg       \
-       image/toolbar/24x24/edit-find@2x.png    \
-       image/toolbar/24x24/go-first.png        \
-       image/toolbar/24x24/go-first.svg        \
-       image/toolbar/24x24/go-first@2x.png     \
-       image/toolbar/24x24/go-jump.png         \
-       image/toolbar/24x24/go-jump.svg         \
-       image/toolbar/24x24/go-jump@2x.png      \
-       image/toolbar/24x24/go-last.png         \
-       image/toolbar/24x24/go-last.svg         \
-       image/toolbar/24x24/go-last@2x.png      \
-       image/toolbar/24x24/go-next.png         \
-       image/toolbar/24x24/go-next.svg         \
-       image/toolbar/24x24/go-next@2x.png      \
-       image/toolbar/24x24/go-previous.png     \
-       image/toolbar/24x24/go-previous.svg     \
-       image/toolbar/24x24/go-previous@2x.png  \
-       image/toolbar/24x24/x-capture-file-close.png            \
-       image/toolbar/24x24/x-capture-file-close.svg            \
-       image/toolbar/24x24/x-capture-file-close@2x.png         \
-       image/toolbar/24x24/x-capture-file-close@2x.svg         \
-       image/toolbar/24x24/x-capture-file-reload.png           \
-       image/toolbar/24x24/x-capture-file-reload.svg           \
-       image/toolbar/24x24/x-capture-file-reload@2x.png        \
-       image/toolbar/24x24/x-capture-file-reload@2x.svg        \
-       image/toolbar/24x24/x-capture-file-save.png             \
-       image/toolbar/24x24/x-capture-file-save.svg             \
-       image/toolbar/24x24/x-capture-file-save@2x.png          \
-       image/toolbar/24x24/x-capture-file-save@2x.svg          \
-       image/toolbar/24x24/x-capture-options-gear.svg          \
-       image/toolbar/24x24/x-capture-options-wrench.svg        \
-       image/toolbar/24x24/x-capture-options.png               \
-       image/toolbar/24x24/x-capture-options@2x.png            \
-       image/toolbar/24x24/x-capture-restart-fin.svg           \
-       image/toolbar/24x24/x-capture-restart-triangle1.svg     \
-       image/toolbar/24x24/x-capture-restart-triangle2.svg     \
-       image/toolbar/24x24/x-capture-restart-turn1.svg         \
-       image/toolbar/24x24/x-capture-restart-turn2.svg         \
-       image/toolbar/24x24/x-capture-restart.png               \
-       image/toolbar/24x24/x-capture-restart@2x.png            \
-       image/toolbar/24x24/x-capture-start.on.png              \
-       image/toolbar/24x24/x-capture-start.on.svg              \
-       image/toolbar/24x24/x-capture-start.on@2x.png           \
-       image/toolbar/24x24/x-capture-start.png         \
-       image/toolbar/24x24/x-capture-start.svg         \
-       image/toolbar/24x24/x-capture-start@2x.png      \
-       image/toolbar/24x24/x-capture-stop-red.svg      \
-       image/toolbar/24x24/x-capture-stop-white.svg    \
-       image/toolbar/24x24/x-capture-stop.png          \
-       image/toolbar/24x24/x-capture-stop@2x.png       \
-       image/toolbar/24x24/x-colorize-packets.png      \
-       image/toolbar/24x24/x-colorize-packets.svg      \
-       image/toolbar/24x24/x-colorize-packets@2x.png   \
-       image/toolbar/24x24/x-resize-columns-motion.svg \
-       image/toolbar/24x24/x-resize-columns.png        \
-       image/toolbar/24x24/x-resize-columns.svg        \
-       image/toolbar/24x24/x-resize-columns@2x.png     \
-       image/toolbar/24x24/x-stay-last.png             \
-       image/toolbar/24x24/x-stay-last.svg             \
-       image/toolbar/24x24/x-stay-last@2x.png          \
-       image/toolbar/24x24/zoom-in.png                 \
-       image/toolbar/24x24/zoom-in.svg                 \
-       image/toolbar/24x24/zoom-in@2x.png              \
-       image/toolbar/24x24/zoom-original.png           \
-       image/toolbar/24x24/zoom-original.svg           \
-       image/toolbar/24x24/zoom-original@2x.png        \
-       image/toolbar/24x24/zoom-out.png                \
-       image/toolbar/24x24/zoom-out.svg                \
-       image/toolbar/24x24/zoom-out@2x.png             \
-       image/toolbar.qrc                       \
-       image/toolbar/analyze_24.xpm            \
-       image/toolbar/audio_player_24.xpm       \
-       image/toolbar/autoscroll_24.xpm         \
-       image/toolbar/capture_airpcap_16.xpm    \
-       image/toolbar/capture_capture_16.xpm    \
-       image/toolbar/capture_details_16.xpm    \
-       image/toolbar/capture_details_24.xpm    \
-       image/toolbar/capture_ethernet_16.xpm   \
-       image/toolbar/capture_filter_24.xpm     \
-       image/toolbar/capture_interfaces_16.png \
-       image/toolbar/capture_interfaces_16.svg \
-       image/toolbar/capture_interfaces_24.png \
-       image/toolbar/capture_interfaces_24.svg \
-       image/toolbar/capture_pause_16.png      \
-       image/toolbar/capture_pause_16.svg      \
-       image/toolbar/capture_pause_24.png      \
-       image/toolbar/capture_pause_24.svg      \
-       image/toolbar/capture_prepare_16.xpm    \
-       image/toolbar/checkbox_16.xpm           \
-       image/toolbar/colorize_24.xpm           \
-       image/toolbar/conversations_16.xpm      \
-       image/toolbar/decode_24.xpm             \
-       image/toolbar/decode_as_16.xpm          \
-       image/toolbar/display_filter_24.xpm     \
-       image/toolbar/endpoints_16.xpm          \
-       image/toolbar/expert_info_16.xpm        \
-       image/toolbar/file_set_list_16.xpm      \
-       image/toolbar/file_set_next_16.xpm      \
-       image/toolbar/file_set_previous_16.xpm  \
-       image/toolbar/flow_graph_16.xpm \
-       image/toolbar/gnome_emblem_web_16.png   \
-       image/toolbar/gnome_emblem_web_24.png   \
-       image/toolbar/graphs_16.xpm     \
-       image/toolbar/icon_color_0.xpm  \
-       image/toolbar/icon_color_1.xpm  \
-       image/toolbar/icon_color_2.xpm  \
-       image/toolbar/icon_color_3.xpm  \
-       image/toolbar/icon_color_4.xpm  \
-       image/toolbar/icon_color_5.xpm  \
-       image/toolbar/icon_color_6.xpm  \
-       image/toolbar/icon_color_7.xpm  \
-       image/toolbar/icon_color_8.xpm  \
-       image/toolbar/icon_color_9.xpm  \
-       image/toolbar/internet_24.xpm   \
-       image/toolbar/modem_16.png      \
-       image/toolbar/modem_16.xpm      \
-       image/toolbar/network_bluetooth_16.png  \
-       image/toolbar/network_usb.svg           \
-       image/toolbar/network_usb_16.png        \
-       image/toolbar/network_virtual_16.xpm    \
-       image/toolbar/network_wired_16.png      \
-       image/toolbar/network_wireless_16.png   \
-       image/toolbar/pipe_16.png       \
-       image/toolbar/remote_arrow_16.png       \
-       image/toolbar/remote_globe_16.png       \
-       image/toolbar/remote_sat_16.png \
-       image/toolbar/resize_columns_24.xpm     \
-       image/toolbar/svg-to-png.sh     \
-       image/toolbar/svg/x-filter-apply.svg    \
-       image/toolbar/svg/x-filter-bookmark.svg \
-       image/toolbar/svg/x-filter-clear.svg    \
-       image/toolbar/telephone_16.xpm  \
-       image/toolbar/telephony_16.xpm  \
-       image/toolbar/time_24.xpm       \
-       image/toolbar/voip_flow_24.xpm  \
-       image/toolbar/web_support_24.xpm        \
-       image/toolbar/wep_closed_24.xpm \
-       image/tshark.rc.in      \
-       image/voip_select.xpm   \
-       image/wireshark.exe.manifest.in \
-       image/wireshark.ico     \
-       image/wireshark.rc.in   \
-       image/wiresharkdoc.ico  \
-       image/wiresharkinst.ico \
-       image/WiresharkDoc-16.png       \
-       image/WiresharkDoc-24.png       \
-       image/WiresharkDoc-32.png       \
-       image/WiresharkDoc-48.png       \
-       image/WiresharkDoc-64.png       \
-       image/WiresharkDoc-128.png      \
-       image/WiresharkDoc-256.png      \
-       image/wiretap.rc.in     \
-       image/wsicon.qrc        \
-       image/wsicon.svg        \
-       image/wsicon16.png      \
-       image/wsicon24.png      \
-       image/wsicon32.png      \
-       image/wsicon48.png      \
-       image/wsicon64.png      \
-       image/wsicon128.png     \
-       image/wsicon256.png     \
-       image/wsicon512.png     \
-       image/wsicon1024.png    \
-       image/wsicon-ask.png    \
-       image/wsicon-ask.svg    \
-       image/wsiconcap.svg     \
-       image/wsiconcap16.png   \
-       image/wsiconcap24.png   \
-       image/wsiconcap32.png   \
-       image/wsiconcap48.png   \
-       image/wsiconcap64.png   \
-       image/wsiconcap128.png  \
-       image/wsiconcap256.png  \
-       image/wsiconcap512.png  \
-       image/wsiconcap1024.png \
-       image/wsiconinst.svg    \
-       image/wsiconinst256.png \
-       image/wslogo-dev.svg    \
-       image/wslogo.eps        \
-       image/wslogo.svg        \
-       image/wssplash_dev.png  \
-       image/wssplash.png      \
+       enterprises.tsv         \
+       fix                     \
+       idl                     \
+       image                   \
        ipmap.html              \
-       macosx-setup.sh         \
-       macosx-support-lib-patches/glib-gconvert.c.patch \
-       macosx-support-lib-patches/glib-pkgconfig.patch \
-       macosx-support-lib-patches/gnutls-pkgconfig.patch \
-       macosx-support-lib-patches/portaudio-pa_mac_core.h.patch \
-       macosx-support-lib-patches/portaudio-pa_mac_core.c.patch \
-       macosx-support-lib-patches/qt-fix-pc-file \
-       macosx-support-lib-patches/qt-fix-pc-files \
+       m4                      \
+       macosx-support-lib-patches      \
        make-version.pl         \
        manuf                   \
        manuf.tmpl              \
-       mergecap.c              \
        pdml2html.xsl           \
-       reordercap.c            \
        smi_modules             \
        text2pcap-scanner.l     \
        text2pcap.h             \
        services                \
        wireshark.desktop       \
        wireshark-gtk.desktop   \
-       wireshark-mime-package.xml \
+       wireshark-mime-package.xml      \
        wireshark.appdata.xml   \
        wireshark.pc.in         \
-       wka.tmpl                \
+       wka                     \
        CMakeLists.txt          \
-       CMakeListsCustom.txt.example            \
+       CMakeListsCustom.txt.example    \
        cmakeconfig.h.in        \
-       wsutil/CMakeLists.txt   \
        CMakeOptions.txt        \
-       wiretap/CMakeLists.txt  \
-       README.cmake            \
        ConfigureChecks.cmake   \
-       cmake/modules/CheckCCompilerFlag.cmake  \
-       cmake/modules/CheckCLinkerFlag.cmake    \
-       cmake/modules/CMakeInstallDirs.cmake    \
-       cmake/modules/COPYING-CMAKE-SCRIPTS     \
-       cmake/modules/FindADNS.cmake            \
-       cmake/modules/FindAIRPCAP.cmake         \
-       cmake/modules/FindASCIIDOC.cmake        \
-       cmake/modules/FindCAP.cmake             \
-       cmake/modules/FindCARES.cmake           \
-       cmake/modules/FindChocolatey.cmake      \
-       cmake/modules/FindDOXYGEN.cmake         \
-       cmake/modules/FindFOP.cmake             \
-       cmake/modules/FindFreetype.cmake        \
-       cmake/modules/FindGCRYPT.cmake          \
-       cmake/modules/FindGEOIP.cmake           \
-       cmake/modules/FindGLIB2.cmake           \
-       cmake/modules/FindGMODULE2.cmake        \
-       cmake/modules/FindGNUTLS.cmake          \
-       cmake/modules/FindGTHREAD2.cmake        \
-       cmake/modules/FindGTK2.cmake            \
-       cmake/modules/FindGTK3.cmake            \
-       cmake/modules/FindHtmlViewer.cmake      \
-       cmake/modules/FindKERBEROS.cmake        \
-       cmake/modules/FindLEX.cmake             \
-       cmake/modules/FindLUA.cmake             \
-       cmake/modules/FindLYNX.cmake            \
-       cmake/modules/FindM.cmake               \
-       cmake/modules/FindMSVC_REDIST.cmake     \
-       cmake/modules/FindNL.cmake              \
-       cmake/modules/FindNSIS.cmake            \
-       cmake/modules/FindOS_X_FRAMEWORKS.cmake \
-       cmake/modules/FindPCAP.cmake            \
-       cmake/modules/FindPOD.cmake             \
-       cmake/modules/FindPortableApps.cmake    \
-       cmake/modules/FindPORTAUDIO.cmake       \
-       cmake/modules/FindPowerShell.cmake      \
-       cmake/modules/FindSBC.cmake             \
-       cmake/modules/FindSED.cmake             \
-       cmake/modules/FindSETCAP.cmake          \
-       cmake/modules/FindSH.cmake              \
-       cmake/modules/FindSMI.cmake             \
-       cmake/modules/FindLIBSSH.cmake  \
-       cmake/modules/FindWinSparkle.cmake      \
-       cmake/modules/FindWireshark.cmake       \
-       cmake/modules/FindWSWinLibs.cmake       \
-       cmake/modules/FindXMLLINT.cmake         \
-       cmake/modules/FindXSLTPROC.cmake        \
-       cmake/modules/FindYACC.cmake            \
-       cmake/modules/FindYAPP.cmake            \
-       cmake/modules/FindZLIB.cmake            \
-       cmake/modules/GenerateTestSh.cmake      \
-       cmake/modules/gmxTestLargeFiles.cmake   \
-       cmake/modules/hhc.cmake \
-       cmake/modules/LICENSE.txt               \
-       cmake/modules/LocatePythonExecutable.cmake      \
-       cmake/modules/LocatePythonModule.cmake  \
-       cmake/modules/readme.txt                \
-       cmake/modules/UseABICheck.cmake         \
-       cmake/modules/UseAsn2Wrs.cmake          \
-       cmake/modules/UseCheckAPI.cmake         \
-       cmake/modules/UseCustomIncludes.cmake           \
-       cmake/modules/UseLemon.cmake            \
-       cmake/modules/UseMakeDissectorReg.cmake \
-       cmake/modules/UseMakeTapReg.cmake       \
-       cmake/modules/UseWinLibs.cmake          \
-       cmake/modules/WiresharkConfig.cmake.in  \
-       cmake/modules/WiresharkConfigVersion.cmake.in \
-       cmake/modules/WiresharkPlugin.cmake     \
-       cmake/TestFileOffsetBits.c      \
-       cmake/TestLargeFiles.c.cmakein  \
-       cmake/TestWindowsFSeek.c        \
-       ui/win32/.editorconfig                  \
-       ui/win32/Makefile.nmake                 \
-       ui/win32/console_win32.c                \
-       ui/win32/console_win32.h                \
-       ui/win32/file_dlg_win32.c               \
-       ui/win32/file_dlg_win32.h               \
-       ui/win32/print_win32.c                  \
-       ui/win32/print_win32.h                  \
-       ui/win32/settings.ini                   \
-       version.h.in                            \
-       CPackConfig.txt
+       cmake
 
 install-exec-hook:
 if HAVE_DUMPCAP_GROUP
@@ -1356,13 +883,11 @@ endif
 
 
 DIST_SUBDIRS = \
-       asn1            \
        capchild        \
        caputils        \
        codecs          \
        doc             \
        epan            \
-       echld           \
        ui              \
        ui/cli          \
        ui/gtk          \
@@ -1373,6 +898,7 @@ DIST_SUBDIRS = \
        randpkt_core    \
        tools           \
        wiretap         \
+       writecap        \
        wsutil          \
        extcap          \
        docbook
@@ -1380,19 +906,20 @@ DIST_SUBDIRS = \
 SUBDIRS = \
        tools                   \
        wsutil                  \
+       writecap                \
        wiretap                 \
        epan                    \
        capchild                \
        caputils                \
-       @echld_dir@             \
        @plugins_dir@           \
        packaging               \
        help                    \
        ui                      \
+       codecs                  \
        @wireshark_SUBDIRS@     \
        ui/cli                  \
        randpkt_core            \
-       extcap                  \
+       @extcap_subdir@         \
        .                       \
        doc
 
@@ -1404,26 +931,6 @@ libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
 
-# Used by patch-bzip2
-# Trim off any extra version information and find the previous micro release.
-BASE_VERSION=`echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
-PREV_VERSION=`echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; if ($$3 > 0) $$3-- ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
-PREV_DIR="wireshark-$(PREV_VERSION)"
-PREV_FILE="$(PREV_DIR).tar.bz2"
-PREV_URL="https://www.wireshark.org/download/src/all-versions/$(PREV_FILE)"
-
-patch-bzip2: distdir
-       if test x$(BASE_VERSION) != x$(PREV_VERSION) ; then \
-               curl --time-cond $(PREV_FILE) --location --output $(PREV_FILE) $(PREV_URL) && \
-               tar -xjf $(PREV_FILE) && \
-               diff -urN $(PREV_DIR) $(distdir) | bzip2 > patch-wireshark-$(PREV_VERSION)-to-$(VERSION).bz2 && \
-               echo "Created patch-bzip2" ; \
-               rm -rf "$(PREV_FILE)" "$(PREV_DIR)" ; \
-       else \
-               echo "This appears to be the first micro version ($(PREV_VERSION)). Skipping." ; \
-       fi
-       $(am__remove_distdir)
-
 #
 # Install icons and other desktop files for (for use with GNOME, KDE, or
 # any other freedesktop.org-compliant desktops).
@@ -1467,12 +974,12 @@ patch-bzip2: distdir
 # FreeBSD install command has a -T flag that takes an argument and
 # that has completely different semantics.
 #
-# We neither need nor want any of this on OS X, nor do we want it if
+# We neither need nor want any of this on macOS, nor do we want it if
 # we're not building Wireshark (that being the only desktop app).
 #
 install-data-local:
 if BUILDING_WIRESHARK
-if NOT_OS_X
+if NOT_MACOS
        mkdir -p $(DESTDIR)$(datadir)/mime/packages
        install -m 644 $(srcdir)/wireshark-mime-package.xml $(DESTDIR)$(datadir)/mime/packages/wireshark.xml
        mkdir -p $(DESTDIR)$(datadir)/appdata
@@ -1497,7 +1004,7 @@ endif
 
 uninstall-local:
 if BUILDING_WIRESHARK
-if NOT_OS_X
+if NOT_MACOS
        rm -f $(DESTDIR)$(datadir)/appdata/wireshark.appdata.xml
        rm -f $(DESTDIR)$(datadir)/applications/wireshark.desktop
        rm -f $(DESTDIR)$(datadir)/applications/wireshark-gtk.desktop
@@ -1538,12 +1045,12 @@ uninstall-hook: update-databases-and-caches-uninstall
 # We only need to run gtk-update-icon-cache if we're installing a GTK+
 # version of Wireshark.
 #
-# We neither need nor want any of this on OS X, nor do we want it if
+# We neither need nor want any of this on macOS, nor do we want it if
 # we're not building Wireshark (that being the only desktop app).
 #
 update-databases-and-caches-common:
 if BUILDING_WIRESHARK
-if NOT_OS_X
+if NOT_MACOS
        @echo "You may need to run \"ldconfig\" as root"
        @echo "You may need to run \"update-desktop-database $(datadir)/applications\""
        @echo "You may need to run \"update-mime-database $(datadir)/mime\""
@@ -1581,21 +1088,22 @@ svr4-package: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA)
 
 
 rpm_topdir=`cd $(top_builddir) && pwd`/packaging/rpm
+if HAVE_RPM
 rpm-package: dist
-       @if test x$(HAVE_RPM) = xyes ; then \
-               cd $(rpm_topdir) ; \
-               mkdir -p BUILD RPMS SOURCES SRPMS; \
-               cd SOURCES ; \
-               ln -sf ../../../$(distdir).tar.bz2 ; \
-               cd .. ; \
-               rpmbuild --define "_topdir `cd . && pwd`" --define "_prefix $(prefix)" \
-                       @RPMBUILD_WITH_ARGS@ --clean -ba SPECS/wireshark.spec && \
-                       echo "Package successfully built in `pwd`/RPMS." && \
-                       rm -f SOURCES/$(distdir).tar.bz2 $(distdir).tar.bz2 ; \
-       else \
-               echo "Error: RPM executable and/or source directory not found." ; \
-               false; \
-       fi
+       @cd $(rpm_topdir) && \
+         mkdir -p BUILD RPMS SOURCES SRPMS && \
+         cd SOURCES && \
+         ln -sf ../../../$(distdir).tar.xz && \
+         cd .. && \
+         $(RPMBUILD) --define "_topdir `cd . && pwd`" --define "_prefix $(prefix)" \
+               @RPMBUILD_WITH_ARGS@ --clean -ba SPECS/wireshark.spec && \
+         echo "Package successfully built in `pwd`/RPMS." ; \
+         rm -f SOURCES/$(distdir).tar.xz ../../$(distdir).tar.xz
+else
+rpm-package:
+       @echo "'rpmbuild' executable not available." ; \
+         false
+endif
 
 # XXX - This assumes we're building from the source directory.
 osx-app: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) packaging/macosx/Info.plist
@@ -1610,7 +1118,7 @@ osx-app: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) packaging/macosx/Info.plist
                        --extcap-path ../staging/$(PACKAGE).inst$(extcapdir) \
                        --library-path ../staging/$(PACKAGE).inst$(libdir) ; \
        else \
-               echo "Error: OS X packaging tools not found." ; \
+               echo "Error: macOS packaging tools not found." ; \
                echo "Package build abandoned." ; \
        fi
 
@@ -1656,16 +1164,35 @@ checkapi: checkapi_local
        cd caputils && $(MAKE) checkapi
        cd ui && $(MAKE) checkapi
        cd ui/gtk && $(MAKE) checkapi
-##     cd epan && $(MAKE) checkapi
+       cd ui/cli && $(MAKE) checkapi
+       cd epan && $(MAKE) checkapi
        cd epan/crypt && $(MAKE) checkapi
        cd epan/dfilter && $(MAKE) checkapi
-##     cd epan/ftypes && $(MAKE) checkapi
+       cd epan/ftypes && $(MAKE) checkapi
+       cd epan/wmem && $(MAKE) checkapi
        cd epan/wslua && $(MAKE) checkapi
        cd epan/dissectors && $(MAKE) checkapi
        cd plugins && $(MAKE) checkapi
        cd randpkt_core && $(MAKE) checkapi
+       cd writecap && $(MAKE) checkapi
        cd wsutil && $(MAKE) checkapi
 
+if HAVE_SHELLCHECK
+# --external-sources requires 0.4.0 or later.
+shellcheck:
+       cd $(top_srcdir) && \
+       shellcheck --external-sources \
+         tools/fuzz-test.sh \
+         tools/randpkt-test.sh \
+         tools/runa2x.sh \
+         tools/test-captures.sh \
+         tools/valgrind-wireshark.sh
+else
+shellcheck:
+       @echo "Shellcheck not available." ; \
+         false
+endif
+
 wsar_html: doxygen.cfg doxygen_global.cfg FORCE
 if HAVE_DOXYGEN
        rm -rf wsar_html
@@ -1683,7 +1210,10 @@ if HAVE_DOXYGEN
        zip -rq wsar_html.zip wsar_html
 endif
 
+# Update AUTHORS file with entries from git shortlog
 gen-authors:
-#Generate list of AUTHORS (Name + E-Mail) sort by number of commit
-       git --no-pager shortlog -sne HEAD > $(top_srcdir)/AUTHORS.git
-       $(PERL) $(top_srcdir)/tools/generate_authors.pl $(top_srcdir)/AUTHORS.src $(top_srcdir)/AUTHORS.git > $(top_srcdir)/AUTHORS
+       cd $(top_srcdir) && $(PERL) tools/generate_authors.pl AUTHORS.src > AUTHORS
+
+dist-hook:
+       printf "git_description=%s\n" "$$(git -C $(top_srcdir) describe --match 'v[1-9]*')" \
+               > $(top_distdir)/version.conf