diff options
Diffstat (limited to 'ui')
35 files changed, 47 insertions, 49 deletions
diff --git a/ui/Makefile.am b/ui/Makefile.am index 80904eb5a2..4b409209fd 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -23,8 +23,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS += -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) \ - $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) +AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) noinst_LIBRARIES = libui.a libui_dirty.a diff --git a/ui/Makefile.nmake b/ui/Makefile.nmake index e6ec01e5ea..55fe06d036 100644 --- a/ui/Makefile.nmake +++ b/ui/Makefile.nmake @@ -11,7 +11,7 @@ include ..\Makefile.nmake.inc GENERATED_CFLAGS=\ $(STANDARD_CFLAGS) \ /Zm800 \ - /I.. /I../wiretap $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \ + /I.. $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \ /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am index 0ad3b8e757..3242543d41 100644 --- a/ui/cli/Makefile.am +++ b/ui/cli/Makefile.am @@ -22,8 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS += -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) \ - $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) +AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) noinst_LIBRARIES = libcliui.a diff --git a/ui/cli/Makefile.nmake b/ui/cli/Makefile.nmake index 09c7414e33..f7e9a89b37 100644 --- a/ui/cli/Makefile.nmake +++ b/ui/cli/Makefile.nmake @@ -11,7 +11,7 @@ include ..\..\Makefile.nmake.inc GENERATED_CFLAGS=\ $(STANDARD_CFLAGS) \ /Zm800 \ - /I../.. /I../../wiretap $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \ + /I../.. $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \ /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am index 4a2b8121b2..4abaa5402b 100644 --- a/ui/gtk/Makefile.am +++ b/ui/gtk/Makefile.am @@ -22,7 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS += -I$(top_srcdir)/wiretap $(PORTAUDIO_INCLUDES) +AM_CPPFLAGS += $(PORTAUDIO_INCLUDES) CLEANFILES = \ libgtkui.a \ diff --git a/ui/gtk/Makefile.nmake b/ui/gtk/Makefile.nmake index fee391f428..024e14f192 100644 --- a/ui/gtk/Makefile.nmake +++ b/ui/gtk/Makefile.nmake @@ -11,7 +11,7 @@ include ..\..\Makefile.nmake.inc GENERATED_CFLAGS=\ $(STANDARD_CFLAGS) \ /Zm800 \ - /I../.. /I../../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \ + /I../.. $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)\WPCAP\LIBPCAP \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index 9c0ad96742..a52a9aee97 100644 --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c @@ -40,8 +40,8 @@ #include <epan/wslua/init_wslua.h> #endif -#include "../log.h" -#include "../register.h" +#include "../../log.h" +#include "../../register.h" #include "ui/last_open_dir.h" diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index abb3fd00ae..a1e375b475 100644 --- a/ui/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.c @@ -39,7 +39,7 @@ #include "ui/capture.h" #include "caputils/capture_ifinfo.h" #include "caputils/capture-pcap-util.h" -#include "../ringbuffer.h" +#include "../../ringbuffer.h" #include "ui/capture_ui_utils.h" #include "ui/capture_globals.h" diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index 53ec896e0b..c78da6595f 100644 --- a/ui/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.c @@ -31,7 +31,7 @@ #include <epan/prefs.h> #include <epan/to_str.h> -#include "../capture_opts.h" +#include "../../capture_opts.h" #include <capchild/capture_session.h> #include "caputils/capture_ifinfo.h" #include "ui/capture.h" diff --git a/ui/gtk/capture_info_dlg.c b/ui/gtk/capture_info_dlg.c index d78eee51bf..403a1e900b 100644 --- a/ui/gtk/capture_info_dlg.c +++ b/ui/gtk/capture_info_dlg.c @@ -32,7 +32,7 @@ #include <epan/capture_dissectors.h> #include "ui/capture.h" -#include "../capture_info.h" +#include "../../capture_info.h" #include "ui/capture_ui_utils.h" diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c index e1cae02d79..8f0d390c3e 100644 --- a/ui/gtk/drag_and_drop.c +++ b/ui/gtk/drag_and_drop.c @@ -27,7 +27,7 @@ #include <gtk/gtk.h> -#include "../file.h" +#include "../../file.h" #ifdef HAVE_LIBPCAP #include "ui/capture.h" #endif diff --git a/ui/gtk/export_pdu_dlg.c b/ui/gtk/export_pdu_dlg.c index 0dec7a0254..1bc5be7b32 100644 --- a/ui/gtk/export_pdu_dlg.c +++ b/ui/gtk/export_pdu_dlg.c @@ -25,7 +25,7 @@ #include <gtk/gtk.h> #include "globals.h" -#include "pcap-encap.h" +#include <wiretap/pcap-encap.h> #include <epan/exported_pdu.h> diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c index 958d12e221..86248d73fa 100644 --- a/ui/gtk/file_import_dlg.c +++ b/ui/gtk/file_import_dlg.c @@ -28,7 +28,7 @@ #include <stdlib.h> #include "globals.h" -#include "pcap-encap.h" +#include "wiretap/pcap-encap.h" #include "ui/simple_dialog.h" #include "ui/alert_box.h" diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c index 44407865eb..fb0aadba18 100644 --- a/ui/gtk/fileset_dlg.c +++ b/ui/gtk/fileset_dlg.c @@ -29,7 +29,7 @@ #include <wsutil/filesystem.h> #include <wsutil/str_util.h> -#include "../fileset.h" +#include "../../fileset.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/find_dlg.c b/ui/gtk/find_dlg.c index 7b85f07f7e..3b3962f533 100644 --- a/ui/gtk/find_dlg.c +++ b/ui/gtk/find_dlg.c @@ -29,7 +29,7 @@ #include <epan/strutil.h> #include <epan/prefs.h> -#include "../globals.h" +#include "../../globals.h" #include "ui/main_statusbar.h" #include "ui/gtk/old-gtk-compat.h" diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c index 4948efa4d9..4f246d9b77 100644 --- a/ui/gtk/goto_dlg.c +++ b/ui/gtk/goto_dlg.c @@ -28,7 +28,7 @@ #include <stdlib.h> -#include "../globals.h" +#include "../../globals.h" #include "ui/simple_dialog.h" #include "ui/gtk/goto_dlg.h" diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 5ceaf00255..5e0d8677a7 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -98,13 +98,13 @@ #include <wsutil/plugins.h> /* general (not GTK specific) */ -#include "../file.h" -#include "../frame_tvbuff.h" -#include "../summary.h" +#include "../../file.h" +#include "../../frame_tvbuff.h" +#include "../../summary.h" #include <epan/color_filters.h> -#include "../register.h" -#include "../ringbuffer.h" -#include "../log.h" +#include "../../register.h" +#include "../../ringbuffer.h" +#include "../../log.h" #include "gtk_iface_monitor.h" diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index afaec60d42..1e5d2ea56f 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -34,10 +34,10 @@ #include <epan/expert.h> #include <epan/prefs.h> -#include "../cfile.h" -#include "../file.h" +#include "../../cfile.h" +#include "../../file.h" #ifdef HAVE_LIBPCAP -#include "../capture_opts.h" +#include "../../capture_opts.h" #include <capchild/capture_session.h> #include "ui/capture.h" #endif diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c index d5d1d161a5..21ce49134f 100644 --- a/ui/gtk/main_toolbar.c +++ b/ui/gtk/main_toolbar.c @@ -30,7 +30,7 @@ #include <epan/prefs.h> -#include "../cfile.h" +#include "../../cfile.h" #include <gtk/gtk.h> diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c index a36673ce97..6d8d535ec6 100644 --- a/ui/gtk/mcast_stream_dlg.c +++ b/ui/gtk/mcast_stream_dlg.c @@ -37,7 +37,7 @@ #include <epan/addr_resolv.h> -#include "../globals.h" +#include "../../globals.h" #include <epan/stat_groups.h> #include "ui/simple_dialog.h" diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index a50475053a..179988b901 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -50,8 +50,8 @@ #include <epan/tvbuff-int.h> #include <epan/print.h> -#include "../file.h" -#include "../summary.h" +#include "../../file.h" +#include "../../summary.h" #include "ui/recent.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/proto_help.c b/ui/gtk/proto_help.c index 79cafd4b0a..8632febc34 100644 --- a/ui/gtk/proto_help.c +++ b/ui/gtk/proto_help.c @@ -34,7 +34,7 @@ #include <gtk/gtk.h> -#include "../file.h" +#include "../../file.h" #include "ui/gtk/proto_help.h" diff --git a/ui/gtk/range_utils.c b/ui/gtk/range_utils.c index 56cb90dc8c..0c9438ba84 100644 --- a/ui/gtk/range_utils.c +++ b/ui/gtk/range_utils.c @@ -26,7 +26,7 @@ #include <gtk/gtk.h> -#include "../globals.h" +#include "../../globals.h" #include "ui/simple_dialog.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c index 4d8ae51280..b3590c91e3 100644 --- a/ui/gtk/rlc_lte_graph.c +++ b/ui/gtk/rlc_lte_graph.c @@ -39,8 +39,8 @@ #include <epan/dissectors/packet-rlc-lte.h> #include <epan/tap.h> -#include "../globals.h" -#include "../frame_tvbuff.h" +#include "../../globals.h" +#include "../../frame_tvbuff.h" #include "ui/simple_dialog.h" #include <epan/stat_groups.h> diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index e87549ea43..3b55f95e44 100644 --- a/ui/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -32,7 +32,7 @@ #include <epan/addr_resolv.h> #include "wsutil/filesystem.h" -#include "../globals.h" +#include "../../globals.h" #include <epan/stat_groups.h> #include "ui/last_open_dir.h" diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c index 122e6aa0a1..84d8f9a1e4 100644 --- a/ui/gtk/summary_dlg.c +++ b/ui/gtk/summary_dlg.c @@ -30,8 +30,8 @@ #include <wsutil/ws_version_info.h> -#include "../file.h" -#include "../summary.h" +#include "../../file.h" +#include "../../summary.h" #ifdef HAVE_LIBPCAP #include "ui/capture.h" diff --git a/ui/gtk/supported_protos_dlg.c b/ui/gtk/supported_protos_dlg.c index 6fd5b79756..d1eda40d52 100644 --- a/ui/gtk/supported_protos_dlg.c +++ b/ui/gtk/supported_protos_dlg.c @@ -29,7 +29,7 @@ #include <epan/prefs.h> -#include "../globals.h" +#include "../../globals.h" #include "ui/gtk/supported_protos_dlg.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index 5818c26971..4fd0be60ae 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -28,7 +28,7 @@ #include <gtk/gtk.h> -#include "../globals.h" +#include "../../globals.h" #include <epan/stat_groups.h> #include "ui/gtk/old-gtk-compat.h" diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c index 58d0adae3b..d969a2007f 100644 --- a/ui/gtk/voip_calls_dlg.c +++ b/ui/gtk/voip_calls_dlg.c @@ -43,7 +43,7 @@ #include <wsutil/str_util.h> -#include "../globals.h" +#include "../../globals.h" #include "ui/voip_calls.h" diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index b8a0ecf7dc..f276a9663f 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -22,7 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS += -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) +AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) noinst_LIBRARIES = libqtui.a diff --git a/ui/qt/Wireshark.pro b/ui/qt/Wireshark.pro index 68023b565c..cc6b97cb40 100644 --- a/ui/qt/Wireshark.pro +++ b/ui/qt/Wireshark.pro @@ -175,7 +175,7 @@ win32 { #tap_register.CONFIG += no_link QMAKE_EXTRA_COMPILERS += tap_register -INCLUDEPATH += ../.. ../../wiretap +INCLUDEPATH += ../.. win32:INCLUDEPATH += \ $${WIRESHARK_LIB_DIR}/gtk2/include/glib-2.0 $${WIRESHARK_LIB_DIR}/gtk2/lib/glib-2.0/include \ $${WIRESHARK_LIB_DIR}/gtk3/include/glib-2.0 $${WIRESHARK_LIB_DIR}/gtk3/lib/glib-2.0/include \ diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 19510ce16c..5e9258b9df 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -37,8 +37,8 @@ #include <epan/wslua/init_wslua.h> #endif -#include "../log.h" -#include "../register.h" +#include "../../log.h" +#include "../../register.h" #include "ui/alert_box.h" #include "ui/last_open_dir.h" diff --git a/ui/qt/export_pdu_dialog.cpp b/ui/qt/export_pdu_dialog.cpp index 2aeeb8ea60..d1f9c30120 100644 --- a/ui/qt/export_pdu_dialog.cpp +++ b/ui/qt/export_pdu_dialog.cpp @@ -26,7 +26,7 @@ #include <ui_export_pdu_dialog.h> #include "globals.h" -#include "pcap-encap.h" +#include <wiretap/pcap-encap.h> #include <epan/tap.h> #include <epan/exported_pdu.h> diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index 1fc6401703..a7b92788de 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -24,7 +24,7 @@ #include "globals.h" -#include "pcap-encap.h" +#include "wiretap/pcap-encap.h" #include "wsutil/tempfile.h" #include "wsutil/os_version_info.h" #include "wsutil/ws_version_info.h" diff --git a/ui/win32/Makefile.nmake b/ui/win32/Makefile.nmake index 0f908e5bdf..136d7efea0 100644 --- a/ui/win32/Makefile.nmake +++ b/ui/win32/Makefile.nmake @@ -9,7 +9,7 @@ include ..\..\Makefile.nmake.inc CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ /Zm800 \ - /I../.. /I../../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \ + /I../.. $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \ /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) |