GPLv2 -> GPLv2+

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

diff --git a/Makefile.common b/Makefile.common
index 5e2f255071ab97b2fac03cf6d548a7bc195871cb..f47aa9389e034bf3ea1ba47418f45aa25e6a919f 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_SRC)         \
+       $(PLATFORM_PCAP_SRC)    \
        capture-pcap-util.c     \
        cfile.c                 \
        cfutils.c               \
@@ -65,7 +65,6 @@ SHARK_COMMON_INCLUDES =       \
        file.h                  \
        fileset.h               \
        frame_tvbuff.h          \
-       isprint.h               \
        register.h              \
        version_info.h          \
        ws_symbol_export.h
@@ -126,6 +125,11 @@ tshark_SOURCES =   \
        capture_opts.c          \
        tshark.c
 
+# tfshark specifics
+tfshark_SOURCES =      \
+       $(SHARK_COMMON_SRC)     \
+       tfshark.c
+
 # rawshark specifics
 rawshark_SOURCES =     \
        $(SHARK_COMMON_SRC)     \
@@ -147,8 +151,7 @@ mergecap_SOURCES = \
 
 # editcap specifics
 editcap_SOURCES = \
-       editcap.c       \
-       $(WTAP_PLUGIN_SOURCES)
+       editcap.c
 
 # reordercap specifics
 reordercap_SOURCES = \
@@ -157,8 +160,11 @@ reordercap_SOURCES = \
 
 # capinfos specifics
 capinfos_SOURCES = \
-       capinfos.c \
-       $(WTAP_PLUGIN_SOURCES)
+       capinfos.c
+
+# captype specifics
+captype_SOURCES = \
+       captype.c
 
 # dftest specifics
 dftest_SOURCES =       \
@@ -170,7 +176,7 @@ randpkt_SOURCES = \
 
 # dumpcap specifics
 dumpcap_SOURCES =      \
-       $(PLATFORM_SRC) \
+       $(PLATFORM_PCAP_SRC) \
        capture_opts.c  \
        capture-pcap-util.c     \
        capture_stop_conditions.c       \