git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
osx-app.sh fixups.
[metze/wireshark/wip.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 1b9f743350d6db426337bc7c77c7b068879d8f0b..665e37e621efb858fe58308ed778ec3b0683d7f8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,10 +42,11 @@ bin_PROGRAMS = \
        @dumpcap_bin@           \
        @reordercap_bin@        \
        @rawshark_bin@          \
+       @androiddump_bin@       \
        @echld_test_bin@
 
 EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype editcap \
-       mergecap dftest randpkt text2pcap dumpcap reordercap rawshark \
+       mergecap dftest randpkt text2pcap dumpcap reordercap rawshark androiddump \
        echld_test
 
 #
@@ -70,7 +71,6 @@ diameterdir = $(pkgdatadir)/diameter
 include diameter/Custom.make
 dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \
        diameter/chargecontrol.xml \
-       diameter/ChinaTelecom.xml \
        diameter/Cisco.xml \
        diameter/Custom.xml \
        diameter/dictionary.dtd \
@@ -90,9 +90,8 @@ dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \
        diameter/AlcatelLucent.xml \
        diameter/Nokia.xml \
        diameter/NokiaSolutionsAndNetworks.xml \
-       diameter/SKT.xml \
        diameter/HP.xml \
-       diameter/VerizonWireless.xml
+       diameter/Oracle.xml
 
 #
 # Install the DTDs directory files in the "dtds" subdirectory
@@ -236,6 +235,7 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        radius/dictionary.packeteer \
        radius/dictionary.paloalto \
        radius/dictionary.patton \
+       radius/dictionary.perle \
        radius/dictionary.propel \
        radius/dictionary.prosoft \
        radius/dictionary.proxim \
@@ -273,10 +273,12 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        radius/dictionary.rfc7055 \
        radius/dictionary.rfc7155 \
        radius/dictionary.rfc7268 \
+       radius/dictionary.rfc7499 \
        radius/dictionary.riverbed \
        radius/dictionary.riverstone \
-       radius/dictionary.ruckus \
        radius/dictionary.roaringpenguin \
+       radius/dictionary.ruckus \
+       radius/dictionary.ruggedcom \
        radius/dictionary.sg \
        radius/dictionary.shasta \
        radius/dictionary.shiva \
@@ -294,6 +296,7 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
        radius/dictionary.telkom \
        radius/dictionary.terena \
        radius/dictionary.trapeze \
+       radius/dictionary.travelping \
        radius/dictionary.tropos \
        radius/dictionary.ukerna \
        radius/dictionary.unix \
@@ -369,7 +372,7 @@ if HAVE_GTK
 wireshark_gtk_LDFLAGS = -export-dynamic
 endif
 if HAVE_Qt
-wireshark_LDFLAGS = -export-dynamic
+wireshark_LDFLAGS = -export-dynamic @Qt_LDFLAGS@
 endif
 endif
 
@@ -416,6 +419,7 @@ wireshark_common_ldadd = \
        @LIBGCRYPT_LIBS@                \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@                \
+       @SBC_LIBS@                      \
        @GLIB_LIBS@
 
 if HAVE_Qt
@@ -528,6 +532,21 @@ rawshark_LDADD = \
 
 rawshark_CFLAGS = $(AM_CLEAN_CFLAGS)
 
+if ENABLE_STATIC
+androiddump_LDFLAGS = -Wl,-static -all-static
+else
+androiddump_LDFLAGS = -export-dynamic
+endif
+
+# Libraries and plugin flags with which to link androiddump.
+androiddump_LDADD = \
+       wiretap/libwiretap.la           \
+       wsutil/libwsutil.la             \
+       @GLIB_LIBS@                     \
+       @SOCKET_LIBS@
+
+androiddump_CFLAGS = $(AM_CLEAN_CFLAGS)
+
 # Libraries with which to link text2pcap.
 text2pcap_LDADD = \
        wsutil/libwsutil.la             \
@@ -644,7 +663,7 @@ dumpcap_LDFLAGS = $(PIE_LDFLAGS)
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
        $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) \
-       @LUA_INCLUDES@ -DTOP_SRCDIR=\"$(abs_top_srcdir)\"
+       @LUA_CFLAGS@ $(SBC_CFLAGS) -DTOP_SRCDIR=\"$(abs_top_srcdir)\"
 
 #
 # Build the version string
@@ -873,33 +892,12 @@ EXTRA_DIST = \
        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/dfilter_apply_disabled.png        \
-       image/dfilter_apply_hover.png           \
-       image/dfilter_apply_normal.png          \
-       image/dfilter_apply_pressed.png         \
-       image/dfilter_bookmark_disabled.png     \
-       image/dfilter_bookmark_hover.png        \
-       image/dfilter_bookmark_normal.png       \
-       image/dfilter_bookmark_pressed.png      \
-       image/dfilter_dropdown.png              \
-       image/dfilter_erase_active.png          \
-       image/dfilter_erase_normal.png          \
-       image/dfilter_erase_selected.png        \
-       image/dfilter_refresh_active.png        \
-       image/dfilter_refresh_normal.png        \
-       image/display_filter.qrc                \
        image/dumpcap.rc.in     \
        image/editcap.rc.in     \
-       image/expert_chat.png   \
-       image/expert_error.png  \
-       image/expert_indicators.svg     \
-       image/expert_none.png   \
-       image/expert_note.png   \
-       image/expert_ok.png     \
-       image/expert_warn.png   \
        image/file_dlg_win32.rc \
        image/hi16-app-wireshark.png    \
        image/hi32-app-wireshark.png    \
@@ -912,11 +910,17 @@ EXTRA_DIST = \
        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/libwireshark.rc.in        \
        image/libwsutil.rc.in           \
        image/lo16-app-wireshark.png    \
@@ -933,7 +937,6 @@ EXTRA_DIST = \
        image/README.image                      \
        image/reordercap.rc.in                  \
        image/rubberband-16.png                 \
-       image/status.qrc                        \
        image/stock_dialog_error_48.xpm         \
        image/stock_dialog_info_48.xpm          \
        image/stock_dialog_question_48.xpm      \
@@ -941,9 +944,50 @@ EXTRA_DIST = \
        image/stock_dialog_warning_48.xpm       \
        image/text2pcap.rc.in                   \
        image/tfshark.rc.in                     \
-       image/toolbar/12x12/media-playback-start.png    \
-       image/toolbar/12x12/media-playback-start.svg    \
-       image/toolbar/12x12/media-playback-start@2x.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-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-bookmark.active.png \
+       image/toolbar/14x14/x-filter-bookmark.active.svg \
+       image/toolbar/14x14/x-filter-bookmark.active@2x.png \
+       image/toolbar/14x14/x-filter-bookmark.png \
+       image/toolbar/14x14/x-filter-bookmark.selected.png \
+       image/toolbar/14x14/x-filter-bookmark.selected.svg \
+       image/toolbar/14x14/x-filter-bookmark.selected@2x.png \
+       image/toolbar/14x14/x-filter-bookmark.svg \
+       image/toolbar/14x14/x-filter-bookmark@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            \
@@ -969,6 +1013,7 @@ EXTRA_DIST = \
        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  \
@@ -1012,6 +1057,15 @@ EXTRA_DIST = \
        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    \
@@ -1037,6 +1091,7 @@ EXTRA_DIST = \
        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          \
@@ -1092,7 +1147,13 @@ EXTRA_DIST = \
        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           \
@@ -1134,12 +1195,15 @@ EXTRA_DIST = \
        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/toolbar/wep_closed_24.xpm \
        image/tshark.rc.in      \
        image/voip_select.xpm   \
        image/wireshark.exe.manifest.in \
@@ -1206,9 +1270,11 @@ EXTRA_DIST = \
        services                \
        wireshark.desktop       \
        wireshark-mime-package.xml \
+       wireshark.appdata.xml   \
        wireshark.pc.in         \
        wka.tmpl                \
        CMakeLists.txt          \
+       CMakeListsCustom.txt.example            \
        cmakeconfig.h.in        \
        wsutil/CMakeLists.txt   \
        CMakeOptions.txt        \
@@ -1243,15 +1309,19 @@ EXTRA_DIST = \
        cmake/modules/FindLYNX.cmake            \
        cmake/modules/FindM.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/FindWinSparkle.cmake      \
        cmake/modules/FindWireshark.cmake       \
        cmake/modules/FindWSWinLibs.cmake       \
        cmake/modules/FindXMLLINT.cmake         \
@@ -1259,20 +1329,24 @@ EXTRA_DIST = \
        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        \
@@ -1284,6 +1358,7 @@ EXTRA_DIST = \
        ui/win32/print_win32.c                  \
        ui/win32/print_win32.h                  \
        ui/win32/settings.ini                   \
+       version.h.in                            \
        CPackConfig.txt
 
 install-exec-hook:
@@ -1417,6 +1492,8 @@ if BUILDING_WIRESHARK
 if NOT_OS_X
        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
+       install -m 644 $(srcdir)/wireshark.appdata.xml $(DESTDIR)$(datadir)/appdata/wireshark.appdata.xml
        mkdir -p $(DESTDIR)$(datadir)/applications
        if test x$(DESKTOP_FILE_INSTALL) != x ; then \
                $(DESKTOP_FILE_INSTALL) --dir $(DESTDIR)$(datadir)/applications $(srcdir)/wireshark.desktop; \
@@ -1438,8 +1515,9 @@ endif
 uninstall-local:
 if BUILDING_WIRESHARK
 if NOT_OS_X
-       rm -f $(DESTDIR)$(datadir)/mime/packages/wireshark.xml
+       rm -f $(DESTDIR)$(datadir)/appdata/wireshark.appdata.xml
        rm -f $(DESTDIR)$(datadir)/applications/wireshark.desktop
+       rm -f $(DESTDIR)$(datadir)/mime/packages/wireshark.xml
        for size in 16 24 32 48 64 128 256; \
        do \
                rm -f $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/wireshark.png ; \
@@ -1566,6 +1644,9 @@ osx-install: osx-app
                cp -pr $(srcdir)/packaging/macosx/Wireshark.app /Applications ; \
        fi
 
+test-programs:
+       cd epan && $(MAKE) $@
+
 clean-local:
        rm -rf $(top_stagedir)
 
@@ -1594,6 +1675,7 @@ checkapi: checkapi_local
 ##     cd epan/ftypes && $(MAKE) checkapi
 ##     cd epan/wslua && $(MAKE) checkapi
        cd epan/dissectors && $(MAKE) checkapi
+       cd epan/dissectors/dcerpc && $(MAKE) checkapi
        cd plugins && $(MAKE) checkapi
        cd wsutil && $(MAKE) checkapi
 
Unnamed repository; edit this file to name it for gitweb.