Add LTE RLC stats tap to tshark.

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

diff --git a/Makefile.common b/Makefile.common
index a3ed735537ddfa5b1cfe8b355c06ca17487ca588..cf24b77b0e85053b87f16c5c3aedda4975444fa2 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -44,38 +44,38 @@ 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       \
+       frame_data_sequence.c   \
        packet-range.c  \
        print.c \
        ps.c    \
        sync_pipe_write.c       \
        timestats.c     \
        util.c  \
+       tap-megaco-common.c     \
        tap-rtp-common.c        \
        version_info.c
 
 # 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    \
+       console_io.h    \
        color.h \
        disabled_protos.h       \
        file.h  \
        fileset.h       \
+       frame_data_sequence.h   \
        isprint.h       \
        packet-range.h  \
        print.h \
@@ -84,9 +84,23 @@ WIRESHARK_COMMON_INCLUDES =  \
        tempfile.h      \
        timestats.h     \
        util.h  \
+       tap-megaco-common.h     \
        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   \
@@ -94,50 +108,43 @@ TSHARK_TAP_SRC =   \
        tap-bootpstat.c \
        tap-camelcounter.c      \
        tap-camelsrt.c  \
+       tap-comparestat.c       \
        tap-dcerpcstat.c        \
+       tap-diameter-avp.c \
        tap-funnel.c \
        tap-gsm_astat.c \
        tap-h225counter.c       \
        tap-h225rassrt.c        \
+       tap-hosts.c     \
        tap-httpstat.c  \
+       tap-icmpstat.c  \
+       tap-icmpv6stat.c        \
        tap-iostat.c    \
        tap-iousers.c   \
+       tap-macltestat.c        \
        tap-mgcpstat.c  \
+       tap-megacostat.c        \
        tap-protocolinfo.c      \
        tap-protohierstat.c     \
        tap-radiusstat.c        \
+       tap-rlcltestat.c        \
        tap-rpcstat.c   \
        tap-rpcprogs.c  \
        tap-rtp.c       \
+       tap-rtspstat.c  \
+       tap-scsistat.c  \
        tap-sctpchunkstat.c     \
        tap-sipstat.c \
        tap-smbsids.c   \
        tap-smbstat.c   \
        tap-stats_tree.c        \
+       tap-sv.c \
        tap-wspstat.c
 
-# helpers already available on some platforms (and on others not)
-EXTRA_wireshark_SOURCES =      \
-       getopt.c        \
-       inet_ntop.c     \
-       inet_pton.c     \
-       mkstemp.c       \
-       strerror.c      \
-       strcasecmp.c    \
-       strncasecmp.c   \
-       strptime.c
-
-# corresponding headers
-EXTRA_wireshark_INCLUDES =     \
-       getopt.h        \
-       inet_v6defs.h   \
-       mkstemp.h       \
-       strerror.h      \
-       strptime.h
-
 # wireshark specifics
 wireshark_SOURCES =    \
        $(WIRESHARK_COMMON_SRC) \
+       $(SHARK_COMMON_CAPTURE_SRC) \
        airpcap_loader.c \
        alert_box.c     \
        capture.c       \
@@ -152,7 +159,8 @@ wireshark_SOURCES = \
        merge.c \
        proto_hier_stats.c      \
        summary.c       \
-       tempfile.c
+       tempfile.c      \
+       u3.c
 
 # corresponding headers
 wireshark_INCLUDES =   \
@@ -168,22 +176,21 @@ wireshark_INCLUDES =      \
        g711.h  \
        globals.h       \
        log.h   \
-       main_window.h   \
-       menu.h  \
+       main_statusbar.h        \
        merge.h \
        progress_dlg.h  \
        proto_hier_stats.h      \
        simple_dialog.h \
        stat_menu.h     \
-       statusbar.h     \
        summary.h       \
        sync_pipe.h     \
-       tap_dfilter_dlg.h       \
+       u3.h    \
        ui_util.h
 
 # tshark specifics
 tshark_SOURCES =       \
        $(WIRESHARK_COMMON_SRC) \
+       $(SHARK_COMMON_CAPTURE_SRC) \
        $(TSHARK_TAP_SRC)       \
        capture_opts.c          \
        capture_sync.c          \
@@ -211,6 +218,7 @@ mergecap_SOURCES = \
 editcap_SOURCES = \
        editcap.c       \
        epan/crypt/crypt-md5.c \
+       epan/nstime.c \
        $(WTAP_PLUGIN_SOURCES)
 
 capinfos_SOURCES = \
@@ -230,7 +238,6 @@ randpkt_SOURCES = \
 dumpcap_SOURCES =      \
        $(PLATFORM_SRC) \
        capture_opts.c \
-       capture_loop.c  \
        capture-pcap-util.c     \
        capture_stop_conditions.c       \
        clopts_common.c \
@@ -240,23 +247,18 @@ dumpcap_SOURCES = \
        ringbuffer.c    \
        sync_pipe_write.c       \
        tempfile.c      \
-       version_info.c  \
-       epan/unicode-utils.c    \
-       epan/privileges.c
+       version_info.c
 
 # corresponding headers
 dumpcap_INCLUDES = \
-       capture_loop.h  \
        capture_stop_conditions.h       \
        conditions.h    \
        pcapio.h        \
-       ringbuffer.h    \
-       epan/unicode-utils.h    \
-       epan/privileges.h
+       ringbuffer.h
 
 # this target needed for distribution only
 noinst_HEADERS =       \
        $(WIRESHARK_COMMON_INCLUDES) \
+       $(SHARK_COMMON_CAPTURE_INCLUDES) \
        $(wireshark_INCLUDES) \
-       $(EXTRA_wireshark_INCLUDES) \
        $(dumpcap_INCLUDES)