Remove some references to PortAudio.

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

diff --git a/Makefile.am b/Makefile.am
index 3f381f8a0efcf6f99d8a9688fe263e11af4b48d4..6447a3984697fd07439ce50f95e9f49c32e839fa 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,7 +53,7 @@ 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).
@@ -104,7 +105,8 @@ dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \
        diameter/NokiaSolutionsAndNetworks.xml \
        diameter/HP.xml \
        diameter/Huawei.xml \
-       diameter/Oracle.xml
+       diameter/Oracle.xml \
+       diameter/VerizonWireless.xml
 
 #
 # Install the DTDs directory files in the "dtds" subdirectory
@@ -420,10 +422,6 @@ if HAVE_Qt
 wireshark_SOURCES = $(WIRESHARK_COMMON_SRC) wireshark-qt.cpp
 
 wireshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(Qt_CFLAGS)
-# Define compatibility macros for Qt 4.8
-if HAVE_QT_VERSION_4
-wireshark_CPPFLAGS += -DQ_NULLPTR=NULL
-endif
 
 wireshark_LDFLAGS = $(AM_LDFLAGS) $(Qt_LDFLAGS)
 
@@ -531,6 +529,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                \
@@ -896,20 +899,20 @@ libtool: $(LIBTOOL_DEPS)
 install-data-local:
 if BUILDING_WIRESHARK
        $(MKDIR_P) $(DESTDIR)$(datadir)/mime/packages
-       $(INSTALL) -m 644 $(srcdir)/wireshark-mime-package.xml $(DESTDIR)$(datadir)/mime/packages/wireshark.xml
+       $(INSTALL_DATA) $(srcdir)/wireshark-mime-package.xml $(DESTDIR)$(datadir)/mime/packages/wireshark.xml
        $(MKDIR_P) $(DESTDIR)$(datadir)/appdata
-       $(INSTALL) -m 644 $(srcdir)/wireshark.appdata.xml $(DESTDIR)$(datadir)/appdata/wireshark.appdata.xml
+       $(INSTALL_DATA) $(srcdir)/wireshark.appdata.xml $(DESTDIR)$(datadir)/appdata/wireshark.appdata.xml
        $(MKDIR_P) $(DESTDIR)$(datadir)/applications
-       $(INSTALL) -m 644 $(srcdir)/wireshark.desktop $(srcdir)/wireshark-gtk.desktop $(DESTDIR)$(datadir)/applications
+       $(INSTALL_DATA) $(srcdir)/wireshark.desktop $(srcdir)/wireshark-gtk.desktop $(DESTDIR)$(datadir)/applications
        for size in 16 24 32 48 64 128 256; \
        do \
                $(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps ; \
-               $(INSTALL) -m 644 $(srcdir)/image/wsicon$${size}.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/wireshark.png ; \
+               $(INSTALL_DATA) $(srcdir)/image/wsicon$${size}.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/wireshark.png ; \
                $(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/mimetypes ; \
-               $(INSTALL) -m 644 $(srcdir)/image/WiresharkDoc-$${size}.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/mimetypes/application-wireshark-doc.png ; \
+               $(INSTALL_DATA) $(srcdir)/image/WiresharkDoc-$${size}.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/mimetypes/application-wireshark-doc.png ; \
        done
        $(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
-       $(INSTALL) -m 644 $(srcdir)/image/wsicon.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/wireshark.svg
+       $(INSTALL_DATA) $(srcdir)/image/wsicon.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/wireshark.svg
 endif
 
 uninstall-local: