# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+AM_DISTCHECK_CONFIGURE_FLAGS=@GUI_CONFIGURE_FLAGS@
ACLOCAL_AMFLAGS = `./aclocal-flags`
if HAVE_LIBPY
bin_PROGRAMS = \
@wireshark_bin@ \
@tshark_bin@ \
+ @tfshark_bin@ \
@text2pcap_bin@ \
@mergecap_bin@ \
@capinfos_bin@ \
+ @captype_bin@ \
@editcap_bin@ \
@randpkt_bin@ \
@dftest_bin@ \
@rawshark_bin@ \
@echld_test_bin@
-EXTRA_PROGRAMS = wireshark wireshark-qt tshark capinfos editcap mergecap \
- dftest randpkt text2pcap dumpcap reordercap rawshark wireshark_cxx \
- echld_test
+EXTRA_PROGRAMS = wireshark wireshark-qt tshark tfshark capinfos captype editcap \
+ mergecap dftest randpkt text2pcap dumpcap reordercap rawshark \
+ wireshark_cxx echld_test
#
# Wireshark configuration files are put in $(pkgdatadir).
#
-pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
+dist_pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
smi_modules ipmap.html pdml2html.xsl
#
# Install global profiles in the "profiles" subdirectory
#
profilesdir = $(pkgdatadir)
-nobase_profiles_DATA = \
+nobase_dist_profiles_DATA = \
profiles/Bluetooth/colorfilters \
profiles/Classic/colorfilters
# of that directory.
#
diameterdir = $(pkgdatadir)/diameter
-diameter_DATA = \
+include diameter/Custom.make
+dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \
diameter/chargecontrol.xml \
diameter/ChinaTelecom.xml \
diameter/Cisco.xml \
+ diameter/Custom.xml \
diameter/dictionary.dtd \
diameter/dictionary.xml \
diameter/eap.xml \
diameter/TGPPGmb.xml \
diameter/TGPPRx.xml \
diameter/TGPPS9.xml \
- diameter/TGPPSh.xml \
+ diameter/TGPPSh.xml \
diameter/Vodafone.xml \
diameter/AlcatelLucent.xml \
diameter/Nokia.xml \
diameter/NokiaSiemensNetworks.xml \
- diameter/SKT.xml
+ diameter/SKT.xml \
+ diameter/VerizonWireless.xml
#
# Install the DTDs directory files in the "dtds" subdirectory
# of that directory
#
dtdsdir = $(pkgdatadir)/dtds
-dtds_DATA = \
+dist_dtds_DATA = \
dtds/dc.dtd \
dtds/itunes.dtd \
dtds/mscml.dtd \
# of that directory.
#
radiusdir = $(pkgdatadir)/radius
--include radius/Custom.make
-radius_DATA = $(_CUSTOM_radius_dict_) \
+include radius/Custom.make
+dist_radius_DATA = $(_CUSTOM_radius_dict_) \
radius/README.radius_dictionary \
radius/custom.includes \
radius/dictionary \
radius/dictionary.alcatel \
radius/dictionary.alcatel.esam \
radius/dictionary.alcatel.sr \
+ radius/dictionary.alcatel-lucent.aaa \
radius/dictionary.alcatel-lucent.xylan \
radius/dictionary.alteon \
radius/dictionary.altiga \
# of that directory
#
tpncpdir = $(pkgdatadir)/tpncp
-tpncp_DATA = \
+dist_tpncp_DATA = \
tpncp/tpncp.dat
#
# of that directory
#
wimaxasncpdir = $(pkgdatadir)/wimaxasncp
-wimaxasncp_DATA = \
+dist_wimaxasncp_DATA = \
wimaxasncp/dictionary.xml \
wimaxasncp/dictionary.dtd
-PLATFORM_SRC = \
+PLATFORM_PCAP_SRC = \
capture-pcap-util-unix.c
if HAVE_PLUGINS
-include plugins/Custom.make
plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
- -dlopen plugins/asn1/asn1.la \
-dlopen plugins/docsis/docsis.la \
-dlopen plugins/ethercat/ethercat.la \
-dlopen plugins/gryphon/gryphon.la \
-dlopen plugins/wimax/wimax.la \
-dlopen plugins/wimaxmacphy/wimaxmacphy.la
-WTAP_PLUGIN_SOURCES = \
- epan/plugins.c \
- epan/report_err.c \
- epan/filesystem.c
-
else # HAVE_PLUGINS
plugin_ldadd =
-WTAP_PLUGIN_SOURCES =
endif # HAVE_PLUGINS
endif
else
if HAVE_GTK
-wireshark_LDFLAGS = -export-dynamic -Wl,-rpath @executable_path/../lib -rpath /usr/local/lib
+wireshark_LDFLAGS = -export-dynamic
endif
if HAVE_Qt
wireshark_qt_LDFLAGS = -export-dynamic
ui/libui.a \
ui/libui_dirty.a \
codecs/libcodec.a \
+ filetap/libfiletap.la \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
wireshark_qt_SOURCES = $(WIRESHARK_COMMON_SRC)
wireshark_qt_INCLUDES = $(WIRESHARK_COMMON_INCLUDES)
wireshark_qt_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
-wireshark_qt_LDADD = ui/qt/libqtui.a $(wireshark_ldadd) @Qt_LIBS@
+wireshark_qt_LDADD = \
+ ui/qt/libqtui.a \
+ $(wireshark_ldadd) \
+ @Qt_LIBS@
+
+#
+# XXX - this makes wireshark_qt_LDFLAGS not work; we should figure out
+# another way to get wireshark-qt linked as a C++ program, perhaps by
+# having a top-level wireshark-qt.cpp file that contains main() and
+# hthat calls the UI code from ui/qt.
+#
wireshark_qt_LINK = $(CXXLINK)
endif
wireshark_SOURCES = $(WIRESHARK_COMMON_SRC)
wireshark_INCLUDES = $(WIRESHARK_COMMON_INCLUDES)
wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
-wireshark_LDADD = ui/gtk/libgtkui.a $(wireshark_ldadd) @GTK_LIBS@
-wireshark_LINK = $(LINK)
+wireshark_LDADD = \
+ ui/gtk/libgtkui.a \
+ $(wireshark_ldadd) \
+ @GTK_LIBS@
endif
# Ideally we could trigger automatic c++ linking here with
@LIBSMI_LDFLAGS@
tshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
+if ENABLE_STATIC
+tfshark_LDFLAGS = -Wl,-static -all-static
+else
+tfshark_LDFLAGS = -export-dynamic
+endif
+
+# Libraries and plugin flags with which to link tfshark.
+tfshark_LDADD = \
+ ui/cli/libcliui.a \
+ ui/libui.a \
+ filetap/libfiletap.la \
+ wiretap/libwiretap.la \
+ epan/libwireshark.la \
+ wsutil/libwsutil.la \
+ @SSL_LIBS@ \
+ $(plugin_ldadd) \
+ @GLIB_LIBS@ -lm \
+ @PCAP_LIBS@ \
+ @SOCKET_LIBS@ \
+ @NSL_LIBS@ \
+ @KRB5_LIBS@ \
+ @SYSTEMCONFIGURATION_FRAMEWORKS@ \
+ @COREFOUNDATION_FRAMEWORKS@ \
+ @PY_LIBS@ \
+ @LIBGNUTLS_LIBS@ \
+ @LIBSMI_LDFLAGS@
+tfshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
+
if ENABLE_STATIC
rawshark_LDFLAGS = -Wl,-static -all-static
else
@LIBGCRYPT_LIBS@
capinfos_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
+# Libraries with which to link captype.
+captype_LDADD = \
+ wiretap/libwiretap.la \
+ wsutil/libwsutil.la \
+ @GLIB_LIBS@
+captype_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
+
# Libraries with which to link editcap.
editcap_LDADD = \
wiretap/libwiretap.la \
# Common headers
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(PY_CFLAGS) \
- @LUA_INCLUDES@
+ @LUA_INCLUDES@ -DTOP_SRCDIR=\"$(abs_top_srcdir)\"
#
# Build the version string
$(editsh) $< > $@.tmp && chmod +x $@.tmp && mv $@.tmp $@
services:
- $(PERL) $(srcdir)/tools/make-services.pl
+ $(PYTHON) $(srcdir)/tools/make-services.py
CLEANFILES = \
*~ \
aclocal-fallback/glib-2.0.m4 \
aclocal-fallback/gtk-2.0.m4 \
aclocal-fallback/gtk-3.0.m4 \
- aclocal-fallback/qt.m4 \
aclocal-flags \
adns_dll.dep \
adns_dll.rc \
autogen.sh \
capinfos.c \
+ captype.c \
capture_win_ifnames.c \
capture_win_ifnames.h \
capture-wpcap.c \
debian/dirs \
debian/headers-check.c \
debian/patches/00list \
- debian/patches/03_preferences.dpatch \
debian/postinst \
debian/pycompat \
debian/pyversions \
debian/wireshark.files \
debian/wireshark.manpages \
debian/wireshark.menu \
- debian-setup.sh \
dfilters \
doxygen.cfg.in \
dumpcap.c \
editcap.c \
epan/print.ps \
+ filetap/CMakeLists.txt \
fix/FIX.xml \
fix/FIX40.xml \
fix/FIX41.xml \
idl/parlay/ui_data.idl \
idl/parlay/ui_interfaces.idl \
image/capinfos.rc.in \
+ image/captype.rc.in \
image/capture_comment.svg \
image/capture_comment_add.png \
image/capture_comment_disabled.png \
image/expert_note.png \
image/expert_warn.png \
image/file_dlg_win32.rc \
+ image/filetap.rc.in \
image/hi16-app-wireshark.png \
image/hi32-app-wireshark.png \
image/hi48-app-wireshark.png \
image/minus-8.png \
image/nsis-checked.bmp \
image/nsis-unchecked.bmp \
+ image/openhand-16.png \
image/plus-8.png \
image/rawshark.rc.in \
image/README.image \
image/reordercap.rc.in \
+ image/rubberband-16.png \
image/status.qrc \
image/stock_dialog_error_48.xpm \
image/stock_dialog_info_48.xpm \
manuf.tmpl \
mergecap.c \
pdml2html.xsl \
- $(diameter_DATA) \
- $(dtds_DATA) \
- $(nobase_profiles_DATA) \
- $(radius_DATA) \
- $(tpncp_DATA) \
- $(ui_DATA) \
- $(wimaxasncp_DATA) \
reordercap.c \
smi_modules \
text2pcap-scanner.l \
-chgrp $(DUMPCAP_GROUP) $(DESTDIR)$(bindir)/dumpcap
endif
if SETCAP_INSTALL
- -$(SETCAP) cap_net_raw,cap_net_admin+eip $(DESTDIR)$(bindir)/dumpcap
+ -$(SETCAP) cap_net_raw,cap_net_admin+ep $(DESTDIR)$(bindir)/dumpcap
-chmod o-rws $(DESTDIR)$(bindir)/dumpcap
else
if SETUID_INSTALL
endif
-DIST_SUBDIRS = asn1 codecs doc epan echld ui ui/cli ui/gtk ui/qt help packaging plugins tools wiretap wsutil docbook
+DIST_SUBDIRS = asn1 codecs doc epan echld filetap ui ui/cli ui/gtk ui/qt help packaging plugins tools wiretap wsutil docbook
if HAVE_PLUGINS
-SUBDIRS = tools wsutil wiretap epan @echld_dir@ plugins packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
+SUBDIRS = tools wsutil wiretap filetap epan @echld_dir@ plugins packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
else
-SUBDIRS = tools wsutil wiretap epan @echld_dir@ packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
+SUBDIRS = tools wsutil wiretap filetap epan @echld_dir@ packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
endif
help/faq.txt: $(srcdir)/help/faq.py
# 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/staging
+top_stagedir=`cd $(top_builddir) && pwd`/packaging/staging
stagedir=$(top_stagedir)/$(PACKAGE).inst
host_cpu=@host_cpu@
host_os=@host_os@
+solaris-package: svr4-package
+
svr4-package: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA)
@if test x$(HAVE_SVR4_PACKAGING) = xyes ; then \
rm -rf $(stagedir) ; \
echo "Package build abandoned." ; \
fi
-solaris-package: svr4-package
rpm_topdir=`cd $(top_builddir) && pwd`/packaging/rpm
rpm-package: dist
cd SOURCES ; \
ln -sf ../../../$(distdir).tar.bz2 ; \
cd .. ; \
- rpmbuild --define "_topdir `cd . && pwd`" --define "_prefix $(prefix)" --clean -ba SPECS/wireshark.spec && \
+ rpmbuild --define "_topdir `cd . && pwd`" --define "_prefix $(prefix)" \
+ @RPMBUILD_WITH_ARGS@ --clean -ba SPECS/wireshark.spec && \
echo "Package successfully built in `pwd`/RPMS." && \
rm -f SOURCES/$(distdir).tar.bz2 $(distdir).tar.bz2 ; \
else \
@if test x$(HAVE_OSX_PACKAGING) = xyes ; then \
cd $(srcdir)/packaging/macosx ; \
chmod +x ./osx-dmg.sh ; \
- ./osx-dmg.sh ; \
+ ./osx-dmg.sh @OSX_DMG_FLAGS@ ; \
fi
osx-install: osx-app
rm -rf $(top_stagedir)
dumpabi:
+ $(MAKE) -C filetap dumpabi-libfiletap
$(MAKE) -C wiretap dumpabi-libwiretap
$(MAKE) -C epan dumpabi-libwireshark
$(MAKE) -C wsutil dumpabi-libwsutil
checkapi: checkapi_local
cd wiretap && $(MAKE) checkapi
+ cd filetap && $(MAKE) checkapi
cd codecs && $(MAKE) checkapi
cd ui && $(MAKE) checkapi
cd ui/gtk && $(MAKE) checkapi
git.samba.org / metze / wireshark / wip.git / blobdiff