EXTRA_SCRIPTS = idl2wrs
idl2wrs: tools/idl2wrs.sh Makefile
- $(do_subst) < $(srcdir)/tools/idl2wrs.sh > idl2wrs
+ 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 wireshark.html tshark.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
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/smil.dtd \
+ dtds/xcap-caps.dtd \
+ dtds/watcherinfo.dtd
#
# Install the RADIUS directory files in the "radius" subdirectory
# of that directory.
if HAVE_PLUGINS
-if HAVE_LIBLUA
-lua_lib = plugins/lua/lua.la
-else # HAVE_LIBLUA
-lua_lib =
-endif # HAVE_LIBLUA
-
plugin_libs = \
plugins/acn/acn.la \
plugins/agentx/agentx.la \
plugins/giop/coseventcomm.la \
plugins/gryphon/gryphon.la \
plugins/irda/irda.la \
- $(lua_lib) \
plugins/lwres/lwres.la \
plugins/mate/mate.la \
plugins/megaco/megaco.la \
plugins/opsi/opsi.la \
plugins/pcli/pcli.la \
plugins/profinet/profinet.la \
- plugins/rdm/rdm.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
else # ENABLE_STATIC
-if HAVE_LIBLUA
-lua_ldadd = "-dlopen" plugins/lua/lua.la
-else # HAVE_LIBLUA
-lua_ldadd =
-endif # HAVE_LIBLUA
-
plugin_ldadd = \
"-dlopen" self \
"-dlopen" plugins/acn/acn.la \
"-dlopen" plugins/gryphon/gryphon.la \
"-dlopen" plugins/h223/h223.la \
"-dlopen" plugins/irda/irda.la \
- $(lua_ldadd) \
"-dlopen" plugins/lwres/lwres.la \
"-dlopen" plugins/mate/mate.la \
"-dlopen" plugins/megaco/megaco.la \
"-dlopen" plugins/opsi/opsi.la \
"-dlopen" plugins/pcli/pcli.la \
"-dlopen" plugins/profinet/profinet.la \
- "-dlopen" plugins/rdm/rdm.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
# we should probably split this into stuff needed both
# by wireshark and tshark and stuff needed only by one or the
# other.
-wireshark_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 wireshark executable.
wireshark_additional_libs = \
gtk/libui.a \
+ codecs/libcodec.a \
wiretap/libwiretap.la \
epan/libwireshark.la
# 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+
$(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 tshark executable.
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+ @LIBICONV@ \
+ @LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@
if ENABLE_STATIC
./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
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+ @LIBICONV@ \
+ @LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@
dftest_LDFLAGS = -export-dynamic
aclocal-fallback/glib.m4 \
aclocal-fallback/gtk-2.0.m4 \
aclocal-fallback/gtk.m4 \
+ aclocal-fallback/iconv.m4 \
aclocal-flags \
autogen.sh \
capinfos.c \
dumpcap.c \
editcap.c \
epan/libwireshark.def \
- wireshark_be.py \
- wireshark_gen.py \
wireshark.desktop \
- image/Ethereal.icns \
- image/Makefile.nmake \
- image/README.image \
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/eicon3d16.xpm \
- image/eicon3d32.xpm \
- image/eicon3d48.xpm \
- image/eicon3d64.xpm \
- image/eiconcap16.xpm \
- image/eiconcap32.xpm \
- image/eiconcap48.xpm \
- image/elogo3d48x48.png \
- image/wireshark.exe.manifest.in \
- image/wireshark.ico \
- image/wireshark.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/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-ethereal.png \
- image/lo32-app-ethereal.png \
- image/lo48-app-ethereal.png \
+ 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/tshark.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/wiresharkdoc.ico \
+ image/wireshark.exe.manifest.in \
+ image/wireshark.ico \
+ image/wireshark.rc.in \
image/wiretap.rc.in \
+ image/wsicon.svg \
image/wsicon16.png \
- image/wsicon200.png \
+ image/wsicon16.xpm \
+ image/wsicon256.png \
image/wsicon32.png \
+ image/wsicon32.xpm \
image/wsicon48.png \
+ image/wsicon48.xpm \
image/wsicon64.png \
- image/wsicon.svg \
+ 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 \
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:
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 @wireshark_SUBDIRS@
cd SOURCES ; \
ln -s ../../../$(distdir).tar.gz ; \
ln -s ../../../wireshark.desktop ; \
- ln -s ../../../image/elogo3d64x64.png ethereal.png ; \
+ ln -s ../../../image/wsicon64.png wireshark.png ; \
cd .. ; \
rpmbuild --define "_topdir `cd . && pwd`" -bb SPECS/wireshark.spec && \
echo "Package successfully built in `pwd`/RPMS." ; \
cd SOURCES ; \
ln -s ../../../$(distdir).tar.gz ; \
ln -s ../../../wireshark.desktop ; \
- ln -s ../../../image/elogo3d64x64.png wireshark.png ; \
+ ln -s ../../../image/wsicon64.png wireshark.png ; \
cd .. ; \
rpmbuild --define "_topdir `cd . && pwd`" -bs SPECS/wireshark.spec && \
echo "Package successfully built in `pwd`/SRPMS." ; \
git.samba.org / obnox / wireshark / wip.git / blobdiff