INCLUDES= @LUA_INCLUDES@
+if HAVE_WARNINGS_AS_ERRORS
+AM_CLEAN_CFLAGS = -Werror
+endif
#
# This is a hideous hack.
#
# Wireshark configuration files are put in $(pkgdatadir).
#
-pkgdata_DATA = AUTHORS-SHORT COPYING manuf services wireshark.html \
+pkgdata_DATA = AUTHORS-SHORT COPYING FAQ manuf services wireshark.html \
tshark.html wireshark-filter.html capinfos.html editcap.html \
idl2wrs.html mergecap.html text2pcap.html dumpcap.html \
rawshark.html ws.css cfilters colorfilters dfilters smi_modules
diameter/sip.xml \
diameter/sunping.xml \
diameter/TGPPGmb.xml \
+ diameter/TGPPRx.xml \
diameter/TGPPSh.xml
#
radius/dictionary.altiga \
radius/dictionary.aptis \
radius/dictionary.ascend \
+ radius/dictionary.aruba \
radius/dictionary.bay \
radius/dictionary.bintec \
radius/dictionary.bristol \
PLATFORM_SRC = capture-pcap-util-unix.c
if HAVE_PLUGINS
-
-plugin_ldadd = \
+-include plugins/Custom.make
+plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
-dlopen plugins/agentx/agentx.la \
-dlopen plugins/artnet/artnet.la \
-dlopen plugins/asn1/asn1.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
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@ \
+ @PCAP_LIBS@ \
+ @GTK_LIBS@ \
+ @C_ARES_LIBS@ \
+ @ADNS_LIBS@ \
+ @KRB5_LIBS@ \
+ @FRAMEWORKS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@ \
@PORTAUDIO_LIBS@
+wireshark_CFLAGS = $(AM_CLEAN_CFLAGS)
if ENABLE_STATIC
tshark_LDFLAGS = -Wl,-static -all-static
$(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@ \
+ @PCAP_LIBS@ \
+ @SOCKET_LIBS@ \
+ @NSL_LIBS@ \
+ @C_ARES_LIBS@ \
+ @ADNS_LIBS@ \
+ @KRB5_LIBS@ \
@FRAMEWORKS@ \
- @LIBICONV@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
+tshark_CFLAGS = $(AM_CLEAN_CFLAGS)
if ENABLE_STATIC
rawshark_LDFLAGS = -Wl,-static -all-static
$(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@ \
+ @PCAP_LIBS@ \
+ @SOCKET_LIBS@ \
+ @NSL_LIBS@ \
+ @C_ARES_LIBS@ \
+ @ADNS_LIBS@ \
+ @KRB5_LIBS@ \
@FRAMEWORKS@ \
- @LIBICONV@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
+rawshark_CFLAGS = $(AM_CLEAN_CFLAGS)
# 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
+# Don't turn on -Werror for text2pcap: its source includes text2pcap-scanner.c
+# which is generated (and therefore not always clean).
+# We could generate text2pcap.o as a library with -Werror but for now it
+# doesn't seem worth the effort.
+#text2pcap_CFLAGS = $(AM_CLEAN_CFLAGS)
# Libraries with which to link mergecap.
mergecap_LDADD = \
wiretap/libwiretap.la \
+ wsutil/libwsutil.la \
@GLIB_LIBS@
+mergecap_CFLAGS = $(AM_CLEAN_CFLAGS)
# Libraries with which to link capinfos.
capinfos_LDADD = \
wiretap/libwiretap.la \
+ wsutil/libwsutil.la \
@GLIB_LIBS@
+capinfos_CFLAGS = $(AM_CLEAN_CFLAGS)
# Libraries with which to link editcap.
editcap_LDADD = \
wiretap/libwiretap.la \
+ wsutil/libwsutil.la \
@GLIB_LIBS@
+editcap_CFLAGS = $(AM_CLEAN_CFLAGS)
# 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@
+ @PCAP_LIBS@ \
+ @SOCKET_LIBS@ \
+ @NSL_LIBS@ \
+ @C_ARES_LIBS@ \
+ @ADNS_LIBS@
+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@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
- @LIBICONV@ \
+ @PCAP_LIBS@ \
+ @SOCKET_LIBS@ \
+ @NSL_LIBS@ \
+ @C_ARES_LIBS@ \
+ @ADNS_LIBS@ \
+ @KRB5_LIBS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
+dftest_CFLAGS = $(AM_CLEAN_CFLAGS)
# 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@ \
+ @PCAP_LIBS@ \
+ @SOCKET_LIBS@ \
+ @NSL_LIBS@ \
+ @FRAMEWORKS@ \
@LIBGCRYPT_LIBS@ \
@LIBCAP_LIBS@
+dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS)
# Common headers
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
@rdps_bin@ \
idl2wrs \
*~ \
- vgcore.pid*
+ vgcore.*
#
# XXX - "ps.c" is distributed in the source tarballs; why is it in the
README.vmware \
README.win32 \
aclocal-fallback/glib-2.0.m4 \
- 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/rawshark.pod \
- 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/clist_ascend.xpm \
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/icon_layout_5.xpm \
image/icon_layout_6.xpm \
image/libwireshark.rc.in \
+ image/libwsutil.rc.in \
image/lo16-app-wireshark.png \
image/lo32-app-wireshark.png \
image/lo48-app-wireshark.png \
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_9.xpm \
image/toolbar/internet_24.xpm \
image/toolbar/resize_columns_24.xpm \
- image/toolbar/stock_add_24.xpm \
- image/toolbar/stock_clear_24.xpm \
- image/toolbar/stock_close_24.xpm \
- image/toolbar/stock_ok_20.xpm \
- image/toolbar/stock_open_24.xpm \
- image/toolbar/stock_properties_24.xpm \
- image/toolbar/stock_save_24.xpm \
- image/toolbar/stock_stop_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 \
text2pcap-scanner.l \
text2pcap.c \
text2pcap.h \
- packaging/makefile.nmake \
- packaging/ws-manifest.pl \
- packaging/portableapps/win32/Installer.nsi \
- packaging/portableapps/win32/WiresharkPortable.ini \
- packaging/portableapps/win32/WiresharkPortable.nsi \
- packaging/portableapps/win32/appinfo.tmpl \
- packaging/portableapps/win32/makefile.nmake \
- packaging/portableapps/win32/makenmake.pl \
- packaging/portableapps/win32/readme.txt \
- packaging/u3/win32/README.txt \
- packaging/u3/win32/makefile.nmake \
- packaging/u3/win32/makenmake.pl \
- packaging/u3/win32/manifest.tmpl \
- packaging/u3/win32/u3util.c \
- packaging/u3/win32/wireshark.bat \
- packaging/u3/tools/README.txt \
- packaging/u3/tools/makefile.nmake \
- packaging/u3/tools/sysdep.c \
- packaging/u3/tools/sysdep.h \
- packaging/u3/tools/utest.c \
- packaging/u3/tools/uuid.c \
- packaging/u3/tools/uuid.h \
services \
- tools/idl2wrs.sh.in \
- tools/setuid-root.pl.in \
wka.tmpl
if SETUID_INSTALL
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
+FAQ: help/faq.txt $(srcdir)/help/faq.py
+ (cd help ; \
+ $(MAKE) faq.txt ; \
+ cp faq.txt ../FAQ )
+
wireshark.1: doc/wireshark.pod AUTHORS-SHORT-FORMAT
(cd doc ; \
$(MAKE) ../wireshark.1 )
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
# XXX - This assumes we're building from the source directory.
-osx-package: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) packaging/macosx/Info.plist
+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) ; \
- ./osx-dmg.sh ; \
+ ./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