Don't add the wiretap directory to the list of include directories.

If you include something from the wiretap directory, always precede it
with wiretap/.

Fix some includes of files in the top-level directory to use a path
relative to the current directory, not relative to the wiretap
directory.

This makes it a bit clearer what's being included.

Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54
Reviewed-on: https://code.wireshark.org/review/13990
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dde0c995a5298ecd702084aeca740d10dcc1f447..d39c3086ec6b89a90528b56c162a0f10700e79c6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,7 +209,6 @@ include_directories(
        ${CMAKE_SOURCE_DIR}
        ${CMAKE_SOURCE_DIR}/epan
        ${CMAKE_SOURCE_DIR}/tools/lemon
-       ${CMAKE_SOURCE_DIR}/wiretap
 )
 
 include( CMakeOptions.txt )

diff --git a/Makefile.am b/Makefile.am
index 1976a2bfd21bb3f8f7bc51da786c80fff6951b05..140f95bfb2b8f63943ae77d67a504bcec08a1d0a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,9 +27,8 @@ AM_DISTCHECK_CONFIGURE_FLAGS=@GUI_CONFIGURE_FLAGS@
 ACLOCAL_AMFLAGS = `./aclocal-flags`
 
 # Common headers
-AM_CPPFLAGS += -I$(top_srcdir)/wiretap $(LIBGNUTLS_CFLAGS) \
-       $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LUA_CFLAGS) \
-       $(KRB5_CFLAGS)
+AM_CPPFLAGS += $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) \
+       $(LUA_CFLAGS) $(KRB5_CFLAGS)
 
 bin_PROGRAMS = \
        @wireshark_bin@         \

diff --git a/Makefile.nmake b/Makefile.nmake
index da01d9c84cd4541b822c8d2bea9ca00cfc4ee43d..c01562964d2fb789e93dc128d23af3b155af7814 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -39,7 +39,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:NO $(LOCAL_LDFLAGS)
 # We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
 GENERATED_CFLAGS=\
        $(STANDARD_CFLAGS) \
-       /I.  /Iwiretap $(GLIB_CFLAGS) \
+       /I. $(GLIB_CFLAGS) \
        $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \
        $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(GNUTLS_CFLAGS) \
        $(SMI_CFLAGS) $(GEOIP_CFLAGS) $(LIBSSH_CFLAGS) $(WINSPARKLE_CFLAGS)

diff --git a/capchild/Makefile.am b/capchild/Makefile.am
index 5251b047ffd8ac7f09dc05129935dbd6c8a3b839..4d75e0b36f3512a6ec0ad3c8ecaafe15ea1fb191 100644 (file)
--- a/capchild/Makefile.am
+++ b/capchild/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 = libcapchild.a
 

diff --git a/capchild/Makefile.nmake b/capchild/Makefile.nmake
index fa10b26f32ba7fd23e1e1581f74230a24981bb86..be4d1820e53c34d3f48d4e000a13816f38478429 100644 (file)
--- a/capchild/Makefile.nmake
+++ b/capchild/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/caputils/Makefile.am b/caputils/Makefile.am
index 48b26cc9c2d7cff6a9bd07dd6e1f046354e1c21d..94db958c001f244e5a604a23297dabdcb568571e 100644 (file)
--- a/caputils/Makefile.am
+++ b/caputils/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 = libcaputils.a
 

diff --git a/caputils/Makefile.nmake b/caputils/Makefile.nmake
index f3eeae37c94275b89d831aae49ca31e18b00d00d..6c38e33f3f794b4c75a01994ef22a0dabef520aa 100644 (file)
--- a/caputils/Makefile.nmake
+++ b/caputils/Makefile.nmake
@@ -12,7 +12,7 @@ include Makefile.common
 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/codecs/Makefile.am b/codecs/Makefile.am
index 9242f8a5b0494f710337144e2fb8c06d04b0535e..50111154c26f4e10240aa3b2219c1fec094288ec 100644 (file)
--- a/codecs/Makefile.am
+++ b/codecs/Makefile.am
@@ -22,7 +22,7 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += -I$(top_srcdir)/wiretap -DWS_BUILD_DLL
+AM_CPPFLAGS += -DWS_BUILD_DLL
 
 lib_LTLIBRARIES = libwscodecs.la
 

diff --git a/echld/Makefile.am b/echld/Makefile.am
index f92173e58d62813d3e440afc6e36724c75e808f4..8b0898808e1dd00ea646565a6cc32d6b6ebc0fe4 100644 (file)
--- a/echld/Makefile.am
+++ b/echld/Makefile.am
@@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.am.inc
 
 ACLOCAL_AMFLAGS = `../aclocal-flags`
 
-AM_CPPFLAGS += -I$(top_srcdir)/wiretap -DWS_BUILD_DLL
+AM_CPPFLAGS += -DWS_BUILD_DLL
 
 # Optional objects that I know how to build. These will be
 # linked into libechld.

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 6384324b782c7842a0d08c1425cb75afa910d513..984bd85056097a8469b1dd17a1cc252b6edc4b01 100644 (file)
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -15,7 +15,7 @@ LINK= link
 #
 COMMON_CFLAGS=\
        $(STANDARD_CFLAGS) \
-       /I. /I.. /I../wiretap $(GLIB_CFLAGS) \
+       /I. /I.. $(GLIB_CFLAGS) \
        $(ZLIB_CFLAGS) $(C_ARES_CFLAGS) $(ADNS_CFLAGS) \
        $(LUA_CFLAGS) $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \
        $(SMI_CFLAGS) $(GEOIP_CFLAGS)

diff --git a/extcap/Makefile.am b/extcap/Makefile.am
index 08ea26e641b950111a7fa2b8abd19a60bb1edee3..432b85d8044a44a6d5b08fa9d2a0e54daa597c59 100644 (file)
--- a/extcap/Makefile.am
+++ b/extcap/Makefile.am
@@ -23,8 +23,6 @@ include ../Makefile.am.inc
 
 ACLOCAL_AMFLAGS = `../aclocal-flags`
 
-AM_CPPFLAGS += -I$(top_srcdir)/wiretap
-
 extcap_PROGRAMS = \
        @androiddump_bin@       \
        @randpktdump_bin@       \

diff --git a/extcap/Makefile.nmake b/extcap/Makefile.nmake
index 7845326ec6cb790c17a979bee13f05e230306de6..511b139b712acc9981ea61864b8ae23ddc35fdf5 100644 (file)
--- a/extcap/Makefile.nmake
+++ b/extcap/Makefile.nmake
@@ -17,7 +17,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:NO $(LOCAL_LDFLAGS)
 # We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
 GENERATED_CFLAGS=\
        $(STANDARD_CFLAGS) \
-       /I. /I.. /Iwiretap $(GLIB_CFLAGS) \
+       /I. /I.. $(GLIB_CFLAGS) \
        $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \
        $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(GNUTLS_CFLAGS) \
        $(SMI_CFLAGS) $(GEOIP_CFLAGS) $(LIBSSH_CFLAGS) $(WINSPARKLE_CFLAGS)

diff --git a/frame_tvbuff.c b/frame_tvbuff.c
index 89c8ab68f043a36eab654ecddfb4d7f06d9b82a2..311653ce1a6e18e8b6e2a24111dc989e002f5b5a 100644 (file)
--- a/frame_tvbuff.c
+++ b/frame_tvbuff.c
@@ -31,7 +31,7 @@
 #include "frame_tvbuff.h"
 #include "globals.h"
 
-#include "wtap-int.h" /* for ->random_fh */
+#include "wiretap/wtap-int.h" /* for ->random_fh */
 
 struct tvb_frame {
        struct tvbuff tvb;

diff --git a/randpkt_core/Makefile.am b/randpkt_core/Makefile.am
index 5f35912bdbb1dc18dc3d2ea68a19056b360af614..07607ebc947d39f0ac941ec787381456b3184981 100644 (file)
--- a/randpkt_core/Makefile.am
+++ b/randpkt_core/Makefile.am
@@ -22,9 +22,6 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) \
-       $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES)
-
 noinst_LIBRARIES = librandpkt_core.a
 
 CLEANFILES = \

diff --git a/randpkt_core/Makefile.nmake b/randpkt_core/Makefile.nmake
index 5ab93cff9d6176fcb973c412cb91a9154c117bb1..708d4f068fd4b432256347079ee617671574f0f2 100644 (file)
--- a/randpkt_core/Makefile.nmake
+++ b/randpkt_core/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/Makefile.am b/ui/Makefile.am
index 80904eb5a2968b7cecc93440439575aeb7607a7c..4b409209fd93ec8dd857b695a212bb7612ebb940 100644 (file)
--- 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 e6ec01e5ea76223e8842c6b817c2b85312723c5f..55fe06d036f861d4eb10f7636d74d42c0552afdb 100644 (file)
--- 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 0ad3b8e757e37e2d8850e6d172d6a18291727ba3..3242543d41f95f29c7e33c32a685e732c29b8df1 100644 (file)
--- 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 09c7414e33f7661db844fa9fe029438dcda4d571..f7e9a89b373c3c4c2a8b3435b3a5c1b82a65542b 100644 (file)
--- 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 4a2b8121b29ca1e9d1ff84554dae35b02302fc0a..4abaa5402b3c8cbac83e166bfddc94ccd8ad35c2 100644 (file)
--- 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 fee391f428add0af9211fe04b8bcb7f19ba08d01..024e14f1923212cee09aa6019e2ea6996c2c2658 100644 (file)
--- 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 9c0ad967421466546f9c769f081300ec89689676..a52a9aee978a107da356d218f85655c4b5cfc7ad 100644 (file)
--- 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 abb3fd00aed10613366490bbef9fad30b9bc4a4c..a1e375b475ecbdf1e19d7d7dd039d6c26da3b784 100644 (file)
--- 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 53ec896e0b255775779dc3494a5fbff466fc06c5..c78da6595fcb684a0b75a4434c1caa6bd38ceeed 100644 (file)
--- 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 d78eee51bf8c33b7c703b0a4b0d830ab5409c284..403a1e900b4b6be5eceb67025e4b2c73619b9155 100644 (file)
--- 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 e1cae02d791c859492ff364054486bd7e11e690e..8f0d390c3ef8074be55bd2c3e31b49bf4e2f93db 100644 (file)
--- 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 0dec7a0254256e7ddb72cb8580542eb4f6acea38..1bc5be7b322d5d1c8bbeeb2dd97999bb04d1fd26 100644 (file)
--- 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 958d12e22150d1c2ad78bd422efa135a2a865662..86248d73fa054c275c8303bd99f4c25311598dd3 100644 (file)
--- 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 44407865eb4650f9a576c6bb2c251942f34307d2..fb0aadba18580c6aa731e83361bb86f46648d972 100644 (file)
--- 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 7b85f07f7e1baf281cd7308f2d926658eed05316..3b3962f533567e3c4432d2dceca90acfbedb3833 100644 (file)
--- 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 4948efa4d9b7f2465067e8a15f0ebcc4cf06ca86..4f246d9b774c9facb7a442c3df1442cbeaebea85 100644 (file)
--- 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 5ceaf00255bcb40949130adb00cf1935dd4d9390..5e0d8677a7c4dfff565a85a5a88896a3ad4408fe 100644 (file)
--- 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 afaec60d429d1959c3d99346f8c489f3232c9e3f..1e5d2ea56f509634b612f347e54b6029a793cfff 100644 (file)
--- 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 d5d1d161a52ea7d45b44240a8f264dc3349d6afb..21ce49134f041d41e02caf891db1ade6fa51c311 100644 (file)
--- 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 a36673ce97b4cbb0b517a41a5983e8adbab3cd52..6d8d535ec612902eb179ddb01a25547b6b30a5e1 100644 (file)
--- 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 a50475053a2ba515ec6c237c573d1c2059954d54..179988b901b749ee68b5ff4eb6f59a36e15d104a 100644 (file)
--- 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 79cafd4b0a7fc7cefbc84b14372cc3f875db7d91..8632febc3471e048373c7897b33eec7f5d81fa79 100644 (file)
--- 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 56cb90dc8c0db13448e72f2b4cf116e95678297a..0c9438ba84c442bde88e7746d6626677c753cce0 100644 (file)
--- 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 4d8ae5128039f960ea613ebeff576778b68ed039..b3590c91e3008b8dfa866a7d248f8e3f9dd86974 100644 (file)
--- 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 e87549ea4399236223de6225d32a07eca6517e9f..3b55f95e443105f3247d3604e64036f3f513f984 100644 (file)
--- 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 122e6aa0a172ffd096a9df8e221b401fd80bedde..84d8f9a1e4d9f9adf2c97a5267570f2999376fa6 100644 (file)
--- 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 6fd5b79756e7bddca331b65c319e4581b302b67e..d1eda40d529f638453937cedf88da58432f0a3c8 100644 (file)
--- 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 5818c2697178a2a762022f8b201bad88a69fe14d..4fd0be60ae5a92d85212be8d5e098ff9331913a7 100644 (file)
--- 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 58d0adae3b652659a697583b12e048938b6b9628..d969a2007f1c9eeb3055e4d016f5dbd5286c6240 100644 (file)
--- 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 b8a0ecf7dc3b51873c4c123408285a1fa89197f4..f276a9663f5bbba83a1f9ef82a90fda683590f45 100644 (file)
--- 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 68023b565c7336491aa8f49d57b57bf5c7aec109..cc6b97cb40cb05dc7f76a97795a05e4cec022aac 100644 (file)
--- 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 19510ce16cc132cedb1455e360eba2206e8b86cc..5e9258b9df66d63679a725b6afe4657c8bd28608 100644 (file)
--- 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 2aeeb8ea60dfa40c0979df83c1b77c94b8e1ef62..d1f9c30120f8c4cdfe5df36b8272b24612d10c74 100644 (file)
--- 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 1fc6401703c4ea8cd5a9189a02bca81cb691dd65..a7b92788defd00c79c431701b449561295f41bac 100644 (file)
--- 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 0f908e5bdfe2378de29dc0fee9f4d937355213fd..136d7efea03ad6aa1c7e0e8921f86513ecab0dd9 100644 (file)
--- 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)

diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h
index 545c1f640683d6d9a43cb57570e3dffe2cefcc32..43f68907b93f8d71d47a9927f60d895b0293e88b 100644 (file)
--- a/wiretap/libpcap.h
+++ b/wiretap/libpcap.h
@@ -22,7 +22,7 @@
 #define __W_LIBPCAP_H__
 
 #include <glib.h>
-#include <wtap.h>
+#include <wiretap/wtap.h>
 #include "ws_symbol_export.h"
 
 /* Magic numbers in "libpcap" files.