X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=Makefile.common;h=1a13fc5101c251b96bc18b31e370f0b8c8a4a762;hp=c192dccd735210267b6a335365f77a4a85e8954b;hb=8ef6b283dfc57501a47e5f7abc40536d76668b76;hpb=39d4d12a38f06707ffd91db94721ada3ff539272 diff --git a/Makefile.common b/Makefile.common index c192dccd73..1a13fc5101 100644 --- a/Makefile.common +++ b/Makefile.common @@ -5,8 +5,8 @@ # # $Id$ # -# Ethereal - Network traffic analyzer -# By Gerald Combs +# Wireshark - Network traffic analyzer +# By Gerald Combs # Copyright 1998 Gerald Combs # # This program is free software; you can redistribute it and/or @@ -23,30 +23,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# Header files for dissector helpers -# XXX - these should be moved to epan/dissectors -DISSECTOR_SUPPORT_INCLUDES = \ - aftypes.h \ - arcnet_pids.h \ - bridged_pids.h \ - chdlctypes.h \ - etypes.h \ - format-oid.h \ - greproto.h \ - iax2_codec_type.h \ - ip_opts.h \ - isprint.h \ - lapd_sapi.h \ - llcsaps.h \ - nlpid.h \ - oui.h \ - ppptypes.h \ - rpc_defrag.h \ - rtp_pt.h \ - sctpppids.h \ - smb.h \ - x264_prt_id.h - # "BUILT_SOURCES" are built before any "make all" or "make check" targets. BUILT_HEADER_FILES = \ svnversion.h @@ -63,59 +39,76 @@ GENERATED_HEADER_FILES = \ # C source files generated from source files. GENERATED_C_FILES = \ $(BUILT_C_FILES) \ - tethereal-tap-register.c + tshark-tap-register.c # All the generated files. GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES) -# sources common for ethereal and tethereal -ETHEREAL_COMMON_SRC = \ +# sources common for wireshark, tshark, and rawshark +WIRESHARK_COMMON_SRC = \ $(PLATFORM_SRC) \ - capture_stop_conditions.c \ - capture_ui_utils.c \ + capture-pcap-util.c \ cfile.c \ clopts_common.c \ - conditions.c \ disabled_protos.c \ packet-range.c \ - pcap-util.c \ print.c \ ps.c \ - ringbuffer.c \ + sync_pipe_write.c \ timestats.c \ util.c \ + tap-megaco-common.c \ + tap-rtp-common.c \ version_info.c # corresponding headers -ETHEREAL_COMMON_INCLUDES = \ - $(DISSECTOR_SUPPORT_INCLUDES) \ +WIRESHARK_COMMON_INCLUDES = \ svnversion.h \ - capture_stop_conditions.h \ - capture_ui_utils.h \ + capture-pcap-util.h \ + capture-pcap-util-int.h \ cfile.h \ clopts_common.h \ + cmdarg_err.h \ color.h \ - conditions.h \ disabled_protos.h \ file.h \ fileset.h \ + isprint.h \ packet-range.h \ - pcap-util.h \ - pcap-util-int.h \ print.h \ ps.h \ register.h \ - ringbuffer.h \ + tempfile.h \ timestats.h \ util.h \ + tap-megaco-common.h \ + tap-rtp-common.h \ version_info.h -# sources for Tethereal taps -TETHEREAL_TAP_SRC = \ +# 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 \ tap-ansi_astat.c \ 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 \ tap-h225rassrt.c \ @@ -123,10 +116,13 @@ TETHEREAL_TAP_SRC = \ tap-iostat.c \ tap-iousers.c \ tap-mgcpstat.c \ + tap-megacostat.c \ tap-protocolinfo.c \ tap-protohierstat.c \ + tap-radiusstat.c \ tap-rpcstat.c \ tap-rpcprogs.c \ + tap-rtp.c \ tap-sctpchunkstat.c \ tap-sipstat.c \ tap-smbsids.c \ @@ -135,30 +131,31 @@ TETHEREAL_TAP_SRC = \ tap-wspstat.c # helpers already available on some platforms (and on others not) -EXTRA_ethereal_SOURCES = \ - snprintf.c \ +EXTRA_wireshark_SOURCES = \ + wsgetopt.c \ + inet_ntop.c \ + inet_pton.c \ strerror.c \ - strcasecmp.c \ strncasecmp.c \ - mkstemp.c \ strptime.c # corresponding headers -EXTRA_ethereal_INCLUDES = \ - snprintf.h \ - snprintf-imp.h \ +EXTRA_wireshark_INCLUDES = \ + wsgetopt.h \ + inet_v6defs.h \ strerror.h \ - mkstemp.h \ strptime.h -# ethereal specifics -ethereal_SOURCES = \ - $(ETHEREAL_COMMON_SRC) \ +# 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 \ - capture_loop.c \ color_filters.c \ file.c \ fileset.c \ @@ -166,36 +163,47 @@ ethereal_SOURCES = \ g711.c \ merge.c \ proto_hier_stats.c \ - summary.c + summary.c \ + tempfile.c # corresponding headers -ethereal_INCLUDES = \ +wireshark_INCLUDES = \ + airpcap.h \ + airpcap_loader.h \ alert_box.h \ capture.h \ + capture_info.h \ + capture_opts.h \ capture_sync.h \ color_filters.h \ filters.h \ g711.h \ globals.h \ log.h \ - main_window.h \ - menu.h \ merge.h \ progress_dlg.h \ proto_hier_stats.h \ simple_dialog.h \ - statusbar.h \ + stat_menu.h \ summary.h \ - tap_dfilter_dlg.h \ + sync_pipe.h \ ui_util.h -# tethereal specifics -tethereal_SOURCES = \ - $(ETHEREAL_COMMON_SRC) \ - $(TETHEREAL_TAP_SRC) \ +# tshark specifics +tshark_SOURCES = \ + $(WIRESHARK_COMMON_SRC) \ + $(SHARK_COMMON_CAPTURE_SRC) \ + $(TSHARK_TAP_SRC) \ capture_opts.c \ - tethereal-tap-register.c \ - tethereal.c + capture_sync.c \ + tempfile.c \ + tshark-tap-register.c \ + tshark.c + +# rawshark specifics +rawshark_SOURCES = \ + $(WIRESHARK_COMMON_SRC) \ + rawshark.c # text2pcap specifics text2pcap_SOURCES = \ @@ -210,7 +218,14 @@ mergecap_SOURCES = \ # editcap specifics editcap_SOURCES = \ - editcap.c + editcap.c \ + epan/crypt/crypt-md5.c \ + epan/nstime.c \ + $(WTAP_PLUGIN_SOURCES) + +capinfos_SOURCES = \ + capinfos.c \ + $(WTAP_PLUGIN_SOURCES) # dftest specifics dftest_SOURCES = \ @@ -221,10 +236,32 @@ dftest_SOURCES = \ randpkt_SOURCES = \ randpkt.c +# dumpcap specifics +dumpcap_SOURCES = \ + $(PLATFORM_SRC) \ + capture_opts.c \ + capture-pcap-util.c \ + capture_stop_conditions.c \ + clopts_common.c \ + conditions.c \ + dumpcap.c \ + pcapio.c \ + ringbuffer.c \ + sync_pipe_write.c \ + tempfile.c \ + version_info.c + +# corresponding headers +dumpcap_INCLUDES = \ + capture_stop_conditions.h \ + conditions.h \ + pcapio.h \ + ringbuffer.h + # this target needed for distribution only noinst_HEADERS = \ - $(DISSECTOR_SUPPORT_INCLUDES) \ - $(ETHEREAL_COMMON_INCLUDES) \ - $(ethereal_INCLUDES) \ - $(EXTRA_ethereal_INCLUDES) - + $(WIRESHARK_COMMON_INCLUDES) \ + $(SHARK_COMMON_CAPTURE_INCLUDES) \ + $(wireshark_INCLUDES) \ + $(EXTRA_wireshark_INCLUDES) \ + $(dumpcap_INCLUDES)