Try to fix some of the build problems, it still bumms out on:

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

diff --git a/Makefile.common b/Makefile.common
index 1ae047e3fded3831ca7a7f742fcb8edd81e3dcbb..6903477b06f12ef6fcc0c51019952b52d29c79a4 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -51,6 +51,7 @@ WIRESHARK_COMMON_SRC =        \
        cfile.c \
        clopts_common.c \
        disabled_protos.c       \
+       frame_data_sequence.c   \
        packet-range.c  \
        print.c \
        ps.c    \
@@ -74,6 +75,7 @@ WIRESHARK_COMMON_INCLUDES =   \
        disabled_protos.h       \
        file.h  \
        fileset.h       \
+       frame_data_sequence.h   \
        isprint.h       \
        packet-range.h  \
        print.h \
@@ -89,14 +91,14 @@ WIRESHARK_COMMON_INCLUDES = \
 # 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_sync.c          \
        capture_ui_utils.c
 
 # corresponding headers
 SHARK_COMMON_CAPTURE_INCLUDES =        \
-       capture_errs.h  \
        capture_ifinfo.h        \
+       capture_sync.h          \
        capture_ui_utils.h
 
 # sources for TShark taps
@@ -109,6 +111,8 @@ TSHARK_TAP_SRC =    \
        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       \
@@ -116,16 +120,20 @@ TSHARK_TAP_SRC =  \
        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 \
@@ -144,7 +152,6 @@ wireshark_SOURCES = \
        capture.c       \
        capture_info.c  \
        capture_opts.c \
-       capture_sync.c  \
        color_filters.c \
        file.c  \
        fileset.c       \
@@ -152,6 +159,7 @@ wireshark_SOURCES = \
        g711.c \
        merge.c \
        proto_hier_stats.c      \
+       recent.c        \
        summary.c       \
        tempfile.c      \
        u3.c
@@ -160,26 +168,28 @@ wireshark_SOURCES =       \
 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   \
-       main_statusbar.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     \
        u3.h    \
-       ui_util.h
+       ui/ui_util.h
 
 # tshark specifics
 tshark_SOURCES =       \
@@ -187,7 +197,6 @@ tshark_SOURCES =    \
        $(SHARK_COMMON_CAPTURE_SRC) \
        $(TSHARK_TAP_SRC)       \
        capture_opts.c          \
-       capture_sync.c          \
        tempfile.c              \
        tshark-tap-register.c   \
        tshark.c
@@ -211,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)