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>

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

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	\

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

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	\

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>
 
 
 /*

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"
 

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"
 
 

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

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

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

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

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"
 

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)

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

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 \

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