# Makefile.am
-# Automake file for Ethereal
+# Automake file for Wireshark
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
# automake will arrange that the Makefile define it as the union of all
# the "man{section}_MANS" variables.
#
-bin_PROGRAMS = @ethereal_bin@ @capinfos_bin@ @editcap_bin@ @mergecap_bin@ @tethereal_bin@ @dftest_bin@ @randpkt_bin@ @text2pcap_bin@
-bin_SCRIPTS = @idl2eth_bin@
-man1_MANS = @ethereal_man@ @capinfos_man@ @editcap_man@ @mergecap_man@ @tethereal_man@ @text2pcap_man@ @idl2eth_man@
-man4_MANS = @etherealfilter_man@
+bin_PROGRAMS = @wireshark_bin@ @capinfos_bin@ @editcap_bin@ @mergecap_bin@ @tshark_bin@ @dftest_bin@ @randpkt_bin@ @text2pcap_bin@ @dumpcap_bin@
+bin_SCRIPTS = @idl2wrs_bin@
+man1_MANS = @wireshark_man@ @capinfos_man@ @editcap_man@ @mergecap_man@ @tshark_man@ @text2pcap_man@ @dumpcap_man@ @idl2wrs_man@
+man4_MANS = @wiresharkfilter_man@
man_MANS =
-EXTRA_PROGRAMS = ethereal tethereal capinfos editcap mergecap dftest \
- randpkt text2pcap
-EXTRA_SCRIPTS = idl2eth
+EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \
+ randpkt text2pcap dumpcap
+EXTRA_SCRIPTS = idl2wrs
+
+idl2wrs: tools/idl2wrs.sh Makefile
+ cp $(srcdir)/tools/idl2wrs.sh idl2wrs
+ chmod +x idl2wrs
#
-# Ethereal configuration files are put in $(pkgdatadir). It currently
-# contains the "AUTHORS-SHORT" and "manuf" files and a "diameter" directory.
+# Wireshark configuration files are put in $(pkgdatadir).
#
-pkgdata_DATA = AUTHORS-SHORT manuf ethereal.html tethereal.html \
- ethereal-filter.html capinfos.html editcap.html \
- idl2eth.html mergecap.html text2pcap.html
+pkgdata_DATA = AUTHORS-SHORT COPYING manuf wireshark.html tshark.html \
+ wireshark-filter.html capinfos.html editcap.html \
+ idl2wrs.html mergecap.html text2pcap.html dumpcap.html \
+ cfilters colorfilters dfilters
#
# Install the Diameter DTD and XML files in the "diameter" subdirectory
# of that directory.
#
diameterdir = $(pkgdatadir)/diameter
-diameter_DATA = dictionary.dtd dictionary.xml imscxdx.xml mobileipv4.xml \
- nasreq.xml sunping.xml
-
-PLATFORM_SRC = pcap-util-unix.c
+diameter_DATA = \
+ diameter/chargecontrol.xml \
+ diameter/dictionary.dtd \
+ diameter/dictionary.xml \
+ diameter/imscxdx.xml \
+ diameter/mobileipv4.xml \
+ diameter/nasreq.xml \
+ diameter/sunping.xml \
+ diameter/TGPPSh.xml
+
+#
+# Install the DTDs directory files in the "dtds" subdirectory
+# of that directory
+#
+dtdsdir = $(pkgdatadir)/dtds
+dtds_DATA = \
+ dtds/dc.dtd \
+ dtds/itunes.dtd \
+ dtds/pocsettings.dtd \
+ dtds/presence.dtd \
+ dtds/reginfo.dtd \
+ dtds/rlmi.dtd \
+ dtds/rss.dtd \
+ dtds/smil.dtd \
+ dtds/xcap-caps.dtd \
+ dtds/watcherinfo.dtd
+#
+# Install the RADIUS directory files in the "radius" subdirectory
+# of that directory.
+#
+radiusdir = $(pkgdatadir)/radius
+radius_DATA = \
+ radius/dictionary \
+ radius/dictionary.3com \
+ radius/dictionary.3gpp \
+ radius/dictionary.3gpp2 \
+ radius/dictionary.acc \
+ radius/dictionary.alcatel \
+ radius/dictionary.alteon \
+ radius/dictionary.altiga \
+ radius/dictionary.aptis \
+ radius/dictionary.ascend \
+ radius/dictionary.bay \
+ radius/dictionary.bintec \
+ radius/dictionary.bristol \
+ radius/dictionary.cablelabs \
+ radius/dictionary.cabletron \
+ radius/dictionary.cisco \
+ radius/dictionary.cisco.bbsm \
+ radius/dictionary.cisco.vpn3000 \
+ radius/dictionary.cisco.vpn5000 \
+ radius/dictionary.colubris \
+ radius/dictionary.columbia_university \
+ radius/dictionary.compat \
+ radius/dictionary.cosine \
+ radius/dictionary.ericsson \
+ radius/dictionary.erx \
+ radius/dictionary.extreme \
+ radius/dictionary.foundry \
+ radius/dictionary.freeradius \
+ radius/dictionary.gandalf \
+ radius/dictionary.garderos \
+ radius/dictionary.gemtek \
+ radius/dictionary.itk \
+ radius/dictionary.juniper \
+ radius/dictionary.karlnet \
+ radius/dictionary.livingston \
+ radius/dictionary.localweb \
+ radius/dictionary.merit \
+ radius/dictionary.microsoft \
+ radius/dictionary.mikrotik \
+ radius/dictionary.navini \
+ radius/dictionary.netscreen \
+ radius/dictionary.nokia \
+ radius/dictionary.nomadix \
+ radius/dictionary.propel \
+ radius/dictionary.quintum \
+ radius/dictionary.redback \
+ radius/dictionary.redcreek \
+ radius/dictionary.shasta \
+ radius/dictionary.shiva \
+ radius/dictionary.sonicwall \
+ radius/dictionary.springtide \
+ radius/dictionary.t_systems_nova \
+ radius/dictionary.telebit \
+ radius/dictionary.trapeze \
+ radius/dictionary.tunnel \
+ radius/dictionary.unisphere \
+ radius/dictionary.unix \
+ radius/dictionary.usr \
+ radius/dictionary.valemount \
+ radius/dictionary.versanet \
+ radius/dictionary.wispr \
+ radius/dictionary.xedia
+
+PLATFORM_SRC = capture-pcap-util-unix.c
include Makefile.common
if HAVE_PLUGINS
+
plugin_libs = \
plugins/acn/acn.la \
plugins/agentx/agentx.la \
plugins/gryphon/gryphon.la \
plugins/irda/irda.la \
plugins/lwres/lwres.la \
+ plugins/mate/mate.la \
plugins/megaco/megaco.la \
plugins/mgcp/mgcp.la \
plugins/opsi/opsi.la \
plugins/pcli/pcli.la \
- plugins/rdm/rdm.la \
+ plugins/profinet/profinet.la \
plugins/rlm/rlm.la \
plugins/rtnet/rtnet.la \
plugins/rudp/rudp.la \
+ plugins/sbus/sbus.la \
+ plugins/stats_tree/stats_tree.la \
plugins/v5ua/v5ua.la
if ENABLE_STATIC
plugin_ldadd = $(plugin_libs)
-dummyddd = \
- plugins/acn/packet-acn.o \
- plugins/agentx/packet-agentx.o \
- plugins/artnet/packet-artnet.o \
- plugins/asn1/packet-asn1.o \
- plugins/ciscosm/packet-sm.o \
- plugins/docsis/packet-bpkmattr.o \
- plugins/docsis/packet-bpkmreq.o \
- plugins/docsis/packet-bpkmrsp.o \
- plugins/docsis/packet-docsis.o \
- plugins/docsis/packet-dsaack.o \
- plugins/docsis/packet-dsareq.o \
- plugins/docsis/packet-dsarsp.o \
- plugins/docsis/packet-dscack.o \
- plugins/docsis/packet-dscreq.o \
- plugins/docsis/packet-dscrsp.o \
- plugins/docsis/packet-dsdreq.o \
- plugins/docsis/packet-dsdrsp.o \
- plugins/docsis/packet-macmgmt.o \
- plugins/docsis/packet-map.o \
- plugins/docsis/packet-regack.o \
- plugins/docsis/packet-regreq.o \
- plugins/docsis/packet-regrsp.o \
- plugins/docsis/packet-rngreq.o \
- plugins/docsis/packet-rngrsp.o \
- plugins/docsis/packet-tlv.o \
- plugins/docsis/packet-uccreq.o \
- plugins/docsis/packet-uccrsp.o \
- plugins/docsis/packet-ucd.o \
- plugins/enttec/packet-enttec.o \
- plugins/giop/packet-cosnaming.o \
- plugins/giop/packet-coseventcomm.o \
- plugins/gryphon/packet-gryphon.o \
- plugins/irda/packet-irda.o \
- plugins/irda/packet-ircomm.o \
- plugins/irda/packet-sir.o \
- plugins/lwres/packet-lwres.o \
- plugins/megaco/packet-megaco.o \
- plugins/mgcp/packet-mgcp.o \
- plugins/opsi/packet-opsi.o \
- plugins/pcli/packet-pcli.o \
- plugins/rdm/packet-rdm.o \
- plugins/rlm/packet-rlm.o \
- plugins/rtnet/packet-rtnet.o \
- plugins/rudp/packet-rudp.o \
- plugins/v5ua/packet-v5ua.o
-
else # ENABLE_STATIC
+
plugin_ldadd = \
"-dlopen" self \
"-dlopen" plugins/acn/acn.la \
"-dlopen" plugins/giop/cosnaming.la \
"-dlopen" plugins/giop/coseventcomm.la \
"-dlopen" plugins/gryphon/gryphon.la \
+ "-dlopen" plugins/h223/h223.la \
"-dlopen" plugins/irda/irda.la \
"-dlopen" plugins/lwres/lwres.la \
+ "-dlopen" plugins/mate/mate.la \
"-dlopen" plugins/megaco/megaco.la \
"-dlopen" plugins/mgcp/mgcp.la \
"-dlopen" plugins/opsi/opsi.la \
"-dlopen" plugins/pcli/pcli.la \
- "-dlopen" plugins/rdm/rdm.la \
+ "-dlopen" plugins/profinet/profinet.la \
"-dlopen" plugins/rlm/rlm.la \
"-dlopen" plugins/rtnet/rtnet.la \
"-dlopen" plugins/rudp/rudp.la \
+ "-dlopen" plugins/sbus/sbus.la \
+ "-dlopen" plugins/stats_tree/stats_tree.la \
"-dlopen" plugins/v5ua/v5ua.la
endif # ENABLE_STATIC
endif # HAVE_PLUGINS
# Optional objects that I know how to build. These will be
-# linked into the ethereal executable.
-# They will also be linked into the tethereal executable; if this
+# linked into the wireshark executable.
+# They will also be linked into the tshark executable; if this
# list ever grows to include something that can't be linked with
-# tethereal, or if tethereal needs something that ethereal doesn't,
+# tshark, or if tshark needs something that wireshark doesn't,
# we should probably split this into stuff needed both
-# by ethereal and tethereal and stuff needed only by one or the
+# by wireshark and tshark and stuff needed only by one or the
# other.
-ethereal_optional_objects = @SNPRINTF_O@ @STRERROR_O@ \
+wireshark_optional_objects = @GETOPT_O@ @STRERROR_O@ \
@STRCASECMP_O@ @STRNCASECMP_O@ @MKSTEMP_O@ @STRPTIME_O@
# Additional libs that I know how to build. These will be
-# linked into the ethereal executable.
-ethereal_additional_libs = \
+# linked into the wireshark executable.
+wireshark_additional_libs = \
gtk/libui.a \
+ codecs/libcodec.a \
wiretap/libwiretap.la \
- epan/libethereal.la
+ epan/libwireshark.la
# This is the automake dependency variable for the executable
-ethereal_DEPENDENCIES = \
- $(ethereal_optional_objects) \
- $(ethereal_additional_libs) \
+wireshark_DEPENDENCIES = \
+ $(wireshark_optional_objects) \
+ $(wireshark_additional_libs) \
$(plugin_libs)
# This automake variable adds to the link-line for the executable.
#
-# Note that Ethereal doesn't have to be linked with @GLIB_LIBS@, as
+# Note that Wireshark doesn't have to be linked with @GLIB_LIBS@, as
# they are included in @GTK_LIBS@, and doesn't have to be linked with
# @SOCKET_LIBS@ or @NSL_LIBS@, as those should also be included in
# @GTK_LIBS@ (as those are also needed for X applications, and GTK+
# applications are X applications).
if ENABLE_STATIC
-ethereal_LDFLAGS = -Wl,-static -all-static
+wireshark_LDFLAGS = -Wl,-static -all-static
else
-ethereal_LDFLAGS = -export-dynamic
+wireshark_LDFLAGS = -export-dynamic
endif
-ethereal_LDADD = \
- $(ethereal_optional_objects) \
- $(ethereal_additional_libs) \
+wireshark_LDADD = \
+ $(wireshark_optional_objects) \
+ $(wireshark_additional_libs) \
@SNMP_LIBS@ @SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
- @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@
+ @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@ \
+ @LIBICONV@ \
+ @LIBGCRYPT_LIBS@ \
+ @LIBGNUTLS_LIBS@ \
+ @PORTAUDIO_LIBS@
# Additional libs that I know how to build. These will be
-# linked into the tethereal executable.
-tethereal_additional_libs = \
+# linked into the tshark executable.
+tshark_additional_libs = \
wiretap/libwiretap.la \
- epan/libethereal.la
+ epan/libwireshark.la
# This is the automake dependency variable for the executable
-tethereal_DEPENDENCIES = \
- $(ethereal_optional_objects) \
- $(tethereal_additional_libs) \
+tshark_DEPENDENCIES = \
+ $(wireshark_optional_objects) \
+ $(tshark_additional_libs) \
$(plugin_libs)
# This automake variable adds to the link-line for the executable
-tethereal_LDADD = \
- $(ethereal_optional_objects) \
- $(tethereal_additional_libs) \
+tshark_LDADD = \
+ $(wireshark_optional_objects) \
+ $(tshark_additional_libs) \
@SNMP_LIBS@ @SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
- @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@
+ @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+ @LIBICONV@ \
+ @LIBGCRYPT_LIBS@ \
+ @LIBGNUTLS_LIBS@
if ENABLE_STATIC
-tethereal_LDFLAGS = -Wl,-static -all-static
+tshark_LDFLAGS = -Wl,-static -all-static
else
-tethereal_LDFLAGS = -export-dynamic
+tshark_LDFLAGS = -export-dynamic
endif
# Optional objects that I know how to build, and that are needed by
FORCE:
svnversion.h: FORCE
- $(PERL) $(srcdir)/make-version.pl
+ $(PERL) $(srcdir)/make-version.pl $(srcdir)
#
# Build the short version of the authors file for the about dialog
#
AUTHORS-SHORT: AUTHORS make-authors-short.pl
- $(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-short.pl < AUTHORS > AUTHORS-SHORT
+ $(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-short.pl < $(srcdir)/AUTHORS > AUTHORS-SHORT
#
# Build the short version of the authors file with formatting codes for the
$(editsh) $< > $@.tmp && chmod +x $@.tmp && mv $@.tmp $@
#
-# Build "tethereal-tap-register.c", which contains a function
+# Build "tshark-tap-register.c", which contains a function
# "register_all_tap_listeners()"
-# that calls the register routines for all tehtereal tap listeners.
+# that calls the register routines for all tshark tap listeners.
#
# We do this by grepping through sources.
#
# The first argument is the directory in which the source files live.
# All subsequent arguments are the files to scan.
#
-tethereal-tap-register.c: $(TETHEREAL_TAP_SRC) $(srcdir)/make-tapreg-dotc
- @echo Making tethereal-tap-register.c
- @$(srcdir)/make-tapreg-dotc tethereal-tap-register.c $(srcdir) $(TETHEREAL_TAP_SRC)
-
+tshark-tap-register.c: $(TSHARK_TAP_SRC) $(srcdir)/make-tapreg-dotc
+ @echo Making tshark-tap-register.c
+ @$(srcdir)/make-tapreg-dotc tshark-tap-register.c $(srcdir) $(TSHARK_TAP_SRC)
+
ps.c: print.ps rdps
./rdps $(srcdir)/print.ps ps.c
rdps: rdps.c
- $(CC) $(CFLAGS) -o rdps $(srcdir)/rdps.c
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o rdps $(srcdir)/rdps.c
randpkt_additional_libs = wiretap/libwiretap.la
dftest_additional_libs = \
wiretap/libwiretap.la \
- epan/libethereal.la
+ epan/libwireshark.la
dftest_DEPENDENCIES = \
- $(ethereal_optional_objects) \
+ $(wireshark_optional_objects) \
$(dftest_additional_libs) \
$(plugin_libs)
# This automake variable adds to the link-line for the executable
dftest_LDADD = \
- $(ethereal_optional_objects) \
+ $(wireshark_optional_objects) \
$(dftest_additional_libs) \
- @SNMP_LIBS@ @SSL_LIBS@ \
+ @SNMP_LIBS@ @SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
- @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@
+ @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+ @LIBICONV@ \
+ @LIBGCRYPT_LIBS@ \
+ @LIBGNUTLS_LIBS@
dftest_LDFLAGS = -export-dynamic
+dumpcap_additional_libs = \
+ wiretap/libwiretap.la
+
+dumpcap_DEPENDENCIES = \
+ $(dumpcap_additional_libs)
+
+dumpcap_LDADD = \
+ $(dumpcap_additional_libs) \
+ @GLIB_LIBS@ \
+ @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@
+
#
# XXX - "svnversion.h" is distributed in the release tarball; should
# we be deleting it with "make clean", or should we only do that with
CLEANFILES = \
svnversion.h \
@rdps_bin@ \
- idl2eth \
- *~
+ idl2wrs \
+ *~ \
+ vgcore.pid*
#
# XXX - "ps.c" is distributed in the source tarballs; why is it in the
# included in that list.)
#
DISTCLEANFILES = \
+ AUTHORS-SHORT \
+ AUTHORS-SHORT-FORMAT \
ps.c
MAINTAINERCLEANFILES = \
- $(GENERATED_FILES)
+ $(GENERATED_FILES) \
+ Makefile.in \
+ aclocal.m4 \
+ config.h.in \
+ configure \
+ depcomp \
+ install-sh \
+ ltmain.sh \
+ missing
EXTRA_DIST = \
- AUTHORS-SHORT \
- AUTHORS-SHORT-FORMAT \
FAQ \
- INSTALL.configure \
+ INSTALL.configure \
Makefile.common \
Makefile.nmake \
README.aix \
README.tru64 \
README.vmware \
README.win32 \
- TODO \
aclocal-fallback/glib-2.0.m4 \
aclocal-fallback/glib.m4 \
aclocal-fallback/gtk-2.0.m4 \
aclocal-fallback/gtk.m4 \
+ aclocal-fallback/iconv.m4 \
aclocal-flags \
autogen.sh \
capinfos.c \
capture-wpcap.c \
capture-wpcap.h \
- cleanbld.bat \
+ capture_wpcap_packet.c \
+ capture_wpcap_packet.h \
+ cfilters \
+ colorfilters \
config.h.win32 \
config.nmake \
debian/README.debian \
debian/postinst \
debian/prerm \
debian/rules \
- dictionary.dtd \
- dictionary.xml \
- doc/Makefile.am \
- doc/Makefile.nmake \
- doc/README.capture \
- doc/README.design \
- doc/README.developer \
- doc/README.idl2eth \
- doc/README.plugins \
+ dfilters \
+ doc/Makefile.am \
+ doc/Makefile.nmake \
+ doc/README.capture \
+ doc/README.design \
+ doc/README.developer \
+ doc/README.idl2wrs \
+ doc/README.malloc \
+ doc/README.plugins \
doc/README.regression \
+ doc/README.stats_tree \
doc/README.tapping \
- doc/README.tvbuff \
doc/README.xml-output \
doc/capinfos.pod \
doc/dfilter2pod.pl \
doc/editcap.pod \
- doc/ethereal-filter.pod.template \
- doc/ethereal.pod \
- doc/idl2eth.pod \
+ doc/wireshark-filter.pod.template \
+ doc/wireshark.pod \
+ doc/idl2wrs.pod \
doc/mergecap.pod \
doc/randpkt.txt \
- doc/tethereal.pod \
+ doc/tshark.pod \
doc/text2pcap.pod \
+ doc/dumpcap.pod \
docbook/Makefile.auto.am \
- docbook/Makefile.auto.in \
doxygen.cfg.in \
+ dumpcap.c \
editcap.c \
- epan/libethereal.def \
- ethereal_be.py \
- ethereal_gen.py \
- ethereal.desktop \
- getopt.c \
- getopt.h \
- idl2eth.sh \
- image/Ethereal.icns \
- image/Makefile.nmake \
- image/README.image \
+ epan/libwireshark.def \
+ wireshark.desktop \
image/capinfos.rc.in \
image/clist_ascend.xpm \
image/clist_descend.xpm \
image/dn_arrow.xpm \
+ image/dumpcap.rc.in \
image/editcap.rc.in \
- image/eexcl3d64.xpm \
- image/eicon3d16.xpm \
- image/eicon3d32.xpm \
- image/eicon3d48.xpm \
- image/eicon3d64.xpm \
- image/elogo3d48x48.png \
- image/ethereal.ico \
- image/ethereal.rc.in \
- image/ethereal48x48-trans.png \
- image/ethereal48x48.png \
- image/hi16-app-ethereal.png \
- image/hi32-app-ethereal.png \
- image/hi48-app-ethereal.png \
- image/icon-ethereal.xpm \
- image/icon-excl.xpm \
- image/libethereal.rc.in \
- image/lo16-app-ethereal.png \
- image/lo32-app-ethereal.png \
- image/lo48-app-ethereal.png \
+ image/hi16-app-wireshark.png \
+ image/hi32-app-wireshark.png \
+ image/hi48-app-wireshark.png \
+ image/icon_layout_1.xpm \
+ image/icon_layout_2.xpm \
+ image/icon_layout_3.xpm \
+ image/icon_layout_4.xpm \
+ image/icon_layout_5.xpm \
+ image/icon_layout_6.xpm \
+ image/libwireshark.rc.in \
+ image/lo16-app-wireshark.png \
+ image/lo32-app-wireshark.png \
+ image/lo48-app-wireshark.png \
+ image/Makefile.nmake \
image/mergecap.rc.in \
image/nsis-checked.bmp \
image/nsis-unchecked.bmp \
+ image/README.image \
image/stock_dialog_error_48.xpm \
- image/stock_dialog_warning_48.xpm \
- image/stock_dialog_question_48.xpm \
image/stock_dialog_info_48.xpm \
- image/tethereal.rc.in \
+ image/stock_dialog_question_48.xpm \
+ image/stock_dialog_stop_48.xpm \
+ image/stock_dialog_warning_48.xpm \
image/text2pcap.rc.in \
- image/toolbar/capture_24.xpm \
- image/toolbar/cfilter_24.xpm \
- image/toolbar/dfilter_24.xpm \
+ image/toolbar/autoscroll_24.xpm \
+ image/toolbar/capture_airpcap_16.xpm \
+ image/toolbar/capture_capture_16.xpm \
+ image/toolbar/capture_details_16.xpm \
+ image/toolbar/capture_details_24.xpm \
+ image/toolbar/capture_ethernet_16.xpm \
+ image/toolbar/capture_filter_24.xpm \
+ image/toolbar/capture_interfaces_24.xpm \
+ image/toolbar/capture_options_24.xpm \
+ image/toolbar/capture_prepare_16.xpm \
+ image/toolbar/capture_restart_24.xpm \
+ image/toolbar/capture_start_24.xpm \
+ image/toolbar/capture_stop_24.xpm \
+ image/toolbar/checkbox_16.xpm \
+ image/toolbar/colorize_24.xpm \
+ image/toolbar/conversations_16.xpm \
+ image/toolbar/decode_as_16.xpm \
+ image/toolbar/display_filter_24.xpm \
+ image/toolbar/endpoints_16.xpm \
+ image/toolbar/file_set_list_16.xpm \
+ image/toolbar/file_set_next_16.xpm \
+ image/toolbar/file_set_previous_16.xpm \
+ image/toolbar/graphs_16.xpm \
+ image/toolbar/internet_24.xpm \
+ image/toolbar/resize_columns_24.xpm \
image/toolbar/stock_add_24.xpm \
- image/toolbar/stock_bottom_24.xpm \
+ image/toolbar/stock_bottom_24.xpm \
+ image/toolbar/stock_clear_24.xpm \
image/toolbar/stock_close_24.xpm \
image/toolbar/stock_colorselector_24.xpm \
image/toolbar/stock_help_24.xpm \
image/toolbar/stock_jump_to_24.xpm \
- image/toolbar/stock_left_arrow_24.xpm \
+ image/toolbar/stock_left_arrow_24.xpm \
image/toolbar/stock_ok_20.xpm \
image/toolbar/stock_open_24.xpm \
image/toolbar/stock_preferences_24.xpm \
image/toolbar/stock_refresh_24.xpm \
image/toolbar/stock_right_arrow_24.xpm \
image/toolbar/stock_save_24.xpm \
- image/toolbar/stock_save_as_24.xpm \
+ image/toolbar/stock_save_as_24.xpm \
image/toolbar/stock_search_24.xpm \
image/toolbar/stock_stop_24.xpm \
- image/toolbar/stock_top_24.xpm \
- image/toolbar/stock_zoom_1_24.xpm \
- image/toolbar/stock_zoom_in_24.xpm \
- image/toolbar/stock_zoom_out_24.xpm \
+ image/toolbar/stock_top_24.xpm \
+ image/toolbar/stock_zoom_1_24.xpm \
+ image/toolbar/stock_zoom_in_24.xpm \
+ image/toolbar/stock_zoom_out_24.xpm \
+ image/toolbar/telephony_16.xpm \
+ image/toolbar/time_24.xpm \
+ image/toolbar/web_support_24.xpm \
+ image/toolbar/wep_closed_24.xpm \
+ image/toolbar/wiki_24.xpm \
+ image/tshark.rc.in \
image/up_arrow.xpm \
- image/icon_layout_1.xpm \
- image/icon_layout_2.xpm \
- image/icon_layout_3.xpm \
- image/icon_layout_4.xpm \
- image/icon_layout_5.xpm \
- image/icon_layout_6.xpm \
+ image/win32-file-dlg.rc \
+ image/wiresharkdoc.ico \
+ image/wireshark.exe.manifest.in \
+ image/wireshark.ico \
+ image/wireshark.rc.in \
image/wiretap.rc.in \
- imscxdx.xml \
+ image/wsicon.svg \
+ image/wsicon16.png \
+ image/wsicon16.xpm \
+ image/wsicon256.png \
+ image/wsicon32.png \
+ image/wsicon32.xpm \
+ image/wsicon48.png \
+ image/wsicon48.xpm \
+ image/wsicon64.png \
+ image/wsicon64.xpm \
+ image/wsiconcap.svg \
+ image/wsiconcap16.xpm \
+ image/wsiconcap256.png \
+ image/wsiconcap32.xpm \
+ image/wsiconcap48.xpm \
+ image/wsicondoc.svg \
+ image/wsicondoc256.png \
+ image/wslogo.eps \
+ image/wslogo.svg \
+ image/wssplash.xpm \
make-authors-format.pl \
make-authors-short.pl \
make-manuf \
make-tapreg-dotc \
make-version.pl \
- manuf \
+ manuf \
manuf.tmpl \
mergecap.c \
- mobileipv4.xml \
- nasreq.xml \
perlnoutf.pl \
- print.ps \
+ print.ps \
+ $(diameter_DATA) \
+ $(dtds_DATA) \
+ $(radius_DATA) \
randpkt.c \
rdps.c \
- sunping.xml \
- text2pcap-scanner.l \
- text2pcap.c \
- text2pcap.h \
+ text2pcap-scanner.l \
+ text2pcap.c \
+ text2pcap.h \
+ packaging/u3/win32/README.txt \
+ packaging/u3/win32/makefile.nmake \
+ packaging/u3/win32/manifest.tmpl \
+ packaging/u3/win32/u3util.c \
+ tools/idl2wrs.sh.in \
wka.tmpl
if SETUID_INSTALL
install-exec-hook:
- -chmod +s $(DESTDIR)$(bindir)/ethereal
- -chmod +s $(DESTDIR)$(bindir)/tethereal
+ -chmod +s $(DESTDIR)$(bindir)/dumpcap
+ -chmod +s $(DESTDIR)$(bindir)/tshark
else
install-exec-hook:
endif
-DIST_SUBDIRS = tools wiretap doc epan plugins packaging gtk help
+DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap
if HAVE_PLUGINS
-SUBDIRS = tools wiretap doc epan plugins packaging help @ethereal_SUBDIRS@
+SUBDIRS = tools wiretap doc epan plugins packaging help @wireshark_SUBDIRS@
else
-SUBDIRS = tools wiretap doc epan packaging help @ethereal_SUBDIRS@
+SUBDIRS = tools wiretap doc epan packaging help @wireshark_SUBDIRS@
endif
-ethereal.1: doc/ethereal.pod AUTHORS-SHORT-FORMAT
+wireshark.1: doc/wireshark.pod AUTHORS-SHORT-FORMAT
(cd doc ; \
- $(MAKE) ../ethereal.1 )
+ $(MAKE) ../wireshark.1 )
-tethereal.1: doc/tethereal.pod
+tshark.1: doc/tshark.pod
(cd doc ; \
- $(MAKE) ../tethereal.1 )
+ $(MAKE) ../tshark.1 )
-ethereal-filter.4: tethereal doc/ethereal-filter.pod.template
+wireshark-filter.4: tshark doc/wireshark-filter.pod.template
(cd doc ; \
- $(MAKE) ../ethereal-filter.4 )
+ $(MAKE) ../wireshark-filter.4 )
capinfos.1: doc/capinfos.pod
(cd doc ; \
(cd doc ; \
$(MAKE) ../editcap.1 )
-idl2eth.1: doc/idl2eth.pod
+idl2wrs.1: doc/idl2wrs.pod
(cd doc ; \
- $(MAKE) ../idl2eth.1 )
+ $(MAKE) ../idl2wrs.1 )
mergecap.1: doc/mergecap.pod
(cd doc ; \
(cd doc ; \
$(MAKE) ../text2pcap.1 )
-ethereal.html: doc/ethereal.pod AUTHORS-SHORT-FORMAT
+dumpcap.1: doc/dumpcap.pod
+ (cd doc ; \
+ $(MAKE) ../dumpcap.1 )
+
+wireshark.html: doc/wireshark.pod AUTHORS-SHORT-FORMAT
(cd doc ; \
- $(MAKE) ../ethereal.html )
+ $(MAKE) ../wireshark.html )
-tethereal.html: doc/tethereal.pod
+tshark.html: doc/tshark.pod
(cd doc ; \
- $(MAKE) ../tethereal.html )
+ $(MAKE) ../tshark.html )
-ethereal-filter.html: tethereal doc/ethereal-filter.pod.template
+wireshark-filter.html: tshark doc/wireshark-filter.pod.template
(cd doc ; \
- $(MAKE) ../ethereal-filter.html )
+ $(MAKE) ../wireshark-filter.html )
capinfos.html: doc/capinfos.pod
(cd doc ; \
(cd doc ; \
$(MAKE) ../editcap.html )
-idl2eth.html: doc/idl2eth.pod
+idl2wrs.html: doc/idl2wrs.pod
(cd doc ; \
- $(MAKE) ../idl2eth.html )
+ $(MAKE) ../idl2wrs.html )
mergecap.html: doc/mergecap.pod
(cd doc ; \
(cd doc ; \
$(MAKE) ../text2pcap.html )
+dumpcap.html: doc/dumpcap.pod
+ (cd doc ; \
+ $(MAKE) ../dumpcap.html )
+
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
mkdir -p BUILD RPMS SOURCES ; \
cd SOURCES ; \
ln -s ../../../$(distdir).tar.gz ; \
+ ln -s ../../../wireshark.desktop ; \
+ ln -s ../../../image/wsicon64.png wireshark.png ; \
cd .. ; \
- rpmbuild --define "_topdir `cd . && pwd`" -bb SPECS/ethereal.spec && \
+ rpmbuild --define "_topdir `cd . && pwd`" -bb SPECS/wireshark.spec && \
echo "Package successfully built in `pwd`/RPMS." ; \
else \
echo "Error: RPM executable and/or source directory not found." ; \
mkdir -p BUILD SRPMS SOURCES ; \
cd SOURCES ; \
ln -s ../../../$(distdir).tar.gz ; \
+ ln -s ../../../wireshark.desktop ; \
+ ln -s ../../../image/wsicon64.png wireshark.png ; \
cd .. ; \
- rpmbuild --define "_topdir `cd . && pwd`" -bs SPECS/ethereal.spec && \
+ rpmbuild --define "_topdir `cd . && pwd`" -bs SPECS/wireshark.spec && \
echo "Package successfully built in `pwd`/SRPMS." ; \
else \
echo "Error: RPM executable and/or source directory not found." ; \
clean-local:
rm -rf $(top_stagedir)
-test-splint: $(ethereal_SOURCES)
- splint \
- -gnu-extensions -D_U_="" \
- -I. `glib-config --cflags` \
- -I./epan \
- -I./tools/lemon \
- -I./wiretap \
- $(ethereal_SOURCES)
git.samba.org / obnox / wireshark / wip.git / blobdiff