GPLv2 -> GPLv2+

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

diff --git a/Makefile.common b/Makefile.common
index 635e8c4ff05e638458835820661e384f00fe1e4c..f47aa9389e034bf3ea1ba47418f45aa25e6a919f 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -27,8 +27,7 @@
 BUILT_HEADER_FILES =   \
        svnversion.h
 
-BUILT_C_FILES =                \
-       ps.c
+BUILT_C_FILES =
 
 BUILT_SOURCES =        $(BUILT_C_FILES) $(BUILT_HEADER_FILES)
 
@@ -37,28 +36,20 @@ GENERATED_HEADER_FILES = \
        $(BUILT_HEADER_FILES)
 
 # C source files generated from source files.
-GENERATED_C_FILES = \
-       $(BUILT_C_FILES)
+GENERATED_C_FILES =
 
 # All the generated files.
 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               \
        clopts_common.c         \
-       disabled_protos.c       \
-       frame_data_sequence.c   \
-       packet-range.c          \
-       print.c                 \
-       ps.c                    \
+       frame_tvbuff.c          \
        sync_pipe_write.c       \
-       timestats.c             \
-       tap-megaco-common.c     \
-       tap-rtp-common.c        \
        version_info.c
 
 # corresponding headers
@@ -71,19 +62,10 @@ SHARK_COMMON_INCLUDES =     \
        clopts_common.h         \
        cmdarg_err.h            \
        color.h                 \
-       disabled_protos.h       \
        file.h                  \
        fileset.h               \
-       frame_data_sequence.h   \
-       isprint.h               \
-       packet-range.h          \
-       print.h                 \
-       ps.h                    \
+       frame_tvbuff.h          \
        register.h              \
-       tempfile.h              \
-       timestats.h             \
-       tap-megaco-common.h     \
-       tap-rtp-common.h        \
        version_info.h          \
        ws_symbol_export.h
 
@@ -113,13 +95,9 @@ WIRESHARK_COMMON_SRC =      \
        file.c          \
        fileset.c       \
        filters.c       \
-       g711.c          \
        iface_monitor.c \
-       merge.c         \
        proto_hier_stats.c      \
        summary.c       \
-       tempfile.c      \
-       u3.c            \
        ws80211_utils.c
 
 # corresponding headers
@@ -131,16 +109,13 @@ WIRESHARK_COMMON_INCLUDES =       \
        capture_opts.h  \
        color_filters.h \
        filters.h       \
-       g711.h          \
        globals.h       \
        iface_monitor.h \
        log.h           \
-       merge.h         \
        proto_hier_stats.h      \
        stat_menu.h     \
        summary.h       \
        sync_pipe.h     \
-       u3.h            \
        ws80211_utils.h
 
 # tshark specifics
@@ -148,9 +123,13 @@ tshark_SOURCES =   \
        $(SHARK_COMMON_SRC)     \
        $(SHARK_COMMON_CAPTURE_SRC) \
        capture_opts.c          \
-       tempfile.c              \
        tshark.c
 
+# tfshark specifics
+tfshark_SOURCES =      \
+       $(SHARK_COMMON_SRC)     \
+       tfshark.c
+
 # rawshark specifics
 rawshark_SOURCES =     \
        $(SHARK_COMMON_SRC)     \
@@ -168,16 +147,11 @@ text2pcap_INCLUDES = \
 
 # mergecap specifics
 mergecap_SOURCES = \
-       mergecap.c \
-       merge.c \
-       svnversion.h
+       mergecap.c
 
 # editcap specifics
 editcap_SOURCES = \
-       editcap.c       \
-       epan/crypt/md5.c \
-       epan/nstime.c \
-       $(WTAP_PLUGIN_SOURCES)
+       editcap.c
 
 # reordercap specifics
 reordercap_SOURCES = \
@@ -186,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 =       \
@@ -199,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       \
@@ -210,7 +187,6 @@ dumpcap_SOURCES =   \
        pcapio.c        \
        ringbuffer.c    \
        sync_pipe_write.c       \
-       tempfile.c      \
        version_info.c  \
        ws80211_utils.c