@editcap_bin@ \
@randpkt_bin@ \
@dftest_bin@ \
- @dumpcap_bin@
+ @dumpcap_bin@ \
+ @rawshark_bin@
bin_SCRIPTS = @idl2wrs_bin@
+
man1_MANS = \
@wireshark_man@ \
@tshark_man@ \
@capinfos_man@ \
@editcap_man@ \
@dumpcap_man@ \
- @idl2wrs_man@
+ @idl2wrs_man@ \
+ @rawshark_man@
man4_MANS = @wiresharkfilter_man@
man_MANS =
EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \
- randpkt text2pcap dumpcap
+ randpkt text2pcap dumpcap rawshark
EXTRA_SCRIPTS = idl2wrs
idl2wrs: tools/idl2wrs.sh Makefile
pkgdata_DATA = AUTHORS-SHORT COPYING manuf services wireshark.html \
tshark.html wireshark-filter.html capinfos.html editcap.html \
idl2wrs.html mergecap.html text2pcap.html dumpcap.html \
- cfilters colorfilters dfilters smi_modules
+ rawshark.html ws.css cfilters colorfilters dfilters smi_modules
#
# Install the Diameter DTD and XML files in the "diameter" subdirectory
diameter/chargecontrol.xml \
diameter/dictionary.dtd \
diameter/dictionary.xml \
+ diameter/Ericsson.xml \
diameter/etsie2e4.xml \
diameter/gqpolicy.xml \
diameter/imscxdx.xml \
diameter/nasreq.xml \
diameter/sip.xml \
diameter/sunping.xml \
+ diameter/TGPPGmb.xml \
diameter/TGPPSh.xml
#
radius/dictionary.wispr \
radius/dictionary.xedia
+#
+# Install the tpncp directory files in the "tpncp" subdirectory
+# of that directory
+#
+tpncpdir = $(pkgdatadir)/tpncp
+tpncp_DATA = \
+ tpncp/tpncp.dat
+
+
#
# Install the wimaxasncp directory files in the "wimaxasncp" subdirectory
# of that directory
-dlopen plugins/giop/cosnaming.la \
-dlopen plugins/giop/coseventcomm.la \
-dlopen plugins/gryphon/gryphon.la \
+ -dlopen plugins/infiniband/infiniband.la \
-dlopen plugins/irda/irda.la \
-dlopen plugins/lwres/lwres.la \
-dlopen plugins/m2m/m2m.la \
-dlopen plugins/rtnet/rtnet.la \
-dlopen plugins/rudp/rudp.la \
-dlopen plugins/sbus/sbus.la \
+ -dlopen plugins/sercosiii/sercosiii.la \
-dlopen plugins/stats_tree/stats_tree.la \
-dlopen plugins/unistim/unistim.la \
-dlopen plugins/v5ua/v5ua.la \
WTAP_PLUGIN_SOURCES = \
epan/plugins.c \
epan/report_err.c \
- epan/privileges.c \
epan/filesystem.c
else # HAVE_PLUGINS
plugin_ldadd =
-WTAP_PLUGIN_SOURCES =
+WTAP_PLUGIN_SOURCES =
endif # HAVE_PLUGINS
codecs/libcodec.a \
wiretap/libwiretap.la \
epan/libwireshark.la \
+ wsutil/libwsutil.la \
@INET_PTON_LO@ \
+ @INET_NTOP_LO@ \
@SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
@PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@ \
- @LIBICONV@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
+ @LIBSMI_LDFLAGS@ \
@PORTAUDIO_LIBS@
+wireshark_DEPENDENCIES = \
+ @INET_PTON_LO@ \
+ @INET_NTOP_LO@
+
if ENABLE_STATIC
tshark_LDFLAGS = -Wl,-static -all-static
else
$(wireshark_optional_objects) \
wiretap/libwiretap.la \
epan/libwireshark.la \
+ wsutil/libwsutil.la \
@INET_PTON_LO@ \
+ @INET_NTOP_LO@ \
@SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
- @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
- @LIBICONV@ \
+ @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+ @FRAMEWORKS@ \
+ @LIBGCRYPT_LIBS@ \
+ @LIBGNUTLS_LIBS@ \
+ @LIBSMI_LDFLAGS@
+
+tshark_DEPENDENCIES = \
+ @INET_PTON_LO@ \
+ @INET_NTOP_LO@
+
+if ENABLE_STATIC
+rawshark_LDFLAGS = -Wl,-static -all-static
+else
+rawshark_LDFLAGS = -export-dynamic
+endif
+
+# Libraries and plugin flags with which to link tshark.
+rawshark_LDADD = \
+ $(wireshark_optional_objects) \
+ wiretap/libwiretap.la \
+ epan/libwireshark.la \
+ wsutil/libwsutil.la \
+ @INET_PTON_LO@ \
+ @INET_NTOP_LO@ \
+ @SSL_LIBS@ \
+ $(plugin_ldadd) \
+ @PCRE_LIBS@ \
+ @GLIB_LIBS@ -lm \
+ @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
+ @FRAMEWORKS@ \
@LIBGCRYPT_LIBS@ \
- @LIBGNUTLS_LIBS@
+ @LIBGNUTLS_LIBS@ \
+ @LIBSMI_LDFLAGS@
+
+rawshark_DEPENDENCIES = \
+ @INET_PTON_LO@ \
+ @INET_NTOP_LO@
# Optional objects that I know how to build, and that are needed by
# text2pcap.
text2pcap_LDADD = \
$(text2pcap_optional_objects) \
wiretap/libwiretap.la \
+ wsutil/libwsutil.la \
@GLIB_LIBS@ -lm
# Libraries with which to link mergecap.
mergecap_LDADD = \
wiretap/libwiretap.la \
+ wsutil/libwsutil.la \
@GLIB_LIBS@
# Libraries with which to link capinfos.
capinfos_LDADD = \
wiretap/libwiretap.la \
+ wsutil/libwsutil.la \
@GLIB_LIBS@
# Libraries with which to link editcap.
editcap_LDADD = \
wiretap/libwiretap.la \
+ wsutil/libwsutil.la \
@GLIB_LIBS@
# Libraries with which to link randpkt.
randpkt_LDADD = \
wiretap/libwiretap.la \
+ wsutil/libwsutil.la \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@
dftest_LDADD = \
$(wireshark_optional_objects) \
wiretap/libwiretap.la \
+ wsutil/libwsutil.la \
epan/libwireshark.la \
@SSL_LIBS@ \
$(plugin_ldadd) \
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
- @LIBICONV@ \
@LIBGCRYPT_LIBS@ \
- @LIBGNUTLS_LIBS@
+ @LIBGNUTLS_LIBS@ \
+ @LIBSMI_LDFLAGS@
# Libraries with which to link dumpcap.
dumpcap_LDADD = \
wiretap/libwiretap.la \
+ wsutil/libwsutil.la \
@INET_NTOP_LO@ \
@GLIB_LIBS@ \
- @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ \
- @LIBGCRYPT_LIBS@
+ @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @FRAMEWORKS@ \
+ @LIBGCRYPT_LIBS@ \
+ @LIBCAP_LIBS@
+
+dumpcap_DEPENDENCIES = \
+ @INET_NTOP_LO@
# Common headers
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
- $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
+ $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS)
#
# Build the version string
FORCE:
svnversion.h: FORCE
- $(PERL) $(srcdir)/make-version.pl $(srcdir)
+ LANG=C $(PERL) $(srcdir)/make-version.pl $(srcdir)
#
# Build the short version of the authors file for the about dialog
DISTCLEANFILES = \
AUTHORS-SHORT \
AUTHORS-SHORT-FORMAT \
- ps.c
+ ps.c \
+ ws.css
MAINTAINERCLEANFILES = \
$(GENERATED_FILES) \
aclocal-fallback/glib.m4 \
aclocal-fallback/gtk-2.0.m4 \
aclocal-fallback/gtk.m4 \
- aclocal-fallback/iconv.m4 \
aclocal-flags \
+ adns_dll.dep \
+ adns_dll.rc \
autogen.sh \
capinfos.c \
capture-wpcap.c \
colorfilters \
config.h.win32 \
config.nmake \
- debian/README.debian \
debian/changelog \
+ debian/compat \
debian/control \
debian/copyright \
debian/dirs \
- debian/docs \
- debian/menu \
+ debian/headers-check.c \
+ debian/patches/00list \
+ debian/patches/03_preferences.dpatch \
debian/postinst \
- debian/prerm \
+ debian/pycompat \
+ debian/pyversions \
debian/rules \
+ debian/tshark.files \
+ debian/tshark.manpages \
+ debian/watch \
+ debian/wireshark-common.files \
+ debian/wireshark-common.manpages \
+ debian/wireshark-common.shlibs \
+ debian/wireshark-dev.docs \
+ debian/wireshark-dev.files \
+ debian/wireshark-dev.header-files \
+ debian/wireshark-dev.manpages \
+ debian/wireshark-dev.prerm \
+ debian/wireshark-root.desktop \
+ debian/wireshark.desktop \
+ debian/wireshark.files \
+ debian/wireshark.manpages \
+ debian/wireshark.menu \
dfilters \
- doc/Makefile.am \
- doc/Makefile.nmake \
- doc/README.binarytrees \
- doc/README.capture \
- doc/README.design \
- doc/README.developer \
- doc/README.display_filter \
- doc/README.idl2wrs \
- doc/README.malloc \
- doc/README.packaging \
- doc/README.plugins \
- doc/README.regression \
- doc/README.request_response_tracking \
- doc/README.stats_tree \
- doc/README.tapping \
- doc/README.xml-output \
- doc/capinfos.pod \
- doc/dfilter2pod.pl \
- doc/dumpcap.pod \
- doc/editcap.pod \
- doc/eproto2sgml \
- doc/idl2wrs.pod \
- doc/mergecap.pod \
- doc/randpkt.txt \
- doc/sgml.doc.template \
- doc/text2pcap.pod \
- doc/tshark.pod \
- doc/wireshark-filter.pod.template \
- doc/wireshark.pod \
docbook/Makefile.auto.am \
+ docbook/ws.css \
doxygen.cfg.in \
dumpcap.c \
editcap.c \
- epan/libwireshark.def \
example_snmp_users_file \
wireshark.desktop \
image/capinfos.rc.in \
image/dn_arrow.xpm \
image/dumpcap.rc.in \
image/editcap.rc.in \
+ image/expert_chat.xpm \
+ image/expert_error.xpm \
+ image/expert_none.xpm \
+ image/expert_note.xpm \
+ image/expert_warn.xpm \
+ image/file_dlg_win32.rc \
image/hi16-app-wireshark.png \
image/hi32-app-wireshark.png \
image/hi48-app-wireshark.png \
image/mergecap.rc.in \
image/nsis-checked.bmp \
image/nsis-unchecked.bmp \
+ image/rawshark.rc.in \
image/README.image \
image/stock_dialog_error_48.xpm \
image/stock_dialog_info_48.xpm \
image/toolbar/decode_as_16.xpm \
image/toolbar/display_filter_24.xpm \
image/toolbar/endpoints_16.xpm \
+ image/toolbar/expert_info_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/flow_graph_16.xpm \
image/toolbar/graphs_16.xpm \
+ image/toolbar/icon_color_0.xpm \
+ image/toolbar/icon_color_1.xpm \
+ image/toolbar/icon_color_2.xpm \
+ image/toolbar/icon_color_3.xpm \
+ image/toolbar/icon_color_4.xpm \
+ image/toolbar/icon_color_5.xpm \
+ image/toolbar/icon_color_6.xpm \
+ image/toolbar/icon_color_7.xpm \
+ image/toolbar/icon_color_8.xpm \
+ image/toolbar/icon_color_9.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_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_ok_20.xpm \
- image/toolbar/stock_open_24.xpm \
- image/toolbar/stock_preferences_24.xpm \
- image/toolbar/stock_print_24.xpm \
- image/toolbar/stock_properties_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_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/telephony_16.xpm \
image/toolbar/time_24.xpm \
image/toolbar/web_support_24.xpm \
image/toolbar/wiki_24.xpm \
image/tshark.rc.in \
image/up_arrow.xpm \
- image/win32-file-dlg.rc \
image/wiresharkdoc.ico \
- image/wiresharkinst.ico \
image/wireshark.exe.manifest.in \
image/wireshark.ico \
+ image/wiresharkinst.ico \
image/wireshark.rc.in \
image/wiretap.rc.in \
- image/wsicon.svg \
image/wsicon16.png \
image/wsicon16.xpm \
image/wsicon256.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/wsiconcap.svg \
image/wsicondoc256.png \
- image/wsiconinst.svg \
+ image/wsicondoc.svg \
image/wsiconinst256.png \
+ image/wsiconinst.svg \
+ image/wsicon.svg \
image/wslogo.eps \
image/wslogo.svg \
image/wssplash.xpm \
+ image/wssplash-dev.xpm \
make-authors-format.pl \
make-authors-short.pl \
make-manuf \
$(diameter_DATA) \
$(dtds_DATA) \
$(radius_DATA) \
- $(wimaxasncp_DATA) \
+ $(tpncp_DATA) \
+ $(wimaxasncp_DATA) \
randpkt.c \
rdps.c \
- smi_modules \
+ smi_modules \
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 \
- services \
- tools/idl2wrs.sh.in \
- tools/setuid-root.pl.in \
+ services \
wka.tmpl
if SETUID_INSTALL
install-exec-hook:
-chmod +s $(DESTDIR)$(bindir)/dumpcap
- -chmod +s $(DESTDIR)$(bindir)/tshark
else
install-exec-hook:
endif
-DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap
+DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil
if HAVE_PLUGINS
-SUBDIRS = tools wiretap doc epan plugins packaging help @wireshark_SUBDIRS@
+SUBDIRS = tools wsutil wiretap doc epan plugins packaging help @wireshark_SUBDIRS@
else
-SUBDIRS = tools wiretap doc epan packaging help @wireshark_SUBDIRS@
+SUBDIRS = tools wsutil wiretap doc epan packaging help @wireshark_SUBDIRS@
endif
wireshark.1: doc/wireshark.pod AUTHORS-SHORT-FORMAT
(cd doc ; \
$(MAKE) ../dumpcap.1 )
-wireshark.html: doc/wireshark.pod AUTHORS-SHORT-FORMAT
+rawshark.1: doc/rawshark.pod
+ (cd doc ; \
+ $(MAKE) ../rawshark.1 )
+
+ws.css: $(srcdir)/docbook/ws.css
+ cp $(srcdir)/docbook/ws.css .
+
+wireshark.html: doc/wireshark.pod AUTHORS-SHORT-FORMAT ws.css
(cd doc ; \
$(MAKE) ../wireshark.html )
-tshark.html: doc/tshark.pod
+tshark.html: doc/tshark.pod ws.css
(cd doc ; \
$(MAKE) ../tshark.html )
-wireshark-filter.html: tshark doc/wireshark-filter.pod.template
+wireshark-filter.html: tshark doc/wireshark-filter.pod.template ws.css
(cd doc ; \
$(MAKE) ../wireshark-filter.html )
-capinfos.html: doc/capinfos.pod
+capinfos.html: doc/capinfos.pod ws.css
(cd doc ; \
$(MAKE) ../capinfos.html )
-editcap.html: doc/editcap.pod
+editcap.html: doc/editcap.pod ws.css
(cd doc ; \
$(MAKE) ../editcap.html )
-idl2wrs.html: doc/idl2wrs.pod
+idl2wrs.html: doc/idl2wrs.pod ws.css
(cd doc ; \
$(MAKE) ../idl2wrs.html )
-mergecap.html: doc/mergecap.pod
+mergecap.html: doc/mergecap.pod ws.css
(cd doc ; \
$(MAKE) ../mergecap.html )
-text2pcap.html: doc/text2pcap.pod
+text2pcap.html: doc/text2pcap.pod ws.css
(cd doc ; \
$(MAKE) ../text2pcap.html )
-dumpcap.html: doc/dumpcap.pod
+dumpcap.html: doc/dumpcap.pod ws.css
(cd doc ; \
$(MAKE) ../dumpcap.html )
+rawshark.html: doc/rawshark.pod ws.css
+ (cd doc ; \
+ $(MAKE) ../rawshark.html )
+
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
+# Used by svr4-package and osx-package
# We load top_stagedir with an explicit path so that libtool doesn't freak.
-top_stagedir=`cd $(top_srcdir) && pwd`/packaging/svr4.stage
-stagedir=$(top_stagedir)/$(PACKAGE).stage
+top_stagedir=`cd $(top_srcdir) && pwd`/packaging/staging
+stagedir=$(top_stagedir)/$(PACKAGE).inst
+
host_cpu=@host_cpu@
host_os=@host_os@
-svr4-package: $(bin_SCRIPTS) $(lib_LTLIBRARIES)
+svr4-package: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA)
@if test x$(HAVE_SVR4_PACKAGING) = xyes ; then \
rm -rf $(stagedir) ; \
$(MAKE) DESTDIR=$(stagedir) install; \
solaris-package: svr4-package
-rpm_topdir=`cd $(top_srcdir) && pwd`/packaging/rpm
+rpm_topdir=`cd $(top_builddir) && pwd`/packaging/rpm
rpm-package: dist
if test x$(HAVE_RPM) = xyes ; then \
cd $(rpm_topdir) ; \
fi
debian-package: debian/rules
- dpkg-buildpackage -rfakeroot -us -uc
+ @if test x$(HAVE_DPKG_BUILDPACKAGE) = xyes ; then \
+ dpkg-buildpackage -rfakeroot -us -uc ; \
+ else \
+ echo "Error: Debian packaging tools not found." ; \
+ echo "Package build abandoned." ; \
+ fi
+
+# XXX - This assumes we're building from the source directory.
+osx-app: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) packaging/macosx/Info.plist
+ @if test x$(HAVE_OSX_PACKAGING) = xyes ; then \
+ rm -rf $(stagedir) ; \
+ $(MAKE) DESTDIR=$(stagedir) install; \
+ cd $(srcdir)/packaging/macosx ; \
+ ./osx-app.sh -bp ../staging/$(PACKAGE).inst/$(bindir) ; \
+ else \
+ echo "Error: OS X packaging tools not found." ; \
+ echo "Package build abandoned." ; \
+ fi
+
+osx-package: osx-app
+ @if test x$(HAVE_OSX_PACKAGING) = xyes ; then \
+ cd $(srcdir)/packaging/macosx ; \
+ ./osx-dmg.sh ; \
+ fi
clean-local:
rm -rf $(top_stagedir)
+checkapi_local:
+ $(PERL) tools/checkAPIs.pl \
+ $(TSHARK_TAP_SRC)
+# $(wireshark_SOURCES)
+# $(EXTRA_wireshark_SOURCES)
+
+checkapi: checkapi_local
+ cd wiretap && $(MAKE) checkapi
+ cd ../codecs && $(MAKE) checkapi
+## cd ../gtk && $(MAKE) checkapi
+## cd ../epan && $(MAKE) checkapi
+## cd ../epan/crypt && $(MAKE) checkapi
+ cd ../dfilter && $(MAKE) checkapi
+## cd ../ftypes && $(MAKE) checkapi
+## cd ../wslua && $(MAKE) checkapi
+ cd ../dissectors && $(MAKE) checkapi
+ cd ../../plugins && $(MAKE) checkapi
+ cd ../wsutil && $(MAKE) checkapi
git.samba.org / obnox / wireshark / wip.git / blobdiff