diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-03-04 01:12:04 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-03-04 01:12:04 +0000 |
| commit | 167ab3a98c4583344f8b95d81b079b7a5df7e5ff (patch) | |
| tree | c2af1e714cc510427cdd87a9b63979038cfc40ac /Makefile.common | |
| parent | 98d800bae8939f6edaf4aa54f02787148da48c0f (diff) | |
In Wireshark and TShark, run dumpcap to get interface lists and lists of
link-layer header types for interfaces; if special privileges are
necessary to open capture devices, Wireshark and TShark shouldn't have
those privileges, but dumpcap should.
svn path=/trunk/; revision=32104
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index b2995d6820..0676bce0a9 100644 --- a/Makefile.common +++ b/Makefile.common @@ -44,12 +44,10 @@ GENERATED_C_FILES = \ # All the generated files. GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES) -# sources common for wireshark and tshark +# sources common for wireshark, tshark, and rawshark WIRESHARK_COMMON_SRC = \ $(PLATFORM_SRC) \ - capture_errs.c \ capture-pcap-util.c \ - capture_ui_utils.c \ cfile.c \ clopts_common.c \ disabled_protos.c \ @@ -66,10 +64,8 @@ WIRESHARK_COMMON_SRC = \ # corresponding headers WIRESHARK_COMMON_INCLUDES = \ svnversion.h \ - capture_errs.h \ capture-pcap-util.h \ capture-pcap-util-int.h \ - capture_ui_utils.h \ cfile.h \ clopts_common.h \ cmdarg_err.h \ @@ -89,6 +85,19 @@ WIRESHARK_COMMON_INCLUDES = \ tap-rtp-common.h \ version_info.h +# sources common for wireshark and tshark, but not rawshark; +# these are for programs that capture traffic by running dumpcap +SHARK_COMMON_CAPTURE_SRC = \ + capture_errs.c \ + capture_ifinfo.c \ + capture_ui_utils.c + +# corresponding headers +SHARK_COMMON_CAPTURE_INCLUDES = \ + capture_errs.h \ + capture_ifinfo.h \ + capture_ui_utils.h + # sources for TShark taps TSHARK_TAP_SRC = \ tap-afpstat.c \ @@ -139,6 +148,7 @@ EXTRA_wireshark_INCLUDES = \ # wireshark specifics wireshark_SOURCES = \ $(WIRESHARK_COMMON_SRC) \ + $(SHARK_COMMON_CAPTURE_SRC) \ airpcap_loader.c \ alert_box.c \ capture.c \ @@ -181,6 +191,7 @@ wireshark_INCLUDES = \ # tshark specifics tshark_SOURCES = \ $(WIRESHARK_COMMON_SRC) \ + $(SHARK_COMMON_CAPTURE_SRC) \ $(TSHARK_TAP_SRC) \ capture_opts.c \ capture_sync.c \ @@ -249,6 +260,7 @@ dumpcap_INCLUDES = \ # this target needed for distribution only noinst_HEADERS = \ $(WIRESHARK_COMMON_INCLUDES) \ + $(SHARK_COMMON_CAPTURE_INCLUDES) \ $(wireshark_INCLUDES) \ $(EXTRA_wireshark_INCLUDES) \ $(dumpcap_INCLUDES) |