Qt: add initializers (CID 1162824).

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

diff --git a/Makefile.am b/Makefile.am
index d0e9378fe3c7b14ea0753fd58dd3e0994db1c7e6..d771aeb33de8d0b9005a1a4b4398f63e38c2875e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,7 @@ EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype \
 # 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
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = wireshark.pc
@@ -84,6 +84,7 @@ dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \
        diameter/eap.xml \
        diameter/Ericsson.xml \
        diameter/etsie2e4.xml \
+       diameter/Inovar.xml \
        diameter/Juniper.xml \
        diameter/mobileipv4.xml \
        diameter/mobileipv6.xml \
@@ -134,13 +135,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 \
@@ -155,16 +156,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 \
@@ -176,13 +177,14 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        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 \
@@ -191,7 +193,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 \
@@ -216,8 +217,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 \
@@ -310,6 +311,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 \
@@ -586,6 +588,10 @@ sharkd_SOURCES = \
 
 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.
@@ -603,6 +609,10 @@ sharkd_LDADD = \
        @SYSTEMCONFIGURATION_FRAMEWORKS@        \
        @COREFOUNDATION_FRAMEWORKS@
 
+if HAVE_SPEEXDSP
+sharkd_LDADD += $(SPEEXDSP_LIBS)
+endif
+
 text2pcap_SOURCES = \
        text2pcap.c             \
        text2pcap-scanner.l     \
@@ -630,6 +640,7 @@ 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@
@@ -642,6 +653,7 @@ 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@                     \
@@ -655,6 +667,7 @@ 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@
@@ -681,6 +694,7 @@ 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@
@@ -694,6 +708,7 @@ 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@                     \
@@ -831,6 +846,7 @@ EXTRA_DIST = \
        dfilters                \
        doxygen_global.cfg      \
        doxygen.cfg.in          \
+       enterprises.tsv         \
        fix                     \
        idl                     \
        image                   \
@@ -973,7 +989,7 @@ libtool: $(LIBTOOL_DEPS)
 #
 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
@@ -998,7 +1014,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
@@ -1044,7 +1060,7 @@ uninstall-hook: update-databases-and-caches-uninstall
 #
 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\""