At least some of the files in PLATFORM_CAPTURE_SRC are needed by

programs that use {lib,win}pcap but that don't capture traffic, such as
rawshark; rename it to PLATFORM_PCAP_SRC, to match CMake.

svn path=/trunk/; revision=54671

diff --git a/Makefile.am b/Makefile.am
index 83abfe3f296b5d67885520d8edd21b3b03d7c1c9..252466bd3ea13d4c20e3fc69c0b40348a6dadea6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -293,7 +293,7 @@ dist_wimaxasncp_DATA = \
        wimaxasncp/dictionary.xml \
        wimaxasncp/dictionary.dtd
 
-PLATFORM_CAPTURE_SRC = \
+PLATFORM_PCAP_SRC = \
        capture-pcap-util-unix.c
 
 if HAVE_PLUGINS

diff --git a/Makefile.common b/Makefile.common
index e95a8c96bbe5b44b2bf775eba5f93885a32d6dcc..9c442117969a0d536dcf84b946dc8c629fd7111e 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -43,7 +43,7 @@ GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
 
 # sources common for wireshark, tshark, and rawshark
 SHARK_COMMON_SRC =     \
-       $(PLATFORM_CAPTURE_SRC) \
+       $(PLATFORM_PCAP_SRC)    \
        capture-pcap-util.c     \
        cfutils.c               \
        clopts_common.c         \
@@ -179,7 +179,7 @@ randpkt_SOURCES = \
 
 # dumpcap specifics
 dumpcap_SOURCES =      \
-       $(PLATFORM_CAPTURE_SRC) \
+       $(PLATFORM_PCAP_SRC) \
        capture_opts.c  \
        capture-pcap-util.c     \
        capture_stop_conditions.c       \

diff --git a/Makefile.nmake b/Makefile.nmake
index 852ee8f73d30d20ff7fb63518b4fc7f2f8f899fc..641d82e9a1a7096d0bf92656bf4c51b9024deaa7 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -51,7 +51,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 .c.obj::
        $(CC) $(CFLAGS) -Fd.\ -c $<
 
-PLATFORM_CAPTURE_SRC = \
+PLATFORM_PCAP_SRC = \
        capture-wpcap.c \
        capture_wpcap_packet.c \
        capture_win_ifnames.c