From Irene Ruengeler: Whitespace changes.

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

diff --git a/Makefile.common b/Makefile.common
index 913ab16c517be7ff784c1e7a8504cd6a8c9c2c01..741fa4a0ce053c7081c089f40058e60fdb637c3e 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -38,26 +38,24 @@ GENERATED_HEADER_FILES = \
 
 # C source files generated from source files.
 GENERATED_C_FILES = \
-       $(BUILT_C_FILES)        \
-       tshark-tap-register.c
+       $(BUILT_C_FILES)
 
 # All the generated files.
 GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
 
 # sources common for wireshark, tshark, and rawshark
 WIRESHARK_COMMON_SRC = \
-       $(PLATFORM_SRC) \
+       $(PLATFORM_SRC)         \
        capture-pcap-util.c     \
-       cfile.c \
-       clopts_common.c \
+       cfile.c                 \
+       clopts_common.c         \
        disabled_protos.c       \
        frame_data_sequence.c   \
-       packet-range.c  \
-       print.c \
-       ps.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
@@ -67,23 +65,22 @@ WIRESHARK_COMMON_INCLUDES = \
        svnversion.h            \
        capture-pcap-util.h     \
        capture-pcap-util-int.h \
-       cfile.h \
-       clopts_common.h \
-       cmdarg_err.h    \
-       console_io.h    \
-       color.h \
+       cfile.h                 \
+       clopts_common.h         \
+       cmdarg_err.h            \
+       console_io.h            \
+       color.h                 \
        disabled_protos.h       \
-       file.h  \
-       fileset.h       \
+       file.h                  \
+       fileset.h               \
        frame_data_sequence.h   \
-       isprint.h       \
-       packet-range.h  \
-       print.h \
-       ps.h    \
-       register.h      \
-       tempfile.h      \
-       timestats.h     \
-       util.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
@@ -101,47 +98,6 @@ SHARK_COMMON_CAPTURE_INCLUDES =     \
        capture_sync.h          \
        capture_ui_utils.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-comparestat.c       \
-       tap-dcerpcstat.c        \
-       tap-diameter-avp.c \
-       tap-expert.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
-
 # wireshark specifics
 wireshark_SOURCES =    \
        $(WIRESHARK_COMMON_SRC) \
@@ -167,7 +123,6 @@ wireshark_SOURCES = \
 wireshark_INCLUDES =   \
        airpcap.h       \
        airpcap_loader.h \
-       ui/alert_box.h  \
        capture.h       \
        capture_info.h  \
        capture_opts.h  \
@@ -175,29 +130,20 @@ wireshark_INCLUDES =      \
        filters.h       \
        g711.h  \
        globals.h       \
-       ui/last_open_dir.h      \
        log.h   \
-       ui/main_statusbar.h     \
        merge.h \
-       ui/progress_dlg.h       \
-       ui/recent.h     \
-       ui/recent_utils.h       \
        proto_hier_stats.h      \
-       ui/simple_dialog.h      \
        stat_menu.h     \
        summary.h       \
        sync_pipe.h     \
-       u3.h    \
-       ui/ui_util.h
+       u3.h
 
 # tshark specifics
 tshark_SOURCES =       \
        $(WIRESHARK_COMMON_SRC) \
        $(SHARK_COMMON_CAPTURE_SRC) \
-       $(TSHARK_TAP_SRC)       \
        capture_opts.c          \
        tempfile.c              \
-       tshark-tap-register.c   \
        tshark.c
 
 # rawshark specifics
@@ -229,8 +175,7 @@ capinfos_SOURCES = \
 
 # dftest specifics
 dftest_SOURCES =       \
-       dftest.c        \
-       util.c
+       dftest.c
 
 # randpkt specifics
 randpkt_SOURCES = \