From Harald Welte:

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

diff --git a/Makefile.common b/Makefile.common
index 8dea91fbcb05efb98dac58d6a75e9c3138bcd246..6903477b06f12ef6fcc0c51019952b52d29c79a4 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -44,15 +44,14 @@ 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    \
@@ -66,17 +65,17 @@ 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    \
+       console_io.h    \
        color.h \
        disabled_protos.h       \
        file.h  \
        fileset.h       \
+       frame_data_sequence.h   \
        isprint.h       \
        packet-range.h  \
        print.h \
@@ -89,6 +88,19 @@ WIRESHARK_COMMON_INCLUDES =  \
        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_ifinfo.c        \
+       capture_sync.c          \
+       capture_ui_utils.c
+
+# corresponding headers
+SHARK_COMMON_CAPTURE_INCLUDES =        \
+       capture_ifinfo.h        \
+       capture_sync.h          \
+       capture_ui_utils.h
+
 # sources for TShark taps
 TSHARK_TAP_SRC =       \
        tap-afpstat.c   \
@@ -98,56 +110,48 @@ TSHARK_TAP_SRC =   \
        tap-camelsrt.c  \
        tap-comparestat.c       \
        tap-dcerpcstat.c        \
+       tap-diameter-avp.c \
+       tap-expert.c    \
+       tap-follow.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       \
        capture_info.c  \
        capture_opts.c \
-       capture_sync.c  \
        color_filters.c \
        file.c  \
        fileset.c       \
@@ -155,38 +159,44 @@ 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     \
+       ui/alert_box.h  \
        capture.h       \
        capture_info.h  \
        capture_opts.h  \
-       capture_sync.h  \
        color_filters.h \
        filters.h       \
        g711.h  \
        globals.h       \
+       ui/last_open_dir.h      \
        log.h   \
+       ui/main_statusbar.h     \
        merge.h \
-       progress_dlg.h  \
+       ui/progress_dlg.h       \
+       ui/recent.h     \
+       ui/recent_utils.h       \
        proto_hier_stats.h      \
-       simple_dialog.h \
+       ui/simple_dialog.h      \
        stat_menu.h     \
        summary.h       \
        sync_pipe.h     \
-       ui_util.h
+       u3.h    \
+       ui/ui_util.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
@@ -210,7 +220,7 @@ mergecap_SOURCES = \
 # editcap specifics
 editcap_SOURCES = \
        editcap.c       \
-       epan/crypt/crypt-md5.c \
+       epan/crypt/md5.c \
        epan/nstime.c \
        $(WTAP_PLUGIN_SOURCES)
 
@@ -252,6 +262,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)