Move the AirPcap stuff into caputils.

Change-Id: I64b45dad36a3ec491aeb9de3439b4fe19b46f9d8
Reviewed-on: https://code.wireshark.org/review/3308
Reviewed-by: Guy Harris <guy@alum.mit.edu>

18 files changed, 27 insertions, 28 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 815f308fd6..7af8a5ec44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1026,7 +1026,6 @@ set(LIBEPAN_LIBS
 
 if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
 	set(WIRESHARK_SRC
-		airpcap_loader.c
 		capture_info.c
 		capture_opts.c
 		color_filters.c
diff --git a/Makefile.common b/Makefile.common
index 4c35b6cb4e..688b6e56b9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -60,7 +60,6 @@ SHARK_COMMON_INCLUDES =	\
 # wireshark specifics
 WIRESHARK_COMMON_SRC =	\
 	$(SHARK_COMMON_SRC)	\
-	airpcap_loader.c \
 	capture_info.c	\
 	capture_opts.c	\
 	color_filters.c	\
@@ -70,8 +69,6 @@ WIRESHARK_COMMON_SRC =	\
 
 # corresponding headers
 WIRESHARK_COMMON_INCLUDES =	\
-	airpcap.h	\
-	airpcap_loader.h \
 	capture_info.h	\
 	capture_opts.h	\
 	color_filters.h	\
diff --git a/caputils/CMakeLists.txt b/caputils/CMakeLists.txt
index a12d09f15d..0d9364f2ad 100644
--- a/caputils/CMakeLists.txt
+++ b/caputils/CMakeLists.txt
@@ -36,6 +36,7 @@ endif()
 
 set(CAPUTILS_SRC
 	${PLATFORM_CAPUTILS_SRC}
+	airpcap_loader.c
 	capture-pcap-util.c
 	iface_monitor.c
 	ws80211_utils.c
diff --git a/caputils/Makefile.common b/caputils/Makefile.common
index f09079d9e7..75544e757e 100644
--- a/caputils/Makefile.common
+++ b/caputils/Makefile.common
@@ -23,11 +23,14 @@
 
 CAPUTILS_SRC = \
 	$(PLATFORM_CAPUTILS_SRC)	\
+	airpcap_loader.c		\
 	capture-pcap-util.c		\
 	iface_monitor.c			\
 	ws80211_utils.c
 
 noinst_HEADERS = \
+	airpcap.h		\
+	airpcap_loader.h	\
 	capture_ifinfo.h	\
 	capture-pcap-util.h	\
 	capture-pcap-util-int.h	\
diff --git a/airpcap.h b/caputils/airpcap.h
index 035df2461f..035df2461f 100644
--- a/airpcap.h
+++ b/caputils/airpcap.h
diff --git a/airpcap_loader.c b/caputils/airpcap_loader.c
index 69acffe094..ed2d135b6c 100644
--- a/airpcap_loader.c
+++ b/caputils/airpcap_loader.c
@@ -49,8 +49,8 @@
 #include "ui/capture_ui_utils.h"
 #include "ui/simple_dialog.h"
 
-#include <airpcap.h>
-#include "airpcap_loader.h"
+#include <caputils/airpcap.h>
+#include <caputils/airpcap_loader.h>
 
 
 /*
diff --git a/airpcap_loader.h b/caputils/airpcap_loader.h
index 929604f082..929604f082 100644
--- a/airpcap_loader.h
+++ b/caputils/airpcap_loader.h
diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c
index c3f114c115..ef8f415938 100644
--- a/ui/gtk/airpcap_dlg.c
+++ b/ui/gtk/airpcap_dlg.c
@@ -51,8 +51,8 @@
 #include "ui/gtk/old-gtk-compat.h"
 #include "ui/gtk/packet_win.h"
 
-#include <airpcap.h>
-#include "airpcap_loader.h"
+#include <caputils/airpcap.h>
+#include <caputils/airpcap_loader.h>
 #include "airpcap_gui_utils.h"
 #include "airpcap_dlg.h"
 
diff --git a/ui/gtk/airpcap_gui_utils.c b/ui/gtk/airpcap_gui_utils.c
index 9b65710b16..a305bdd983 100644
--- a/ui/gtk/airpcap_gui_utils.c
+++ b/ui/gtk/airpcap_gui_utils.c
@@ -48,8 +48,8 @@
 #include "ui/gtk/keys.h"
 #include "ui/gtk/old-gtk-compat.h"
 
-#include <airpcap.h>
-#include "airpcap_loader.h"
+#include <caputils/airpcap.h>
+#include <caputils/airpcap_loader.h>
 #include "airpcap_gui_utils.h"
 
 
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index 987f04f231..4a628c022b 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -74,8 +74,8 @@
 #include "ui/gtk/expert_indicators.h"
 
 #ifdef HAVE_AIRPCAP
-#include <airpcap.h>
-#include "airpcap_loader.h"
+#include <caputils/airpcap.h>
+#include <caputils/airpcap_loader.h>
 #include "airpcap_gui_utils.h"
 #include "airpcap_dlg.h"
 #endif
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index fee1caa59a..9eb002cc27 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -84,8 +84,8 @@
 
 
 #ifdef HAVE_AIRPCAP
-#include "airpcap.h"
-#include "airpcap_loader.h"
+#include <caputils/airpcap.h>
+#include <caputils/airpcap_loader.h>
 #include "airpcap_gui_utils.h"
 #include "airpcap_dlg.h"
 #endif
diff --git a/ui/gtk/capture_info_dlg.c b/ui/gtk/capture_info_dlg.c
index cde6c094cc..d22ad07652 100644
--- a/ui/gtk/capture_info_dlg.c
+++ b/ui/gtk/capture_info_dlg.c
@@ -42,8 +42,8 @@
 #include "ui/gtk/stock_icons.h"
 
 #ifdef HAVE_AIRPCAP
-#include <airpcap.h>
-#include "airpcap_loader.h"
+#include <caputils/airpcap.h>
+#include <caputils/airpcap_loader.h>
 #include "airpcap_gui_utils.h"
 #include "airpcap_dlg.h"
 #endif
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 453fa5a8c7..8be126dd59 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -200,8 +200,8 @@
 #endif
 
 #ifdef HAVE_AIRPCAP
-#include <airpcap.h>
-#include "airpcap_loader.h"
+#include <caputils/airpcap.h>
+#include <caputils/airpcap_loader.h>
 #include "airpcap_dlg.h"
 #include "airpcap_gui_utils.h"
 #endif
diff --git a/ui/gtk/main_airpcap_toolbar.c b/ui/gtk/main_airpcap_toolbar.c
index 60b0f04b98..d6b1361dea 100644
--- a/ui/gtk/main_airpcap_toolbar.c
+++ b/ui/gtk/main_airpcap_toolbar.c
@@ -42,8 +42,8 @@
 
 #include "keys.h"
 
-#include <airpcap.h>
-#include "airpcap_loader.h"
+#include <caputils/airpcap.h>
+#include <caputils/airpcap_loader.h>
 #include "airpcap_dlg.h"
 #include "airpcap_gui_utils.h"
 
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index 3cbc90a986..0828d16cbe 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -72,8 +72,8 @@
 #endif
 
 #ifdef HAVE_AIRPCAP
-#include "airpcap.h"
-#include "airpcap_loader.h"
+#include <caputils/airpcap.h>
+#include <caputils/airpcap_loader.h>
 #include "airpcap_gui_utils.h"
 #endif
 #if defined(HAVE_PCAP_REMOTE)
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c
index 60bed8ec25..3dc299e26d 100644
--- a/ui/gtk/prefs_dlg.c
+++ b/ui/gtk/prefs_dlg.c
@@ -59,11 +59,11 @@
 
 #ifdef HAVE_LIBPCAP
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include <caputils/capture-wpcap.h>
 #endif /* _WIN32 */
 #ifdef HAVE_AIRPCAP
-#include "airpcap.h"
-#include "airpcap_loader.h"
+#include <caputils/airpcap.h>
+#include <caputils/airpcap_loader.h>
 #include "airpcap_gui_utils.h"
 #endif
 #endif
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index 3f1fa9610a..f7c5cd939f 100644
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -186,7 +186,6 @@ win32:INCLUDEPATH += \
 # We have to manually trigger relinking each time one of these is modified.
 # Is there any way to do this automatically?
 SOURCES_WS_C = \
-    ../../airpcap_loader.c \
     ../../capture_info.c  \
     ../../capture_opts.c \
     ../../cfile.c \
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 8bc06c7265..d121b13693 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -126,8 +126,8 @@
 #endif /* _WIN32 */
 
 #ifdef HAVE_AIRPCAP
-#  include <airpcap.h>
-#  include "airpcap_loader.h"
+#  include <caputils/airpcap.h>
+#  include <caputils/airpcap_loader.h>
 //#  include "airpcap_dlg.h"
 //#  include "airpcap_gui_utils.h"
 #endif