diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-04 00:24:02 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-04 07:25:26 +0000 |
| commit | 9e6487f24751d1c1a047ee82e158077ac67c9c68 (patch) | |
| tree | 3cc4a8524062948f4951914dc9af489e0d7c4572 /echld | |
| parent | c5643a3d257909ed3e8752cd729b9192ae719683 (diff) | |
| download | wireshark-9e6487f24751d1c1a047ee82e158077ac67c9c68.tar.gz | |
Move utility routines for capturing into a libcaputils static library.
Some of those routines are used only in dumpcap; others are used in
TShark and Wireshark as well.
Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7
Reviewed-on: https://code.wireshark.org/review/2841
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'echld')
| -rw-r--r-- | echld/Makefile.am | 2 | ||||
| -rw-r--r-- | echld/Makefile.common | 5 | ||||
| -rw-r--r-- | echld/echld-int.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/echld/Makefile.am b/echld/Makefile.am index f842243ca7..b6336d286f 100644 --- a/echld/Makefile.am +++ b/echld/Makefile.am @@ -50,12 +50,14 @@ libechld_la_SOURCES = \ libechld_la_DEPENDENCIES = \ + ../caputils/libcaputils.a \ ../epan/libwireshark.la \ ../wiretap/libwiretap.la \ ../wsutil/libwsutil.la libechld_la_LIBADD = \ + ../caputils/libcaputils.a \ ../epan/libwireshark.la \ ../wsutil/libwsutil.la \ ../wiretap/libwiretap.la \ diff --git a/echld/Makefile.common b/echld/Makefile.common index af24795275..cf7033fd2d 100644 --- a/echld/Makefile.common +++ b/echld/Makefile.common @@ -41,16 +41,13 @@ LIBECHLD_INCLUDES = \ LIBECHLD_MORE_SRC = \ ../capture_opts.c \ - ../capture-pcap-util.c \ - ../capture-pcap-util-unix.c \ ../capture_stop_conditions.c \ ../cfile.c \ ../conditions.c \ ../pcapio.c \ ../ringbuffer.c \ ../sync_pipe_write.c \ - ../version_info.c \ - ../ws80211_utils.c + ../version_info.c OTHER = \ ../dumpcap.c diff --git a/echld/echld-int.h b/echld/echld-int.h index f433f883fd..acf5557a97 100644 --- a/echld/echld-int.h +++ b/echld/echld-int.h @@ -62,7 +62,7 @@ #include "capture_opts.h" #include <capchild/capture_session.h> -#include <capchild/capture_ifinfo.h> +#include <caputils/capture_ifinfo.h> #include <capchild/capture_sync.h> #include "version_info.h" #include "cfile.h" |