@dftest_bin@ \
@dumpcap_bin@ \
@rawshark_bin@
-bin_SCRIPTS = @idl2wrs_bin@
EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \
randpkt text2pcap dumpcap rawshark
-EXTRA_SCRIPTS = idl2wrs
-
-idl2wrs: tools/idl2wrs.sh Makefile
- cp tools/idl2wrs.sh idl2wrs
- chmod +x idl2wrs
+bin_SCRIPTS = tools/idl2wrs
#
# Wireshark configuration files are put in $(pkgdatadir).
#
pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
- smi_modules ipmap.html
+ smi_modules ipmap.html pdml2html.xsl
#
# Install the Diameter DTD and XML files in the "diameter" subdirectory
diameterdir = $(pkgdatadir)/diameter
diameter_DATA = \
diameter/chargecontrol.xml \
+ diameter/Cisco.xml \
diameter/dictionary.dtd \
diameter/dictionary.xml \
diameter/eap.xml \
diameter/gqpolicy.xml \
diameter/imscxdx.xml \
diameter/mobileipv4.xml \
+ diameter/mobileipv6.xml \
diameter/nasreq.xml \
diameter/sip.xml \
diameter/sunping.xml \
diameter/TGPPGmb.xml \
diameter/TGPPRx.xml \
- diameter/TGPPSh.xml
+ diameter/TGPPSh.xml \
+ diameter/Vodafone.xml
#
# Install the DTDs directory files in the "dtds" subdirectory
radius/dictionary.3gpp \
radius/dictionary.3gpp2 \
radius/dictionary.acc \
+ radius/dictionary.acme \
radius/dictionary.airespace \
radius/dictionary.alcatel \
+ radius/dictionary.alcatel.esam \
+ radius/dictionary.alcatel.sr \
radius/dictionary.alteon \
radius/dictionary.altiga \
radius/dictionary.alvarion \
radius/dictionary.aruba \
radius/dictionary.ascend \
radius/dictionary.asn \
+ radius/dictionary.audiocodes \
radius/dictionary.avaya \
radius/dictionary.azaire \
radius/dictionary.bay \
radius/dictionary.cosine \
radius/dictionary.dhcp \
radius/dictionary.digium \
+ radius/dictionary.eltex \
radius/dictionary.epygi \
radius/dictionary.ericsson \
radius/dictionary.erx \
radius/dictionary.h3c \
radius/dictionary.hp \
radius/dictionary.huawei \
+ radius/dictionary.iea \
radius/dictionary.infonet \
radius/dictionary.ipunplugged \
radius/dictionary.issanni \
radius/dictionary.microsoft \
radius/dictionary.mikrotik \
radius/dictionary.motorola \
+ radius/dictionary.motorola.wimax \
radius/dictionary.navini \
radius/dictionary.netscreen \
radius/dictionary.networkphysics \
radius/dictionary.rfc3580 \
radius/dictionary.rfc4072 \
radius/dictionary.rfc4372 \
+ radius/dictionary.rfc4603 \
radius/dictionary.rfc4675 \
radius/dictionary.rfc4679 \
radius/dictionary.rfc4818 \
radius/dictionary.rfc4849 \
radius/dictionary.rfc5090 \
radius/dictionary.rfc5176 \
+ radius/dictionary.rfc5580 \
+ radius/dictionary.rfc5607 \
+ radius/dictionary.rfc5904 \
radius/dictionary.riverstone \
radius/dictionary.roaringpenguin \
radius/dictionary.shasta \
radius/dictionary.telkom \
radius/dictionary.trapeze \
radius/dictionary.tropos \
- radius/dictionary.tunnel \
- radius/dictionary.unisphere \
+ radius/dictionary.ukerna \
radius/dictionary.unix \
radius/dictionary.usr \
radius/dictionary.utstarcom \
radius/dictionary.vqp \
radius/dictionary.walabi \
radius/dictionary.waverider \
+ radius/dictionary.wichorus \
radius/dictionary.wimax \
+ radius/dictionary.wimax.wichorus \
radius/dictionary.wispr \
radius/dictionary.xedia \
radius/dictionary.xylan \
tpncp_DATA = \
tpncp/tpncp.dat
+#
+# Install the ui directory files in the "ui" subdirectory
+# of that directory
+#
+uidir = $(pkgdatadir)/ui
+ui_DATA = \
+ ui/gtk/ui/main-menubar-ui.xml
#
# Install the wimaxasncp directory files in the "wimaxasncp" subdirectory
-dlopen plugins/mate/mate.la \
-dlopen plugins/opcua/opcua.la \
-dlopen plugins/profinet/profinet.la \
- -dlopen plugins/sercosiii/sercosiii.la \
-dlopen plugins/stats_tree/stats_tree.la \
-dlopen plugins/unistim/unistim.la \
-dlopen plugins/wimax/wimax.la
include Makefile.common
-# Optional objects that I know how to build. These will be
-# 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
-# tshark, or if tshark needs something that wireshark doesn't,
-# 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@ @STRERROR_O@ \
- @STRNCASECMP_O@ @STRPTIME_O@
-
if ENABLE_STATIC
wireshark_LDFLAGS = -Wl,-static -all-static
else
# @GTK_LIBS@ (as those are also needed for X applications, and GTK+
# applications are X applications).
wireshark_LDADD = \
- $(wireshark_optional_objects) \
- gtk/libui.a \
+ ui/gtk/libui.a \
+ ui/gtk/libui_dirty.a \
codecs/libcodec.a \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
- @INET_PTON_LO@ \
- @INET_NTOP_LO@ \
- @SSL_LIBS@ \
+ @SSL_LIBS@ \
$(plugin_ldadd) \
- @PCRE_LIBS@ \
@PCAP_LIBS@ \
- @GTK_LIBS@ \
+ @GTK_LIBS@ -lm \
@C_ARES_LIBS@ \
@ADNS_LIBS@ \
@KRB5_LIBS@ \
- @FRAMEWORKS@ \
+ @LAUNCHSERVICES_FRAMEWORKS@ \
+ @CORESERVICES_FRAMEWORKS@ \
+ @PY_LIBS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@ \
# Libraries and plugin flags with which to link tshark.
tshark_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@ \
@C_ARES_LIBS@ \
@ADNS_LIBS@ \
@KRB5_LIBS@ \
- @FRAMEWORKS@ \
+ @CORESERVICES_FRAMEWORKS@ \
+ @PY_LIBS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
rawshark_LDFLAGS = -export-dynamic
endif
-# Libraries and plugin flags with which to link tshark.
+# Libraries and plugin flags with which to link rawshark.
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@ \
@C_ARES_LIBS@ \
@ADNS_LIBS@ \
@KRB5_LIBS@ \
- @FRAMEWORKS@ \
+ @CORESERVICES_FRAMEWORKS@ \
+ @PY_LIBS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
rawshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
-# Optional objects that I know how to build, and that are needed by
-# text2pcap.
-text2pcap_optional_objects = @STRERROR_O@ @STRPTIME_O@
-
# Libraries with which to link text2pcap.
text2pcap_LDADD = \
- $(text2pcap_optional_objects) \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
@GLIB_LIBS@ -lm
wiretap/libwiretap.la \
wsutil/libwsutil.la \
@GLIB_LIBS@
-mergecap_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
+mergecap_CFLAGS = $(AM_CLEAN_CFLAGS)
# Libraries with which to link capinfos.
capinfos_LDADD = \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
- @GLIB_LIBS@
+ @GLIB_LIBS@ \
+ @LIBGCRYPT_LIBS@
capinfos_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
# Libraries with which to link editcap.
@NSL_LIBS@ \
@C_ARES_LIBS@ \
@ADNS_LIBS@
-randpkt_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
+randpkt_CFLAGS = $(AM_CLEAN_CFLAGS)
# Libraries and plugin flags with which to link dftest.
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@ \
@C_ARES_LIBS@ \
@ADNS_LIBS@ \
@KRB5_LIBS@ \
+ @PY_LIBS@ \
@LIBGCRYPT_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@ \
- @FRAMEWORKS@ \
- @LIBGCRYPT_LIBS@ \
- @LIBGNUTLS_LIBS@ \
+ @CORESERVICES_FRAMEWORKS@ \
@LIBCAP_LIBS@
-dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
+dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS)
# Common headers
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
FORCE:
svnversion.h: FORCE
- LANG=C $(PERL) $(srcdir)/make-version.pl $(srcdir)
+ $(PERL) $(srcdir)/make-version.pl $(srcdir)
#
# Build shell scripts by doing variable substitution.
ps.c: print.ps $(srcdir)/tools/rdps.py
$(PYTHON) $(srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c
-#
-# XXX - "svnversion.h" is distributed in the release tarball; should
-# we be deleting it with "make clean", or should we only do that with
-# "make maintainer-clean"?
-#
+services: tools/make-services.pl
+ $(PERL) $(srcdir)/tools/make-services.pl
+
CLEANFILES = \
- svnversion.h \
- idl2wrs \
*~ \
vgcore.*
+#
+# We have to remove svnversion.h with "make distclean", as, otherwise,
+# "make distcheck" fails. We still need to make the tarballs work
+# even if you do "make distclean" and try to rebuild; that's a work in
+# progress.
#
# XXX - "ps.c" is distributed in the source tarballs; why is it in the
# list of files removed by "make distclean"? (It's deliberately
# included in that list.)
#
DISTCLEANFILES = \
- ps.c
+ ps.c \
+ svnversion.h
MAINTAINERCLEANFILES = \
$(GENERATED_FILES) \
Makefile.in \
aclocal.m4 \
+ compile \
config.h.in \
configure \
depcomp \
install-sh \
ltmain.sh \
- missing
+ missing \
+ ylwrap
EXTRA_DIST = \
INSTALL.configure \
Makefile.nmake.inc \
README.aix \
README.bsd \
+ README.DECT \
README.hpux \
README.irix \
README.linux \
README.macos \
README.tru64 \
README.vmware \
- README.win32 \
+ README.windows \
+ abi-descriptor.template \
aclocal-fallback/glib-2.0.m4 \
aclocal-fallback/gtk-2.0.m4 \
aclocal-flags \
capture-wpcap.h \
capture_wpcap_packet.c \
capture_wpcap_packet.h \
- cfilters \
- colorfilters \
+ cfilters \
+ colorfilters \
config.h.win32 \
config.nmake \
debian/changelog \
debian/wireshark.files \
debian/wireshark.manpages \
debian/wireshark.menu \
- dfilters \
- docbook/Makefile.auto.am \
- docbook/ws.css \
+ epan/dfilter/README.dfilter \
+ dfilters \
doxygen.cfg.in \
dumpcap.c \
editcap.c \
fix/hfDecl.xsl \
fix/hfField.xsl \
fix/hfList.xsl \
+ idl/coseventcomm.idl \
idl/cosnaming.idl \
idl/tango.idl \
idl/parlay/am.idl \
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/file_dlg_win32.rc \
image/stock_dialog_stop_48.xpm \
image/stock_dialog_warning_48.xpm \
image/text2pcap.rc.in \
+ image/WiresharkDoc_24.xpm \
+ image/toolbar/analyze_24.xpm \
+ image/toolbar/audio_player_24.xpm \
image/toolbar/autoscroll_24.xpm \
image/toolbar/capture_airpcap_16.xpm \
image/toolbar/capture_capture_16.xpm \
image/toolbar/checkbox_16.xpm \
image/toolbar/colorize_24.xpm \
image/toolbar/conversations_16.xpm \
+ image/toolbar/decode_24.xpm \
image/toolbar/decode_as_16.xpm \
image/toolbar/display_filter_24.xpm \
image/toolbar/endpoints_16.xpm \
image/toolbar/network_virtual_16.xpm \
image/toolbar/network_wired_16.png \
image/toolbar/network_wireless_16.png \
+ image/toolbar/pipe_16.png \
+ image/toolbar/remote_arrow_16.png \
+ image/toolbar/remote_globe_16.png \
+ image/toolbar/remote_sat_16.png \
image/toolbar/resize_columns_24.xpm \
+ image/toolbar/telephone_16.xpm \
image/toolbar/telephony_16.xpm \
image/toolbar/time_24.xpm \
+ image/toolbar/voip_flow_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/wiresharkdoc.ico \
+ image/voip_bg.xpm \
+ image/voip_select.xpm \
image/wireshark.exe.manifest.in \
image/wireshark.ico \
- image/wiresharkinst.ico \
image/wireshark.rc.in \
+ image/WiresharkDoc-128.png \
+ image/WiresharkDoc-16.png \
+ image/WiresharkDoc-24.png \
+ image/WiresharkDoc-256.png \
+ image/WiresharkDoc-32.png \
+ image/WiresharkDoc-48.png \
+ image/WiresharkDoc-64.png \
+ image/wiresharkdoc.ico \
+ image/wiresharkinst.ico \
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/wsiconcap.svg \
- image/wsicondoc256.png \
- image/wsicondoc.svg \
- image/wsiconinst256.png \
image/wsiconinst.svg \
- image/wsicon.svg \
+ image/wsiconinst256.png \
image/wslogo.eps \
image/wslogo.svg \
- image/wssplash.xpm \
image/wssplash-dev.xpm \
- ipmap.html \
- make-manuf \
+ image/wssplash.xpm \
+ ipmap.html \
+ macosx-setup.sh \
+ macosx-support-lib-patches/glib-gconvert.patch \
+ macosx-support-lib-patches/glib-pkgconfig.patch \
+ macosx-support-lib-patches/gnutls-pkgconfig.patch \
make-version.pl \
manuf \
manuf.tmpl \
mergecap.c \
+ pdml2html.xsl \
print.ps \
$(diameter_DATA) \
$(dtds_DATA) \
$(radius_DATA) \
$(tpncp_DATA) \
+ $(ui_DATA) \
$(wimaxasncp_DATA) \
randpkt.c \
smi_modules \
text2pcap.h \
services \
wireshark.desktop \
- wka.tmpl
+ wka.tmpl \
+ CMakeLists.txt \
+ cmakeconfig.h.in \
+ wsutil/CMakeLists.txt \
+ CMakeOptions.txt \
+ wiretap/CMakeLists.txt \
+ README.cmake \
+ ConfigureChecks.cmake \
+ cmake/modules/CMakeInstallDirs.cmake \
+ cmake/modules/COPYING-CMAKE-SCRIPTS \
+ cmake/modules/CheckCLinkerFlag.cmake \
+ cmake/modules/FeatureSummary.cmake \
+ cmake/modules/FindADNS.cmake \
+ cmake/modules/FindCAP.cmake \
+ cmake/modules/FindCARES.cmake \
+ cmake/modules/FindFOP.cmake \
+ cmake/modules/FindGCRYPT.cmake \
+ cmake/modules/FindGEOIP.cmake \
+ cmake/modules/FindGLIB2.cmake \
+ cmake/modules/FindGMODULE2.cmake \
+ cmake/modules/FindGNUTLS.cmake \
+ cmake/modules/FindGTHREAD2.cmake \
+ cmake/modules/FindGTK2.cmake \
+ cmake/modules/FindGTK3.cmake \
+ cmake/modules/FindHtmlViewer.cmake \
+ cmake/modules/FindKERBEROS.cmake \
+ cmake/modules/FindLEX.cmake \
+ cmake/modules/FindLUA.cmake \
+ cmake/modules/FindLYNX.cmake \
+ cmake/modules/FindM.cmake \
+ cmake/modules/FindPCAP.cmake \
+ cmake/modules/FindPOD.cmake \
+ cmake/modules/FindPORTAUDIO.cmake \
+ cmake/modules/FindPYTHON.cmake \
+ cmake/modules/FindSED.cmake \
+ cmake/modules/FindSH.cmake \
+ cmake/modules/FindSMI.cmake \
+ cmake/modules/FindXMLLINT.cmake \
+ cmake/modules/FindXSLTPROC.cmake \
+ cmake/modules/FindYACC.cmake \
+ cmake/modules/FindYAPP.cmake \
+ cmake/modules/FindZLIB.cmake \
+ cmake/modules/LICENSE.txt \
+ cmake/modules/UseLemon.cmake \
+ cmake/modules/UseMakeDissectorReg.cmake \
+ cmake/modules/UseMakeTapReg.cmake \
+ cmake/modules/readme.txt \
+ ui/win32/Makefile.nmake \
+ ui/win32/file_dlg_win32.c \
+ ui/win32/file_dlg_win32.h \
+ ui/win32/print_win32.c \
+ ui/win32/print_win32.h \
+ CPackConfig.txt \
+ all.vcproj \
+ dumpcap.vcproj \
+ packaging.vcproj \
+ tshark.vcproj \
+ wireshark.vcproj
-if SETUID_INSTALL
install-exec-hook:
- -chmod +s $(DESTDIR)$(bindir)/dumpcap
+if HAVE_DUMPCAP_GROUP
+ -chgrp $(DUMPCAP_GROUP) $(DESTDIR)$(bindir)/dumpcap
+endif
+if SETCAP_INSTALL
+ -$(SETCAP) cap_net_raw,cap_net_admin+eip $(DESTDIR)$(bindir)/dumpcap
+ -chmod o-rws $(DESTDIR)$(bindir)/dumpcap
else
-install-exec-hook:
+if SETUID_INSTALL
+ -chmod o-rws $(DESTDIR)$(bindir)/dumpcap
+ -chmod +s $(DESTDIR)$(bindir)/dumpcap
endif
+endif
+
-DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil
+DIST_SUBDIRS = asn1 codecs doc epan ui/gtk help packaging plugins tools wiretap wsutil docbook
if HAVE_PLUGINS
SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc
cd $(rpm_topdir) ; \
mkdir -p BUILD RPMS SOURCES ; \
cd SOURCES ; \
- ln -s ../../../$(distdir).tar.gz ; \
+ ln -s ../../../$(distdir).tar.bz2 ; \
ln -s ../../../wireshark.desktop ; \
ln -s ../../../image/wsicon64.png wireshark.png ; \
cd .. ; \
cd $(rpm_topdir) ; \
mkdir -p BUILD SRPMS SOURCES ; \
cd SOURCES ; \
- ln -s ../../../$(distdir).tar.gz ; \
+ ln -s ../../../$(distdir).tar.bz2 ; \
ln -s ../../../wireshark.desktop ; \
ln -s ../../../image/wsicon64.png wireshark.png ; \
cd .. ; \
echo "Package build abandoned." ; \
fi
-osx-package: osx-app
+packaging/macosx/COPYING.txt: COPYING
+ (cd packaging/macosx ; \
+ $(MAKE) COPYING.txt ;)
+
+osx-package: osx-app packaging/macosx/COPYING.txt
@if test x$(HAVE_OSX_PACKAGING) = xyes ; then \
cd $(srcdir)/packaging/macosx ; \
./osx-dmg.sh ; \
fi
+osx-install: osx-app
+ @if test x$(HAVE_OSX_PACKAGING) = xyes ; then \
+ echo "Copying Wireshark.app to /Applications" ; \
+ cp -pr $(srcdir)/packaging/macosx/Wireshark.app /Applications ; \
+ fi
+
clean-local:
rm -rf $(top_stagedir)
+dumpabi:
+ $(MAKE) -C wiretap dumpabi
+ $(MAKE) -C epan dumpabi
+ $(MAKE) -C wsutil dumpabi
+
checkapi_local:
$(PERL) tools/checkAPIs.pl \
$(TSHARK_TAP_SRC)
git.samba.org / obnox / wireshark / wip.git / blobdiff