# 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@ @dumpcap_bin@
-bin_SCRIPTS = @idl2eth_bin@
-man1_MANS = @ethereal_man@ @capinfos_man@ @editcap_man@ @mergecap_man@ @tethereal_man@ @text2pcap_man@ @dumpcap_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 \
+EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \
randpkt text2pcap dumpcap
-EXTRA_SCRIPTS = idl2eth
+EXTRA_SCRIPTS = idl2wrs
+
+idl2wrs: tools/idl2wrs.sh Makefile
+ cp $(srcdir)/tools/idl2wrs.sh idl2wrs
+ chmod +x idl2wrs
#
-# Ethereal configuration files are put in $(pkgdatadir).
+# 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 dumpcap.html \
+pkgdata_DATA = AUTHORS-SHORT manuf wireshark.html tshark.html \
+ wireshark-filter.html capinfos.html editcap.html \
+ idl2wrs.html mergecap.html text2pcap.html dumpcap.html \
cfilters colorfilters dfilters
#
dtds_DATA = \
dtds/dc.dtd \
dtds/itunes.dtd \
+ dtds/pocsettings.dtd \
+ dtds/presence.dtd \
+ dtds/reginfo.dtd \
dtds/rss.dtd \
- dtds/smil.dtd
-
+ dtds/smil.dtd \
+ dtds/xcap-caps.dtd \
+ dtds/watcherinfo.dtd
#
# Install the RADIUS directory files in the "radius" subdirectory
# of that directory.
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
"-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 # 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 wireshark doesn't,
+# tshark, or if tshark needs something that wireshark doesn't,
# we should probably split this into stuff needed both
-# by wireshark 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 = @GETOPT_O@ @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@ \
- @LIBGNUTLS_LIBS@
+ @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@ \
+ @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
$(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 tethereal 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
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@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+ @LIBICONV@ \
+ @LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@
dftest_LDFLAGS = -export-dynamic
CLEANFILES = \
svnversion.h \
@rdps_bin@ \
- idl2eth \
+ idl2wrs \
*~ \
vgcore.pid*
aclocal-fallback/glib.m4 \
aclocal-fallback/gtk-2.0.m4 \
aclocal-fallback/gtk.m4 \
+ aclocal-fallback/iconv.m4 \
aclocal-flags \
autogen.sh \
capinfos.c \
doc/README.capture \
doc/README.design \
doc/README.developer \
- doc/README.idl2eth \
+ doc/README.idl2wrs \
doc/README.malloc \
doc/README.plugins \
doc/README.regression \
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 \
doxygen.cfg.in \
dumpcap.c \
editcap.c \
- epan/libethereal.def \
- ethereal_be.py \
- ethereal_gen.py \
- ethereal.desktop \
- 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/eiconcap16.xpm \
- image/eiconcap32.xpm \
- image/eiconcap48.xpm \
- image/elogo3d48x48.png \
- image/ethereal.exe.manifest.in \
- 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/stock_dialog_question_48.xpm \
image/stock_dialog_stop_48.xpm \
- image/tethereal.rc.in \
+ image/stock_dialog_warning_48.xpm \
image/text2pcap.rc.in \
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/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/wireshark.exe.manifest.in \
+ image/wireshark.ico \
+ image/wireshark.rc.in \
image/wiretap.rc.in \
+ image/wsicon.svg \
+ image/wsicon16.png \
+ image/wsicon16.xpm \
+ image/wsicon200.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/wsiconcap200.png \
+ image/wsiconcap32.xpm \
+ image/wsiconcap48.xpm \
+ image/wslogo.eps \
+ image/wslogo.svg \
+ image/wssplash.xpm \
make-authors-format.pl \
make-authors-short.pl \
make-manuf \
if SETUID_INSTALL
install-exec-hook:
-chmod +s $(DESTDIR)$(bindir)/dumpcap
- -chmod +s $(DESTDIR)$(bindir)/tethereal
+ -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) ../dumpcap.1 )
-ethereal.html: doc/ethereal.pod AUTHORS-SHORT-FORMAT
+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 ; \
mkdir -p BUILD RPMS SOURCES ; \
cd SOURCES ; \
ln -s ../../../$(distdir).tar.gz ; \
- ln -s ../../../ethereal.desktop ; \
- ln -s ../../../image/elogo3d64x64.png ethereal.png ; \
+ 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 ../../../ethereal.desktop ; \
- ln -s ../../../image/elogo3d64x64.png ethereal.png ; \
+ 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." ; \
git.samba.org / obnox / wireshark / wip.git / blobdiff