Commit b32a5ee9 authored by Guy Harris's avatar Guy Harris

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: default avatarPetri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: default avatarGuy Harris <guy@alum.mit.edu>
parent 7b6e5264
......@@ -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 )
......
......@@ -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@ \
......
......@@ -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)
......
......@@ -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
......
......@@ -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) \
......
......@@ -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
......
......@@ -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) \
......
......@@ -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
......
......@@ -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.
......
......@@ -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)
......
......@@ -23,8 +23,6 @@ include ../Makefile.am.inc
ACLOCAL_AMFLAGS = `../aclocal-flags`
AM_CPPFLAGS += -I$(top_srcdir)/wiretap
extcap_PROGRAMS = \
@androiddump_bin@ \
@randpktdump_bin@ \
......
......@@ -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)
......
......@@ -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;
......
......@@ -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 = \
......
......@@ -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) \
......
......@@ -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
......
......@@ -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) \
......
......@@ -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
......
......@@ -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) \
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -27,7 +27,7 @@
#include <gtk/gtk.h>
#include "../file.h"
#include "../../file.h"
#ifdef HAVE_LIBPCAP
#include "ui/capture.h"
#endif
......
......@@ -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>
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -28,7 +28,7 @@
#include <stdlib.h>
#include "../globals.h"
#include "../../globals.h"
#include "ui/simple_dialog.h"
#include "ui/gtk/goto_dlg.h"
......
......@@ -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"
......
......@@ -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
......
......@@ -30,7 +30,7 @@
#include <epan/prefs.h>
#include "../cfile.h"
#include "../../cfile.h"
#include <gtk/gtk.h>
......
......@@ -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"
......
......@@ -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"
......
......@@ -34,7 +34,7 @@
#include <gtk/gtk.h>
#include "../file.h"
#include "../../file.h"
#include "ui/gtk/proto_help.h"
......
......@@ -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"
......
......@@ -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>
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -43,7 +43,7 @@
#include <wsutil/str_util.h>
#include "../globals.h"
#include "../../globals.h"
#include "ui/voip_calls.h"
......
......@@ -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
......
......@@ -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 \
......
......@@ -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"
......
......@@ -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>
......
......@@ -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"
......
......@@ -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)
......
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment