X-Git-Url: http://git.samba.org/?p=metze%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=Makefile.common;h=635e8c4ff05e638458835820661e384f00fe1e4c;hp=fff39022b63d9a82415ccf1cdadf26b5cd73e4ff;hb=fd95d841b8c264165107652a87c3948e69378819;hpb=9aa17b271bc77d20f87df3210f2c3f3761e170cf;ds=inline diff --git a/Makefile.common b/Makefile.common index fff39022b6..635e8c4ff0 100644 --- a/Makefile.common +++ b/Makefile.common @@ -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,170 +38,134 @@ 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 and tshark -WIRESHARK_COMMON_SRC = \ - $(PLATFORM_SRC) \ - capture_errs.c \ +# sources common for wireshark, tshark, and rawshark +SHARK_COMMON_SRC = \ + $(PLATFORM_SRC) \ capture-pcap-util.c \ - capture_stop_conditions.c \ - capture_ui_utils.c \ - cfile.c \ - clopts_common.c \ - conditions.c \ + cfile.c \ + cfutils.c \ + clopts_common.c \ disabled_protos.c \ - packet-range.c \ - print.c \ - ps.c \ - pcapio.c \ - ringbuffer.c \ - timestats.c \ - util.c \ + frame_data_sequence.c \ + packet-range.c \ + print.c \ + ps.c \ + sync_pipe_write.c \ + timestats.c \ + tap-megaco-common.c \ + tap-rtp-common.c \ version_info.c # corresponding headers -WIRESHARK_COMMON_INCLUDES = \ +SHARK_COMMON_INCLUDES = \ svnversion.h \ - capture_errs.h \ capture-pcap-util.h \ capture-pcap-util-int.h \ - capture_stop_conditions.h \ - capture_ui_utils.h \ - cfile.h \ - clopts_common.h \ - cmdarg_err.h \ - color.h \ - conditions.h \ + cfile.h \ + cfutils.h \ + clopts_common.h \ + cmdarg_err.h \ + color.h \ disabled_protos.h \ - file.h \ - fileset.h \ - isprint.h \ - packet-range.h \ - pcapio.h \ - print.h \ - ps.h \ - register.h \ - ringbuffer.h \ - tempfile.h \ - timestats.h \ - util.h \ - version_info.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-dcerpcstat.c \ - tap-funnel.c \ - tap-gsm_astat.c \ - tap-h225counter.c \ - tap-h225rassrt.c \ - tap-httpstat.c \ - tap-iostat.c \ - tap-iousers.c \ - tap-mgcpstat.c \ - tap-protocolinfo.c \ - tap-protohierstat.c \ - tap-radiusstat.c \ - tap-rpcstat.c \ - tap-rpcprogs.c \ - tap-sctpchunkstat.c \ - tap-sipstat.c \ - tap-smbsids.c \ - tap-smbstat.c \ - tap-stats_tree.c \ - tap-wspstat.c - -# helpers already available on some platforms (and on others not) -EXTRA_wireshark_SOURCES = \ - getopt.c \ - inet_ntop.c \ - inet_pton.c \ - mkstemp.c \ - strerror.c \ - strcasecmp.c \ - strncasecmp.c \ - strptime.c + file.h \ + fileset.h \ + frame_data_sequence.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 \ + ws_symbol_export.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_ifinfo.c \ + capture_sync.c \ + capture_ui_utils.c # corresponding headers -EXTRA_wireshark_INCLUDES = \ - getopt.h \ - inet_v6defs.h \ - mkstemp.h \ - strerror.h \ - strptime.h +SHARK_COMMON_CAPTURE_INCLUDES = \ + capture_ifinfo.h \ + capture_session.h \ + capture_sync.h \ + capture_ui_utils.h # wireshark specifics -wireshark_SOURCES = \ - $(WIRESHARK_COMMON_SRC) \ +WIRESHARK_COMMON_SRC = \ + $(SHARK_COMMON_SRC) \ + $(SHARK_COMMON_CAPTURE_SRC) \ airpcap_loader.c \ - alert_box.c \ capture.c \ capture_info.c \ - capture_opts.c \ - capture_sync.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 \ - sync_pipe_write.c \ summary.c \ - tempfile.c + tempfile.c \ + u3.c \ + ws80211_utils.c # corresponding headers -wireshark_INCLUDES = \ +WIRESHARK_COMMON_INCLUDES = \ airpcap.h \ airpcap_loader.h \ - alert_box.h \ capture.h \ capture_info.h \ - capture_loop.h \ capture_opts.h \ - capture_sync.h \ color_filters.h \ filters.h \ - g711.h \ + g711.h \ globals.h \ - log.h \ - main_window.h \ - menu.h \ - merge.h \ - progress_dlg.h \ + iface_monitor.h \ + log.h \ + merge.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 + u3.h \ + ws80211_utils.h # tshark specifics tshark_SOURCES = \ - $(WIRESHARK_COMMON_SRC) \ - $(TSHARK_TAP_SRC) \ + $(SHARK_COMMON_SRC) \ + $(SHARK_COMMON_CAPTURE_SRC) \ capture_opts.c \ - capture_loop.c \ tempfile.c \ - tshark-tap-register.c \ tshark.c +# rawshark specifics +rawshark_SOURCES = \ + $(SHARK_COMMON_SRC) \ + rawshark.c + # text2pcap specifics text2pcap_SOURCES = \ + pcapio.c \ text2pcap.c \ text2pcap-scanner.l +text2pcap_INCLUDES = \ + pcapio.h \ + text2pcap.h + # mergecap specifics mergecap_SOURCES = \ mergecap.c \ @@ -211,17 +175,23 @@ mergecap_SOURCES = \ # editcap specifics editcap_SOURCES = \ editcap.c \ - epan/crypt/crypt-md5.c \ + epan/crypt/md5.c \ + 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 = \ @@ -230,10 +200,10 @@ randpkt_SOURCES = \ # dumpcap specifics dumpcap_SOURCES = \ $(PLATFORM_SRC) \ - capture_opts.c \ - capture_loop.c \ + capture_opts.c \ capture-pcap-util.c \ capture_stop_conditions.c \ + cfutils.c \ clopts_common.c \ conditions.c \ dumpcap.c \ @@ -242,11 +212,18 @@ dumpcap_SOURCES = \ sync_pipe_write.c \ tempfile.c \ version_info.c \ - epan/unicode-utils.c + ws80211_utils.c +# corresponding headers +dumpcap_INCLUDES = \ + capture_stop_conditions.h \ + conditions.h \ + pcapio.h \ + ringbuffer.h # this target needed for distribution only noinst_HEADERS = \ + $(SHARK_COMMON_INCLUDES) \ + $(SHARK_COMMON_CAPTURE_INCLUDES) \ $(WIRESHARK_COMMON_INCLUDES) \ - $(wireshark_INCLUDES) \ - $(EXTRA_wireshark_INCLUDES) + $(dumpcap_INCLUDES)