X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=Makefile.am;h=98e830c45c5dff919066115462d1528827de05f2;hp=8fd5523f84a72cb8f0228899cdb62423f7bc28eb;hb=d9bd6b6f4469d6c090a07eb657392529f53f4833;hpb=d1c04a6cad391379b02a188291e56cc55588fbd1

diff --git a/Makefile.am b/Makefile.am
index 8fd5523f84..98e830c45c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,47 +25,17 @@ ACLOCAL_AMFLAGS = `./aclocal-flags`
 
 INCLUDES= @LUA_INCLUDES@
 
+if HAVE_LIBPY
+py_dissectors_dir = -DPYTHON_DIR=\"@pythondir@\"
+else
+py_dissectors_dir = -DPYTHON_DIR=
+endif
+
+
 if HAVE_WARNINGS_AS_ERRORS
 AM_CLEAN_CFLAGS = -Werror
 endif
 
-#
-# This is a hideous hack.
-#
-# Automake needs to know into which sections to install various man
-# pages; if the names in "man_MANS" have suffixes, it can infer the
-# sections from the name (e.g., "hello.1" goes in section 1), but if
-# they don't have suffixes, it can't tell what sections to put them, and
-# it just gives up and doesn't create any rules to install them (and it
-# gives up silently, so you have no clue what's wrong).
-#
-# Therefore, we can't just set "man_MANS" to a list of variables to be
-# filled in by the configure script, as those variables don't have man
-# page section numbers.
-#
-# It turns out (although this is not documented anywhere I could find
-# in the automake Info file) that if you define, instead, variables with
-# names like "man{section}_MANS", automake will infer that the names in
-# those variables are the names of man pages to be installed in section
-# "{section}".
-#
-# So, as all our man pages go in section 1, we define "man1_MANS" to
-# contain all the man page.
-#
-# *However*, if "man_MANS" isn't defined at all, automake concludes that
-# there are no man pages, the fact that, say, "man1_MANS" is defined
-# nonwithstanding!  (I suspect this is the result of a mistaken attempt
-# to get people to fix their automake files not to use "MANS"; if "MANS"
-# is defined, it prints a warning and sets the exit status, but doesn't
-# exit, and then it just gives up if "man_MANS" isn't defined,
-# presumably on the theory that the only reason it wouldn't be defined
-# is because the automake file uses the obsolete "MANS" variable instead
-# of the shiny new "man_MANS" variable.)
-#
-# So we also define "man_MANS", but don't define it as anything;
-# automake will arrange that the Makefile define it as the union of all
-# the "man{section}_MANS" variables.
-#
 bin_PROGRAMS = \
 	@wireshark_bin@	\
 	@tshark_bin@	\
@@ -77,36 +47,16 @@ bin_PROGRAMS = \
 	@dftest_bin@	\
 	@dumpcap_bin@	\
 	@rawshark_bin@
-bin_SCRIPTS = @idl2wrs_bin@
-
-man1_MANS = \
-	@wireshark_man@	\
-	@tshark_man@	\
-	@text2pcap_man@	\
-	@mergecap_man@	\
-	@capinfos_man@	\
-	@editcap_man@	\
-	@dumpcap_man@	\
-	@idl2wrs_man@	\
-	@rawshark_man@
-man4_MANS = @wiresharkfilter_man@
-man_MANS =
 
 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 = AUTHORS-SHORT COPYING 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 ipmap.html
+pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
+	smi_modules ipmap.html pdml2html.xsl
 
 #
 # Install the Diameter DTD and XML files in the "diameter" subdirectory
@@ -115,19 +65,23 @@ pkgdata_DATA = AUTHORS-SHORT COPYING manuf services wireshark.html \
 diameterdir = $(pkgdatadir)/diameter
 diameter_DATA = \
 	diameter/chargecontrol.xml \
+	diameter/Cisco.xml \
 	diameter/dictionary.dtd \
 	diameter/dictionary.xml \
+	diameter/eap.xml \
 	diameter/Ericsson.xml \
 	diameter/etsie2e4.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
@@ -154,69 +108,147 @@ dtds_DATA = \
 #
 radiusdir = $(pkgdatadir)/radius
 radius_DATA = \
+	radius/README.radius_dictionary  \
 	radius/dictionary  \
 	radius/dictionary.3com  \
 	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.apc \
 	radius/dictionary.aptis  \
-	radius/dictionary.ascend  \
 	radius/dictionary.aruba  \
+	radius/dictionary.ascend  \
+	radius/dictionary.asn \
+	radius/dictionary.audiocodes \
+	radius/dictionary.avaya \
+	radius/dictionary.azaire \
 	radius/dictionary.bay  \
 	radius/dictionary.bintec  \
 	radius/dictionary.bristol  \
 	radius/dictionary.cablelabs  \
 	radius/dictionary.cabletron  \
+	radius/dictionary.chillispot \
 	radius/dictionary.cisco  \
 	radius/dictionary.cisco.bbsm  \
 	radius/dictionary.cisco.vpn3000  \
 	radius/dictionary.cisco.vpn5000  \
+	radius/dictionary.clavister \
 	radius/dictionary.colubris  \
 	radius/dictionary.columbia_university  \
 	radius/dictionary.compat  \
 	radius/dictionary.cosine  \
+	radius/dictionary.dhcp \
+	radius/dictionary.digium \
+	radius/dictionary.eltex \
+	radius/dictionary.epygi \
 	radius/dictionary.ericsson  \
 	radius/dictionary.erx  \
 	radius/dictionary.extreme  \
+	radius/dictionary.fortinet \
 	radius/dictionary.foundry  \
 	radius/dictionary.freeradius  \
+	radius/dictionary.freeradius.internal  \
+	radius/dictionary.freeswitch \
 	radius/dictionary.gandalf  \
 	radius/dictionary.garderos  \
 	radius/dictionary.gemtek  \
+	radius/dictionary.h3c \
+	radius/dictionary.hp \
+	radius/dictionary.huawei \
+	radius/dictionary.iea \
+	radius/dictionary.infonet \
+	radius/dictionary.ipunplugged \
+	radius/dictionary.issanni \
 	radius/dictionary.itk  \
+	radius/dictionary.jradius \
 	radius/dictionary.juniper  \
 	radius/dictionary.karlnet  \
+	radius/dictionary.lancom \
 	radius/dictionary.livingston  \
 	radius/dictionary.localweb  \
+	radius/dictionary.lucent \
+	radius/dictionary.manzara \
 	radius/dictionary.merit  \
 	radius/dictionary.microsoft  \
 	radius/dictionary.mikrotik  \
+	radius/dictionary.motorola \
+	radius/dictionary.motorola.wimax \
 	radius/dictionary.navini  \
 	radius/dictionary.netscreen  \
+	radius/dictionary.networkphysics \
+	radius/dictionary.nexans \
 	radius/dictionary.nokia  \
+	radius/dictionary.nokia.conflict \
 	radius/dictionary.nomadix  \
+	radius/dictionary.nortel \
+	radius/dictionary.ntua \
+	radius/dictionary.openser \
+	radius/dictionary.packeteer \
+	radius/dictionary.patton \
 	radius/dictionary.propel  \
+	radius/dictionary.prosoft \
+	radius/dictionary.quiconnect \
 	radius/dictionary.quintum  \
 	radius/dictionary.redback  \
 	radius/dictionary.redcreek  \
+	radius/dictionary.rfc2865 \
+	radius/dictionary.rfc2866 \
+	radius/dictionary.rfc2867 \
+	radius/dictionary.rfc2868 \
+	radius/dictionary.rfc2869 \
+	radius/dictionary.rfc3162 \
+	radius/dictionary.rfc3576 \
+	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.shiva  \
+	radius/dictionary.slipstream \
+	radius/dictionary.sofaware \
 	radius/dictionary.sonicwall  \
 	radius/dictionary.springtide  \
+	radius/dictionary.starent  \
 	radius/dictionary.t_systems_nova  \
 	radius/dictionary.telebit  \
+	radius/dictionary.telkom \
 	radius/dictionary.trapeze  \
-	radius/dictionary.tunnel  \
-	radius/dictionary.unisphere  \
+	radius/dictionary.tropos \
+	radius/dictionary.ukerna  \
 	radius/dictionary.unix  \
 	radius/dictionary.usr  \
+	radius/dictionary.utstarcom \
 	radius/dictionary.valemount  \
 	radius/dictionary.versanet  \
+	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.xedia \
+	radius/dictionary.xylan \
+	radius/dictionary.zyxel
 
 #
 # Install the tpncp directory files in the "tpncp" subdirectory
@@ -226,6 +258,76 @@ tpncpdir = $(pkgdatadir)/tpncp
 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 ui/gt directory files in the "ui/qt" subdirectory
+# of that directory
+#
+uiqtdir = $(pkgdatadir)/ui/qt
+uiqt_DATA = \
+	ui/qt/byte_view_tab.cpp	\
+	ui/qt/byte_view_tab.h \
+	ui/qt/byte_view_text.cpp	\
+	ui/qt/byte_view_text.h	\
+	ui/qt/capture_file_dialog.cpp	\
+	ui/qt/capture_file_dialog.h	\
+	ui/qt/capture_info_dialog.cpp	\
+	ui/qt/capture_info_dialog.h	\
+	ui/qt/capture_interface_dialog.cpp	\
+	ui/qt/capture_interface_dialog.h	\
+	ui/qt/capture_start_24.png	\
+	ui/qt/capture_start_active_24.png	\
+	ui/qt/capture_stop_24.png	\
+	ui/qt/color_dialog.cpp	\
+	ui/qt/color_dialog.h	\
+	ui/qt/color_utils.cpp	\
+	ui/qt/color_utils.h	\
+	ui/qt/dfilter_apply_hover.png	\
+	ui/qt/dfilter_apply_normal.png	\
+	ui/qt/dfilter_apply_pressed.png	\
+	ui/qt/dfilter_bookmark_hover.png	\
+	ui/qt/dfilter_bookmark_normal.png	\
+	ui/qt/dfilter_bookmark_pressed.png	\
+	ui/qt/dfilter_dropdown.png	\
+	ui/qt/dfilter_erase_active.png	\
+	ui/qt/dfilter_erase_normal.png	\
+	ui/qt/dfilter_erase_selected.png	\
+	ui/qt/dfilter_refresh_active.png	\
+	ui/qt/dfilter_refresh_normal.png	\
+	ui/qt/display_filter_16.svg	\
+	ui/qt/display_filter_combo.cpp	\
+	ui/qt/display_filter_combo.h	\
+	ui/qt/display_filter_edit.cpp	\
+	ui/qt/display_filter_edit.h	\
+	ui/qt/display_filter.qrc	\
+	ui/qt/fileset_dialog.cpp	\
+	ui/qt/fileset_dialog.h	\
+	ui/qt/gpl-template.txt	\
+	ui/qt/interface_tree.cpp	\
+	ui/qt/interface_tree.h	\
+	ui/qt/label_stack.cpp	\
+	ui/qt/label_stack.h	\
+	ui/qt/main.cpp	\
+	ui/qt/main_status_bar.cpp	\
+	ui/qt/main_status_bar.h	\
+	ui/qt/main_welcome.cpp	\
+	ui/qt/main_welcome.h	\
+	ui/qt/main_window.cpp	\
+	ui/qt/main_window.h	\
+	ui/qt/main_window.ui	\
+	ui/qt/monospace_font.cpp	\
+	ui/qt/monospace_font.h	\
+	ui/qt/packet_list.cpp	\
+	ui/qt/packet_list.h	\
+	ui/qt/packet_list_model.cpp	\
+	ui/qt/packet_list_model.h
 
 #
 # Install the wimaxasncp directory files in the "wimaxasncp" subdirectory
@@ -241,26 +343,17 @@ PLATFORM_SRC = capture-pcap-util-unix.c
 if HAVE_PLUGINS
 -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/ciscosm/ciscosm.la \
 	-dlopen plugins/docsis/docsis.la \
-	-dlopen plugins/enttec/enttec.la \
 	-dlopen plugins/ethercat/ethercat.la \
 	-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/mate/mate.la \
 	-dlopen plugins/opcua/opcua.la \
-	-dlopen plugins/opsi/opsi.la \
-	-dlopen plugins/pcli/pcli.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
@@ -279,17 +372,6 @@ endif		# HAVE_PLUGINS
 
 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@ \
-	@STRCASECMP_O@ @STRNCASECMP_O@ @MKSTEMP_O@ @STRPTIME_O@
-
 if ENABLE_STATIC
 wireshark_LDFLAGS = -Wl,-static -all-static
 else
@@ -304,28 +386,27 @@ endif
 # @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@		\
 	@PORTAUDIO_LIBS@
-wireshark_CFLAGS = $(AM_CLEAN_CFLAGS)
+wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
 if ENABLE_STATIC
 tshark_LDFLAGS = -Wl,-static -all-static
@@ -335,15 +416,11 @@ endif
 
 # 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@			\
@@ -351,11 +428,12 @@ tshark_LDADD = \
 	@C_ARES_LIBS@			\
 	@ADNS_LIBS@			\
 	@KRB5_LIBS@			\
-	@FRAMEWORKS@			\
+	@CORESERVICES_FRAMEWORKS@	\
+	@PY_LIBS@			\
 	@LIBGCRYPT_LIBS@		\
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@
-tshark_CFLAGS = $(AM_CLEAN_CFLAGS)
+tshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
 if ENABLE_STATIC
 rawshark_LDFLAGS = -Wl,-static -all-static
@@ -363,17 +441,13 @@ else
 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@			\
@@ -381,19 +455,15 @@ rawshark_LDADD = \
 	@C_ARES_LIBS@			\
 	@ADNS_LIBS@			\
 	@KRB5_LIBS@			\
-	@FRAMEWORKS@			\
+	@CORESERVICES_FRAMEWORKS@	\
+	@PY_LIBS@			\
 	@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_optional_objects = @STRERROR_O@ @STRPTIME_O@
+rawshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
 # Libraries with which to link text2pcap.
 text2pcap_LDADD = \
-	$(text2pcap_optional_objects)	\
 	wiretap/libwiretap.la		\
 	wsutil/libwsutil.la		\
 	@GLIB_LIBS@ -lm
@@ -414,15 +484,16 @@ mergecap_CFLAGS = $(AM_CLEAN_CFLAGS)
 capinfos_LDADD = \
 	wiretap/libwiretap.la		\
 	wsutil/libwsutil.la		\
-	@GLIB_LIBS@
-capinfos_CFLAGS = $(AM_CLEAN_CFLAGS)
+	@GLIB_LIBS@			\
+	@LIBGCRYPT_LIBS@
+capinfos_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
 # Libraries with which to link editcap.
 editcap_LDADD = \
 	wiretap/libwiretap.la		\
 	wsutil/libwsutil.la		\
 	@GLIB_LIBS@
-editcap_CFLAGS = $(AM_CLEAN_CFLAGS)
+editcap_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
 # Libraries with which to link randpkt.
 randpkt_LDADD = \
@@ -438,13 +509,11 @@ 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@			\
@@ -452,29 +521,26 @@ dftest_LDADD = \
 	@C_ARES_LIBS@			\
 	@ADNS_LIBS@			\
 	@KRB5_LIBS@			\
+	@PY_LIBS@			\
 	@LIBGCRYPT_LIBS@		\
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@
-dftest_CFLAGS = $(AM_CLEAN_CFLAGS)
+dftest_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
 # 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)
 
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
-	$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS)
+	$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(PY_CFLAGS)
 
 #
 # Build the version string
@@ -483,20 +549,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
 FORCE:
 
 svnversion.h: FORCE
-	LANG=C $(PERL) $(srcdir)/make-version.pl $(srcdir)
-
-#
-# Build the short version of the authors file for the about dialog
-#
-AUTHORS-SHORT: AUTHORS make-authors-short.pl
-	$(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-short.pl < $(srcdir)/AUTHORS > AUTHORS-SHORT
-
-#
-# Build the short version of the authors file with formatting codes for the
-# man page
-#
-AUTHORS-SHORT-FORMAT: AUTHORS-SHORT make-authors-format.pl
-	$(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT
+	$(PERL) $(srcdir)/make-version.pl $(srcdir)
 
 #
 # Build shell scripts by doing variable substitution.
@@ -523,49 +576,46 @@ SUFFIXES = .sh
 # The first argument is the directory in which the source files live.
 # All subsequent arguments are the files to scan.
 #
-tshark-tap-register.c: $(TSHARK_TAP_SRC) $(srcdir)/make-tapreg-dotc
+tshark-tap-register.c: $(TSHARK_TAP_SRC) $(srcdir)/tools/make-tapreg-dotc
 	@echo Making tshark-tap-register.c
-	@$(srcdir)/make-tapreg-dotc tshark-tap-register.c $(srcdir) $(TSHARK_TAP_SRC)
+	@$(srcdir)/tools/make-tapreg-dotc tshark-tap-register.c $(srcdir) $(TSHARK_TAP_SRC)
 
-ps.c: print.ps rdps
-	./rdps $(srcdir)/print.ps ps.c
+ps.c: print.ps $(srcdir)/tools/rdps.py
+	$(PYTHON) $(srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c
 
-rdps: rdps.c
-	$(CC) $(CFLAGS) -o rdps $(srcdir)/rdps.c
+services: tools/make-services.pl
+	$(PERL) $(srcdir)/tools/make-services.pl
 
-#
-# 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"?
-#
 CLEANFILES =		\
-	svnversion.h	\
-	@rdps_bin@	\
-	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 = \
-	AUTHORS-SHORT		\
-	AUTHORS-SHORT-FORMAT	\
 	ps.c			\
-	ws.css
+	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	\
@@ -575,13 +625,15 @@ EXTRA_DIST = \
 	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		\
@@ -593,8 +645,8 @@ EXTRA_DIST = \
 	capture-wpcap.h		\
 	capture_wpcap_packet.c  \
 	capture_wpcap_packet.h  \
-	cfilters 		\
-	colorfilters 		\
+	cfilters		\
+	colorfilters		\
 	config.h.win32		\
 	config.nmake		\
 	debian/changelog	\
@@ -609,6 +661,7 @@ EXTRA_DIST = \
 	debian/pycompat		\
 	debian/pyversions	\
 	debian/rules		\
+	debian/README.source	\
 	debian/tshark.files	\
 	debian/tshark.manpages	\
 	debian/watch		\
@@ -625,13 +678,23 @@ EXTRA_DIST = \
 	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		\
-	wireshark.desktop	\
+	fix/FIX.xml		\
+	fix/FIX40.xml		\
+	fix/FIX41.xml		\
+	fix/FIX42.xml		\
+	fix/FIX43.xml		\
+	fix/FIX44.xml		\
+	fix/README		\
+	fix/Values.xsl		\
+	fix/hfDecl.xsl		\
+	fix/hfField.xsl		\
+	fix/hfList.xsl		\
+	idl/coseventcomm.idl	\
 	idl/cosnaming.idl	\
 	idl/tango.idl	\
 	idl/parlay/am.idl	\
@@ -667,14 +730,8 @@ EXTRA_DIST = \
 	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/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	\
@@ -702,6 +759,9 @@ EXTRA_DIST = \
 	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 \
@@ -718,6 +778,7 @@ EXTRA_DIST = \
 	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	\
@@ -741,26 +802,40 @@ EXTRA_DIST = \
 	image/toolbar/modem_16.png	\
 	image/toolbar/modem_16.xpm	\
 	image/toolbar/network_bluetooth_16.png	\
-	image/toolbar/network_bluetooth_16.xpm	\
+	image/toolbar/network_usb.svg		\
+	image/toolbar/network_usb_16.png	\
 	image/toolbar/network_virtual_16.xpm	\
 	image/toolbar/network_wired_16.png	\
-	image/toolbar/network_wired_16.xpm	\
 	image/toolbar/network_wireless_16.png	\
-	image/toolbar/network_wireless_16.xpm	\
+	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	\
@@ -770,147 +845,128 @@ EXTRA_DIST = \
 	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-authors-format.pl	\
-	make-authors-short.pl	\
-	make-manuf		\
-	make-tapreg-dotc	\
+	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		\
-	perlnoutf.pl		\
+	pdml2html.xsl		\
 	print.ps		\
 	$(diameter_DATA)	\
 	$(dtds_DATA)		\
 	$(radius_DATA)		\
 	$(tpncp_DATA)		\
+	$(ui_DATA)		\
+	$(uiqt_DATA)		\
 	$(wimaxasncp_DATA)	\
 	randpkt.c		\
-	rdps.c			\
 	smi_modules		\
 	text2pcap-scanner.l	\
 	text2pcap.c		\
 	text2pcap.h		\
 	services		\
-	wka.tmpl
+	wireshark.desktop	\
+	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 doc epan plugins packaging help @wireshark_SUBDIRS@
+SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc
 else
-SUBDIRS = tools wsutil wiretap doc epan packaging help @wireshark_SUBDIRS@
+SUBDIRS = tools wsutil wiretap epan packaging help @wireshark_SUBDIRS@ . doc
 endif
 
 help/faq.txt: $(srcdir)/help/faq.py
 	(cd help ; \
 	$(MAKE) faq.txt ;)
 
-wireshark.1: doc/wireshark.pod AUTHORS-SHORT-FORMAT
-	(cd doc ; \
-	$(MAKE) ../wireshark.1 )
-
-tshark.1: doc/tshark.pod
-	(cd doc ; \
-	$(MAKE) ../tshark.1 )
-
-wireshark-filter.4: tshark doc/wireshark-filter.pod.template
-	(cd doc ; \
-	$(MAKE) ../wireshark-filter.4 )
-
-capinfos.1: doc/capinfos.pod
-	(cd doc ; \
-	$(MAKE) ../capinfos.1 )
-
-editcap.1: doc/editcap.pod
-	(cd doc ; \
-	$(MAKE) ../editcap.1 )
-
-idl2wrs.1: doc/idl2wrs.pod
-	(cd doc ; \
-	$(MAKE) ../idl2wrs.1 )
-
-mergecap.1: doc/mergecap.pod
-	(cd doc ; \
-	$(MAKE) ../mergecap.1 )
-
-text2pcap.1: doc/text2pcap.pod
-	(cd doc ; \
-	$(MAKE) ../text2pcap.1 )
-
-dumpcap.1: doc/dumpcap.pod
-	(cd doc ; \
-	$(MAKE) ../dumpcap.1 )
-
-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 ws.css
-	(cd doc ; \
-	$(MAKE) ../tshark.html )
-
-wireshark-filter.html: tshark doc/wireshark-filter.pod.template ws.css
-	(cd doc ; \
-	$(MAKE) ../wireshark-filter.html )
-
-capinfos.html: doc/capinfos.pod ws.css
-	(cd doc ; \
-	$(MAKE) ../capinfos.html )
-
-editcap.html: doc/editcap.pod ws.css
-	(cd doc ; \
-	$(MAKE) ../editcap.html )
-
-idl2wrs.html: doc/idl2wrs.pod ws.css
-	(cd doc ; \
-	$(MAKE) ../idl2wrs.html )
-
-mergecap.html: doc/mergecap.pod ws.css
-	(cd doc ; \
-	$(MAKE) ../mergecap.html )
-
-text2pcap.html: doc/text2pcap.pod ws.css
-	(cd doc ; \
-	$(MAKE) ../text2pcap.html )
-
-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
 
@@ -944,7 +1000,7 @@ rpm-package: dist
 		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 .. ; \
@@ -958,7 +1014,7 @@ srpm-package: dist
 		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 .. ; \
@@ -988,30 +1044,45 @@ osx-app: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) packaging/macosx/Info.plist
 		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)
-#	$(wireshark_SOURCES)
+	$(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
+	cd codecs && $(MAKE) checkapi
+	cd ui/gtk && $(MAKE) checkapi
+##	cd epan && $(MAKE) checkapi
+##	cd epan/crypt && $(MAKE) checkapi
+	cd epan/dfilter && $(MAKE) checkapi
+##	cd epan/ftypes && $(MAKE) checkapi
+##	cd epan/wslua && $(MAKE) checkapi
+	cd epan/dissectors && $(MAKE) checkapi
+	cd plugins && $(MAKE) checkapi
+	cd wsutil && $(MAKE) checkapi