${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/epan
${CMAKE_SOURCE_DIR}/tools/lemon
- ${CMAKE_SOURCE_DIR}/wiretap
)
include( CMakeOptions.txt )
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@ \
# 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)
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
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) \
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
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) \
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
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.
#
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)
ACLOCAL_AMFLAGS = `../aclocal-flags`
-AM_CPPFLAGS += -I$(top_srcdir)/wiretap
-
extcap_PROGRAMS = \
@androiddump_bin@ \
@randpktdump_bin@ \
# 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)
#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;
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 = \
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) \
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
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) \
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
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) \
include Makefile.common
include $(top_srcdir)/Makefile.am.inc
-AM_CPPFLAGS += -I$(top_srcdir)/wiretap $(PORTAUDIO_INCLUDES)
+AM_CPPFLAGS += $(PORTAUDIO_INCLUDES)
CLEANFILES = \
libgtkui.a \
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 \
#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"
#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"
#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"
#include <epan/capture_dissectors.h>
#include "ui/capture.h"
-#include "../capture_info.h"
+#include "../../capture_info.h"
#include "ui/capture_ui_utils.h"
#include <gtk/gtk.h>
-#include "../file.h"
+#include "../../file.h"
#ifdef HAVE_LIBPCAP
#include "ui/capture.h"
#endif
#include <gtk/gtk.h>
#include "globals.h"
-#include "pcap-encap.h"
+#include <wiretap/pcap-encap.h>
#include <epan/exported_pdu.h>
#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"
#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"
#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"
#include <stdlib.h>
-#include "../globals.h"
+#include "../../globals.h"
#include "ui/simple_dialog.h"
#include "ui/gtk/goto_dlg.h"
#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"
#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
#include <epan/prefs.h>
-#include "../cfile.h"
+#include "../../cfile.h"
#include <gtk/gtk.h>
#include <epan/addr_resolv.h>
-#include "../globals.h"
+#include "../../globals.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"
#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"
#include <gtk/gtk.h>
-#include "../file.h"
+#include "../../file.h"
#include "ui/gtk/proto_help.h"
#include <gtk/gtk.h>
-#include "../globals.h"
+#include "../../globals.h"
#include "ui/simple_dialog.h"
#include "ui/gtk/gui_utils.h"
#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>
#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"
#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"
#include <epan/prefs.h>
-#include "../globals.h"
+#include "../../globals.h"
#include "ui/gtk/supported_protos_dlg.h"
#include "ui/gtk/gui_utils.h"
#include <gtk/gtk.h>
-#include "../globals.h"
+#include "../../globals.h"
#include <epan/stat_groups.h>
#include "ui/gtk/old-gtk-compat.h"
#include <wsutil/str_util.h>
-#include "../globals.h"
+#include "../../globals.h"
#include "ui/voip_calls.h"
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
#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 \
#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"
#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>
#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"
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)
#define __W_LIBPCAP_H__
#include <glib.h>
-#include <wtap.h>
+#include <wiretap/wtap.h>
#include "ws_symbol_export.h"
/* Magic numbers in "libpcap" files.