diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Makefile.common | 4 | ||||
| -rw-r--r-- | ui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ui/Makefile.common | 6 | ||||
| -rw-r--r-- | ui/cli/tap-megacostat.c | 2 | ||||
| -rw-r--r-- | ui/cli/tap-rtp.c | 2 | ||||
| -rw-r--r-- | ui/gtk/megaco_stat.c | 2 | ||||
| -rw-r--r-- | ui/gtk/rtp_stream.c | 2 | ||||
| -rw-r--r-- | ui/qt/QtShark.pro | 2 | ||||
| -rw-r--r-- | ui/tap-megaco-common.c (renamed from tap-megaco-common.c) | 0 | ||||
| -rw-r--r-- | ui/tap-megaco-common.h (renamed from tap-megaco-common.h) | 0 | ||||
| -rw-r--r-- | ui/tap-rtp-common.c (renamed from tap-rtp-common.c) | 0 | ||||
| -rw-r--r-- | ui/tap-rtp-common.h (renamed from tap-rtp-common.h) | 0 |
13 files changed, 12 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7fa4b2a62..46826ba11e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -659,8 +659,6 @@ set(WIRESHARK_COMMON_SRC ps.c svnversion.h sync_pipe_write.c - tap-megaco-common.c - tap-rtp-common.c version_info.c ) @@ -840,6 +838,7 @@ register_tap_files(tshark-tap-register.c if(BUILD_tshark) set(tshark_LIBS + ui ${LIBEPAN_LIBS} ${APPLE_CORE_FOUNDATION_LIBRARY} ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} @@ -849,7 +848,6 @@ if(BUILD_tshark) capture_sync.c tshark-tap-register.c tshark.c - ui/util.c ${TSHARK_TAP_SRC} ${SHARK_COMMON_CAPTURE_SRC} ${WIRESHARK_COMMON_SRC} diff --git a/Makefile.common b/Makefile.common index f86b4a3034..79880dc534 100644 --- a/Makefile.common +++ b/Makefile.common @@ -56,8 +56,6 @@ SHARK_COMMON_SRC = \ print.c \ ps.c \ sync_pipe_write.c \ - tap-megaco-common.c \ - tap-rtp-common.c \ version_info.c # corresponding headers @@ -79,8 +77,6 @@ SHARK_COMMON_INCLUDES = \ print.h \ ps.h \ register.h \ - tap-megaco-common.h \ - tap-rtp-common.h \ version_info.h \ ws_symbol_export.h diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 14e1ed2c10..bb60ba8505 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -35,6 +35,8 @@ set(COMMON_UI_SRC recent.c ssl_key_export.c software_update.c + tap-megaco-common.c + tap-rtp-common.c text_import.c time_shift.c util.c diff --git a/ui/Makefile.common b/ui/Makefile.common index d7d4381d5f..0c513092cf 100644 --- a/ui/Makefile.common +++ b/ui/Makefile.common @@ -45,7 +45,7 @@ GENERATOR_FILES = \ WIRESHARK_UI_SRC = \ alert_box.c \ - export_object.c \ + export_object.c \ export_object_dicom.c \ export_object_http.c \ export_object_smb.c \ @@ -56,6 +56,8 @@ WIRESHARK_UI_SRC = \ recent.c \ software_update.c \ ssl_key_export.c \ + tap-megaco-common.c \ + tap-rtp-common.c \ text_import.c \ time_shift.c \ util.c @@ -77,6 +79,8 @@ noinst_HEADERS = \ simple_dialog.h \ software_update.h \ ssl_key_export.h \ + tap-megaco-common.h \ + tap-rtp-common.h \ text_import.h \ text_import_scanner.h \ time_shift.h \ diff --git a/ui/cli/tap-megacostat.c b/ui/cli/tap-megacostat.c index a56756e9eb..546d2c65b8 100644 --- a/ui/cli/tap-megacostat.c +++ b/ui/cli/tap-megacostat.c @@ -37,7 +37,7 @@ #include "epan/timestats.h" #include <epan/prefs-int.h> -#include "tap-megaco-common.h" +#include "ui/tap-megaco-common.h" diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c index f81966bbe0..c07b1a29f3 100644 --- a/ui/cli/tap-rtp.c +++ b/ui/cli/tap-rtp.c @@ -45,7 +45,7 @@ #include <epan/rtp_pt.h> #include <epan/stat_cmd_args.h> #include <epan/addr_resolv.h> -#include "tap-rtp-common.h" +#include "ui/tap-rtp-common.h" /* The one and only global rtpstream_tapinfo_t structure for tshark and wireshark. */ diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c index 4f4ea35340..6e6a9b2914 100644 --- a/ui/gtk/megaco_stat.c +++ b/ui/gtk/megaco_stat.c @@ -49,7 +49,7 @@ #include "ui/gtk/gui_utils.h" #include "ui/gtk/main.h" -#include "tap-megaco-common.h" +#include "ui/tap-megaco-common.h" #include "ui/gtk/old-gtk-compat.h" diff --git a/ui/gtk/rtp_stream.c b/ui/gtk/rtp_stream.c index c3d9dee37d..766e7c97dc 100644 --- a/ui/gtk/rtp_stream.c +++ b/ui/gtk/rtp_stream.c @@ -43,7 +43,7 @@ #include "../globals.h" #include "ui/alert_box.h" #include "ui/simple_dialog.h" -#include "../tap-rtp-common.h" +#include "ui/tap-rtp-common.h" #include <wsutil/file_util.h> #include "ui/gtk/rtp_stream.h" diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index d5474a8fdd..deed489c79 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -185,8 +185,6 @@ SOURCES_WS_C = \ ../../ps.c \ ../../summary.c \ ../../sync_pipe_write.c \ - ../../tap-megaco-common.c \ - ../../tap-rtp-common.c \ ../../u3.c \ ../../version_info.c diff --git a/tap-megaco-common.c b/ui/tap-megaco-common.c index 4da9654fc7..4da9654fc7 100644 --- a/tap-megaco-common.c +++ b/ui/tap-megaco-common.c diff --git a/tap-megaco-common.h b/ui/tap-megaco-common.h index 801abacd9a..801abacd9a 100644 --- a/tap-megaco-common.h +++ b/ui/tap-megaco-common.h diff --git a/tap-rtp-common.c b/ui/tap-rtp-common.c index 0a93675bd0..0a93675bd0 100644 --- a/tap-rtp-common.c +++ b/ui/tap-rtp-common.c diff --git a/tap-rtp-common.h b/ui/tap-rtp-common.h index 003f4f4771..003f4f4771 100644 --- a/tap-rtp-common.h +++ b/ui/tap-rtp-common.h |