diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-15 18:26:46 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-16 01:27:21 +0000 |
| commit | fae3615ce07bb5ced41486cf97844f271118e893 (patch) | |
| tree | 0d60a9460cced5b4e80eb13757cb226a0d22ba8e | |
| parent | bd30abf8701c940fc995317e6ac4aee3be04ad29 (diff) | |
| download | wireshark-fae3615ce07bb5ced41486cf97844f271118e893.tar.gz | |
Move the monitor-for-interface-list-changes stuff to the caputils library.
Change-Id: Ie0d4504688602c2aa8e9788643b079930ca7d305
Reviewed-on: https://code.wireshark.org/review/3076
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rw-r--r-- | caputils/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | caputils/Makefile.common | 2 | ||||
| -rw-r--r-- | caputils/iface_monitor.c (renamed from iface_monitor.c) | 2 | ||||
| -rw-r--r-- | caputils/iface_monitor.h (renamed from iface_monitor.h) | 0 | ||||
| -rw-r--r-- | ui/gtk/gtk_iface_monitor.c | 2 |
7 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 19ccc3f74b..4dead90756 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1037,7 +1037,6 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) ) color_filters.c file.c fileset.c - iface_monitor.c summary.c ${SHARK_COMMON_CAPTURE_SRC} ${SHARK_COMMON_SRC} diff --git a/Makefile.common b/Makefile.common index 678b30a10e..4c35b6cb4e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -66,7 +66,6 @@ WIRESHARK_COMMON_SRC = \ color_filters.c \ file.c \ fileset.c \ - iface_monitor.c \ summary.c # corresponding headers @@ -77,7 +76,6 @@ WIRESHARK_COMMON_INCLUDES = \ capture_opts.h \ color_filters.h \ globals.h \ - iface_monitor.h \ log.h \ summary.h \ sync_pipe.h diff --git a/caputils/CMakeLists.txt b/caputils/CMakeLists.txt index 4c8dab086a..a12d09f15d 100644 --- a/caputils/CMakeLists.txt +++ b/caputils/CMakeLists.txt @@ -37,6 +37,7 @@ endif() set(CAPUTILS_SRC ${PLATFORM_CAPUTILS_SRC} capture-pcap-util.c + iface_monitor.c ws80211_utils.c ) diff --git a/caputils/Makefile.common b/caputils/Makefile.common index 57599380a7..f09079d9e7 100644 --- a/caputils/Makefile.common +++ b/caputils/Makefile.common @@ -24,6 +24,7 @@ CAPUTILS_SRC = \ $(PLATFORM_CAPUTILS_SRC) \ capture-pcap-util.c \ + iface_monitor.c \ ws80211_utils.c noinst_HEADERS = \ @@ -32,4 +33,5 @@ noinst_HEADERS = \ capture-pcap-util-int.h \ capture-wpcap.h \ capture_wpcap_packet.h \ + iface_monitor.h \ ws80211_utils.h diff --git a/iface_monitor.c b/caputils/iface_monitor.c index 5c543df24a..683a9cc25e 100644 --- a/iface_monitor.c +++ b/caputils/iface_monitor.c @@ -23,7 +23,7 @@ #ifdef HAVE_LIBPCAP -#include "iface_monitor.h" +#include <caputils/iface_monitor.h> #if defined(HAVE_LIBNL) diff --git a/iface_monitor.h b/caputils/iface_monitor.h index d6269cf627..d6269cf627 100644 --- a/iface_monitor.h +++ b/caputils/iface_monitor.h diff --git a/ui/gtk/gtk_iface_monitor.c b/ui/gtk/gtk_iface_monitor.c index b8a11831b6..7de2cf80d1 100644 --- a/ui/gtk/gtk_iface_monitor.c +++ b/ui/gtk/gtk_iface_monitor.c @@ -28,7 +28,7 @@ #include <glib.h> -#include "../../iface_monitor.h" +#include <caputils/iface_monitor.h> #include "capture_opts.h" |