Update to the latest config.guess and config.sub.
[metze/wireshark/wip.git] / Makefile.common
index 6903477b06f12ef6fcc0c51019952b52d29c79a4..a22b3c7c2e13c56ebe170d90e6ad524368c61052 100644 (file)
@@ -21,7 +21,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # "BUILT_SOURCES" are built before any "make all" or "make check" targets.
 BUILT_HEADER_FILES =   \
@@ -38,26 +38,25 @@ 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                 \
+       cfutils.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,26 +66,26 @@ 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                 \
+       cfutils.h               \
+       clopts_common.h         \
+       cmdarg_err.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
+       version_info.h          \
+       ws_symbol_export.h
 
 # sources common for wireshark and tshark, but not rawshark;
 # these are for programs that capture traffic by running dumpcap
@@ -98,107 +97,58 @@ SHARK_COMMON_CAPTURE_SRC = \
 # corresponding headers
 SHARK_COMMON_CAPTURE_INCLUDES =        \
        capture_ifinfo.h        \
+       capture_session.h       \
        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-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
-
 # 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_opts.c  \
        color_filters.c \
-       file.c  \
+       file.c          \
        fileset.c       \
        filters.c       \
-       g711.c \
-       merge.c \
+       g711.c          \
+       iface_monitor.c \
+       merge.c         \
        proto_hier_stats.c      \
-       recent.c        \
        summary.c       \
        tempfile.c      \
-       u3.c
+       u3.c            \
+       ws80211_utils.c
 
 # corresponding headers
 wireshark_INCLUDES =   \
        airpcap.h       \
        airpcap_loader.h \
-       ui/alert_box.h  \
        capture.h       \
        capture_info.h  \
        capture_opts.h  \
        color_filters.h \
        filters.h       \
-       g711.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       \
+       iface_monitor.h \
+       log.h           \
+       merge.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            \
+       ws80211_utils.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
@@ -208,9 +158,14 @@ rawshark_SOURCES = \
 
 # text2pcap specifics
 text2pcap_SOURCES = \
+       pcapio.c \
        text2pcap.c \
        text2pcap-scanner.l
 
+text2pcap_INCLUDES = \
+       pcapio.h \
+       text2pcap.h
+
 # mergecap specifics
 mergecap_SOURCES = \
        mergecap.c \
@@ -224,14 +179,19 @@ editcap_SOURCES = \
        epan/nstime.c \
        $(WTAP_PLUGIN_SOURCES)
 
+# reordercap specifics
+reordercap_SOURCES = \
+       reordercap.c \
+       svnversion.h
+
+# capinfos specifics
 capinfos_SOURCES = \
        capinfos.c \
        $(WTAP_PLUGIN_SOURCES)
 
 # dftest specifics
 dftest_SOURCES =       \
-       dftest.c        \
-       util.c
+       dftest.c
 
 # randpkt specifics
 randpkt_SOURCES = \
@@ -240,9 +200,10 @@ randpkt_SOURCES = \
 # dumpcap specifics
 dumpcap_SOURCES =      \
        $(PLATFORM_SRC) \
-       capture_opts.c \
+       capture_opts.c  \
        capture-pcap-util.c     \
        capture_stop_conditions.c       \
+       cfutils.c       \
        clopts_common.c \
        conditions.c    \
        dumpcap.c       \
@@ -250,7 +211,8 @@ dumpcap_SOURCES =   \
        ringbuffer.c    \
        sync_pipe_write.c       \
        tempfile.c      \
-       version_info.c
+       version_info.c  \
+       ws80211_utils.c
 
 # corresponding headers
 dumpcap_INCLUDES = \