Fix for bug 4535: The SSL dissector can not correctly resemple SSL records when the...

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

diff --git a/Makefile.common b/Makefile.common
index b7b2aab32f6d80c96273c5080338fe6226191418..1a13fc5101c251b96bc18b31e370f0b8c8a4a762 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -44,12 +44,10 @@ 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       \
@@ -59,16 +57,15 @@ WIRESHARK_COMMON_SRC =      \
        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    \
@@ -84,9 +81,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,7 +105,9 @@ 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       \
@@ -103,6 +116,7 @@ TSHARK_TAP_SRC =    \
        tap-iostat.c    \
        tap-iousers.c   \
        tap-mgcpstat.c  \
+       tap-megacostat.c        \
        tap-protocolinfo.c      \
        tap-protohierstat.c     \
        tap-radiusstat.c        \
@@ -118,26 +132,24 @@ TSHARK_TAP_SRC =  \
 
 # helpers already available on some platforms (and on others not)
 EXTRA_wireshark_SOURCES =      \
-       getopt.c        \
+       wsgetopt.c      \
        inet_ntop.c     \
        inet_pton.c     \
-       mkstemp.c       \
        strerror.c      \
-       strcasecmp.c    \
        strncasecmp.c   \
        strptime.c
 
 # corresponding headers
 EXTRA_wireshark_INCLUDES =     \
-       getopt.h        \
+       wsgetopt.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       \
@@ -168,22 +180,19 @@ wireshark_INCLUDES =      \
        g711.h  \
        globals.h       \
        log.h   \
-       main_window.h   \
-       menu.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       \
        ui_util.h
 
 # tshark specifics
 tshark_SOURCES =       \
        $(WIRESHARK_COMMON_SRC) \
+       $(SHARK_COMMON_CAPTURE_SRC) \
        $(TSHARK_TAP_SRC)       \
        capture_opts.c          \
        capture_sync.c          \
@@ -194,7 +203,6 @@ tshark_SOURCES =    \
 # rawshark specifics
 rawshark_SOURCES =     \
        $(WIRESHARK_COMMON_SRC) \
-       pcapio.c                \
        rawshark.c
 
 # text2pcap specifics
@@ -212,6 +220,7 @@ mergecap_SOURCES = \
 editcap_SOURCES = \
        editcap.c       \
        epan/crypt/crypt-md5.c \
+       epan/nstime.c \
        $(WTAP_PLUGIN_SOURCES)
 
 capinfos_SOURCES = \
@@ -231,7 +240,6 @@ randpkt_SOURCES = \
 dumpcap_SOURCES =      \
        $(PLATFORM_SRC) \
        capture_opts.c \
-       capture_loop.c  \
        capture-pcap-util.c     \
        capture_stop_conditions.c       \
        clopts_common.c \
@@ -241,23 +249,19 @@ 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)