GPLv2 -> GPLv2+

[metze/wireshark/wip.git] / Makefile.common

diff --git a/Makefile.common b/Makefile.common
index e95a8c96bbe5b44b2bf775eba5f93885a32d6dcc..f47aa9389e034bf3ea1ba47418f45aa25e6a919f 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -43,8 +43,9 @@ 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     \
+       cfile.c                 \
        cfutils.c               \
        clopts_common.c         \
        frame_tvbuff.c          \
@@ -90,7 +91,6 @@ WIRESHARK_COMMON_SRC =        \
        capture.c       \
        capture_info.c  \
        capture_opts.c  \
-       cfile.c                 \
        color_filters.c \
        file.c          \
        fileset.c       \
@@ -122,20 +122,17 @@ WIRESHARK_COMMON_INCLUDES =       \
 tshark_SOURCES =       \
        $(SHARK_COMMON_SRC)     \
        $(SHARK_COMMON_CAPTURE_SRC) \
-       cfile.c                 \
        capture_opts.c          \
        tshark.c
 
 # tfshark specifics
 tfshark_SOURCES =      \
        $(SHARK_COMMON_SRC)     \
-       cfile.c                 \
        tfshark.c
 
 # rawshark specifics
 rawshark_SOURCES =     \
        $(SHARK_COMMON_SRC)     \
-       cfile.c                 \
        rawshark.c
 
 # text2pcap specifics
@@ -179,7 +176,7 @@ randpkt_SOURCES = \
 
 # dumpcap specifics
 dumpcap_SOURCES =      \
-       $(PLATFORM_CAPTURE_SRC) \
+       $(PLATFORM_PCAP_SRC) \
        capture_opts.c  \
        capture-pcap-util.c     \
        capture_stop_conditions.c       \