Move dftest.c back to the top-level directory; that way, all of the
[obnox/wireshark/wip.git] / Makefile.common
index 04274828198f32683523a39d2909ef73b7796417..c2cd69ab77be7e0c7fd5cc9560a14e75c84966d5 100644 (file)
@@ -44,21 +44,19 @@ 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  \
+       $(PLATFORM_SRC)         \
        capture-pcap-util.c     \
-       capture_ui_utils.c      \
-       cfile.c \
-       clopts_common.c \
+       cfile.c                 \
+       clopts_common.c         \
        disabled_protos.c       \
-       packet-range.c  \
-       print.c \
-       ps.c    \
+       frame_data_sequence.c   \
+       packet-range.c          \
+       print.c                 \
+       ps.c                    \
        sync_pipe_write.c       \
-       timestats.c     \
-       util.c  \
+       timestats.c             \
        tap-megaco-common.c     \
        tap-rtp-common.c        \
        version_info.c
@@ -66,86 +64,92 @@ WIRESHARK_COMMON_SRC =      \
 # 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    \
-       color.h \
+       cfile.h                 \
+       clopts_common.h         \
+       cmdarg_err.h            \
+       console_io.h            \
+       color.h                 \
        disabled_protos.h       \
-       file.h  \
-       fileset.h       \
-       isprint.h       \
-       packet-range.h  \
-       print.h \
-       ps.h    \
-       register.h      \
-       tempfile.h      \
-       timestats.h     \
-       util.h  \
+       file.h                  \
+       fileset.h               \
+       frame_data_sequence.h   \
+       isprint.h               \
+       packet-range.h          \
+       print.h                 \
+       ps.h                    \
+       register.h              \
+       tempfile.h              \
+       timestats.h             \
+       tap-megaco-common.h     \
        tap-rtp-common.h        \
        version_info.h
 
-# sources for TShark taps
-TSHARK_TAP_SRC =       \
-       tap-afpstat.c   \
-       tap-ansi_astat.c        \
-       tap-bootpstat.c \
-       tap-camelcounter.c      \
-       tap-camelsrt.c  \
-       tap-dcerpcstat.c        \
-       tap-funnel.c \
-       tap-gsm_astat.c \
-       tap-h225counter.c       \
-       tap-h225rassrt.c        \
-       tap-httpstat.c  \
-       tap-iostat.c    \
-       tap-iousers.c   \
-       tap-mgcpstat.c  \
-       tap-megacostat.c        \
-       tap-protocolinfo.c      \
-       tap-protohierstat.c     \
-       tap-radiusstat.c        \
-       tap-rpcstat.c   \
-       tap-rpcprogs.c  \
-       tap-rtp.c       \
-       tap-sctpchunkstat.c     \
-       tap-sipstat.c \
-       tap-smbsids.c   \
-       tap-smbstat.c   \
-       tap-stats_tree.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
+# sources common for wireshark and tshark, but not rawshark;
+# these are for programs that capture traffic by running dumpcap
+SHARK_COMMON_CAPTURE_SRC =     \
+       capture_ifinfo.c        \
+       capture_sync.c          \
+       capture_ui_utils.c
 
 # corresponding headers
-EXTRA_wireshark_INCLUDES =     \
-       getopt.h        \
-       inet_v6defs.h   \
-       mkstemp.h       \
-       strerror.h      \
-       strptime.h
+SHARK_COMMON_CAPTURE_INCLUDES =        \
+       capture_ifinfo.h        \
+       capture_sync.h          \
+       capture_ui_utils.h
+
+# sources for TShark taps
+TSHARK_TAP_SRC =       \
+       ui/cli/tap-afpstat.c    \
+       ui/cli/tap-ansi_astat.c \
+       ui/cli/tap-bootpstat.c  \
+       ui/cli/tap-camelcounter.c       \
+       ui/cli/tap-camelsrt.c   \
+       ui/cli/tap-comparestat.c        \
+       ui/cli/tap-dcerpcstat.c \
+       ui/cli/tap-diameter-avp.c \
+       ui/cli/tap-expert.c     \
+       ui/cli/tap-follow.c     \
+       ui/cli/tap-funnel.c     \
+       ui/cli/tap-gsm_astat.c  \
+       ui/cli/tap-h225counter.c        \
+       ui/cli/tap-h225rassrt.c \
+       ui/cli/tap-hosts.c      \
+       ui/cli/tap-httpstat.c   \
+       ui/cli/tap-icmpstat.c   \
+       ui/cli/tap-icmpv6stat.c \
+       ui/cli/tap-iostat.c     \
+       ui/cli/tap-iousers.c    \
+       ui/cli/tap-macltestat.c \
+       ui/cli/tap-mgcpstat.c   \
+       ui/cli/tap-megacostat.c \
+       ui/cli/tap-protocolinfo.c       \
+       ui/cli/tap-protohierstat.c      \
+       ui/cli/tap-radiusstat.c \
+       ui/cli/tap-rlcltestat.c \
+       ui/cli/tap-rpcstat.c    \
+       ui/cli/tap-rpcprogs.c   \
+       ui/cli/tap-rtp.c        \
+       ui/cli/tap-rtspstat.c   \
+       ui/cli/tap-scsistat.c   \
+       ui/cli/tap-sctpchunkstat.c      \
+       ui/cli/tap-sipstat.c    \
+       ui/cli/tap-smbsids.c    \
+       ui/cli/tap-smbstat.c    \
+       ui/cli/tap-stats_tree.c \
+       ui/cli/tap-sv.c         \
+       ui/cli/tap-wspstat.c
 
 # wireshark specifics
 wireshark_SOURCES =    \
        $(WIRESHARK_COMMON_SRC) \
+       $(SHARK_COMMON_CAPTURE_SRC) \
        airpcap_loader.c \
        alert_box.c     \
        capture.c       \
        capture_info.c  \
        capture_opts.c \
-       capture_sync.c  \
        color_filters.c \
        file.c  \
        fileset.c       \
@@ -153,38 +157,36 @@ wireshark_SOURCES =       \
        g711.c \
        merge.c \
        proto_hier_stats.c      \
+       recent.c        \
        summary.c       \
-       tempfile.c
+       tempfile.c      \
+       u3.c
 
 # corresponding headers
 wireshark_INCLUDES =   \
        airpcap.h       \
        airpcap_loader.h \
-       alert_box.h     \
        capture.h       \
        capture_info.h  \
        capture_opts.h  \
-       capture_sync.h  \
        color_filters.h \
        filters.h       \
        g711.h  \
        globals.h       \
        log.h   \
        merge.h \
-       progress_dlg.h  \
        proto_hier_stats.h      \
-       simple_dialog.h \
        stat_menu.h     \
        summary.h       \
        sync_pipe.h     \
-       ui_util.h
+       u3.h
 
 # tshark specifics
 tshark_SOURCES =       \
        $(WIRESHARK_COMMON_SRC) \
+       $(SHARK_COMMON_CAPTURE_SRC) \
        $(TSHARK_TAP_SRC)       \
        capture_opts.c          \
-       capture_sync.c          \
        tempfile.c              \
        tshark-tap-register.c   \
        tshark.c
@@ -208,7 +210,7 @@ mergecap_SOURCES = \
 # editcap specifics
 editcap_SOURCES = \
        editcap.c       \
-       epan/crypt/crypt-md5.c \
+       epan/crypt/md5.c \
        epan/nstime.c \
        $(WTAP_PLUGIN_SOURCES)
 
@@ -218,8 +220,7 @@ capinfos_SOURCES = \
 
 # dftest specifics
 dftest_SOURCES =       \
-       dftest.c        \
-       util.c
+       dftest.c
 
 # randpkt specifics
 randpkt_SOURCES = \
@@ -250,6 +251,6 @@ dumpcap_INCLUDES = \
 # this target needed for distribution only
 noinst_HEADERS =       \
        $(WIRESHARK_COMMON_INCLUDES) \
+       $(SHARK_COMMON_CAPTURE_INCLUDES) \
        $(wireshark_INCLUDES) \
-       $(EXTRA_wireshark_INCLUDES) \
        $(dumpcap_INCLUDES)