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

diff --git a/Makefile.am b/Makefile.am
index 3b70694638..98e830c45c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,21 +47,16 @@ bin_PROGRAMS = \
 	@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
@@ -70,6 +65,7 @@ pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
 diameterdir = $(pkgdatadir)/diameter
 diameter_DATA = \
 	diameter/chargecontrol.xml \
+	diameter/Cisco.xml \
 	diameter/dictionary.dtd \
 	diameter/dictionary.xml \
 	diameter/eap.xml \
@@ -84,7 +80,8 @@ diameter_DATA = \
 	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
@@ -117,8 +114,11 @@ radius_DATA = \
 	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 \
@@ -127,6 +127,7 @@ radius_DATA = \
 	radius/dictionary.aruba  \
 	radius/dictionary.ascend  \
 	radius/dictionary.asn \
+	radius/dictionary.audiocodes \
 	radius/dictionary.avaya \
 	radius/dictionary.azaire \
 	radius/dictionary.bay  \
@@ -146,6 +147,7 @@ radius_DATA = \
 	radius/dictionary.cosine  \
 	radius/dictionary.dhcp \
 	radius/dictionary.digium \
+	radius/dictionary.eltex \
 	radius/dictionary.epygi \
 	radius/dictionary.ericsson  \
 	radius/dictionary.erx  \
@@ -161,6 +163,7 @@ radius_DATA = \
 	radius/dictionary.h3c \
 	radius/dictionary.hp \
 	radius/dictionary.huawei \
+	radius/dictionary.iea \
 	radius/dictionary.infonet \
 	radius/dictionary.ipunplugged \
 	radius/dictionary.issanni \
@@ -177,6 +180,7 @@ radius_DATA = \
 	radius/dictionary.microsoft  \
 	radius/dictionary.mikrotik  \
 	radius/dictionary.motorola \
+	radius/dictionary.motorola.wimax \
 	radius/dictionary.navini  \
 	radius/dictionary.netscreen  \
 	radius/dictionary.networkphysics \
@@ -205,12 +209,16 @@ radius_DATA = \
 	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  \
@@ -225,8 +233,7 @@ radius_DATA = \
 	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 \
@@ -235,7 +242,9 @@ radius_DATA = \
 	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 \
@@ -249,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
@@ -270,13 +349,11 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
 	-dlopen plugins/giop/cosnaming.la \
 	-dlopen plugins/giop/coseventcomm.la \
 	-dlopen plugins/gryphon/gryphon.la \
-	-dlopen plugins/interlink/interlink.la \
 	-dlopen plugins/irda/irda.la \
 	-dlopen plugins/m2m/m2m.la \
 	-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
@@ -309,14 +386,14 @@ endif
 # @GTK_LIBS@ (as those are also needed for X applications, and GTK+
 # applications are X applications).
 wireshark_LDADD = \
-	gtk/libui.a			\
+	ui/gtk/libui.a			\
+	ui/gtk/libui_dirty.a		\
 	codecs/libcodec.a		\
 	wiretap/libwiretap.la		\
 	epan/libwireshark.la		\
 	wsutil/libwsutil.la		\
-	@SSL_LIBS@ 			\
+	@SSL_LIBS@			\
 	$(plugin_ldadd)			\
-	@PCRE_LIBS@			\
 	@PCAP_LIBS@			\
 	@GTK_LIBS@ -lm			\
 	@C_ARES_LIBS@			\
@@ -324,6 +401,7 @@ wireshark_LDADD = \
 	@KRB5_LIBS@			\
 	@LAUNCHSERVICES_FRAMEWORKS@	\
 	@CORESERVICES_FRAMEWORKS@	\
+	@PY_LIBS@			\
 	@LIBGCRYPT_LIBS@		\
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@		\
@@ -343,7 +421,6 @@ tshark_LDADD = \
 	wsutil/libwsutil.la		\
 	@SSL_LIBS@			\
 	$(plugin_ldadd)			\
-	@PCRE_LIBS@			\
 	@GLIB_LIBS@ -lm			\
 	@PCAP_LIBS@			\
 	@SOCKET_LIBS@			\
@@ -352,6 +429,7 @@ tshark_LDADD = \
 	@ADNS_LIBS@			\
 	@KRB5_LIBS@			\
 	@CORESERVICES_FRAMEWORKS@	\
+	@PY_LIBS@			\
 	@LIBGCRYPT_LIBS@		\
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@
@@ -370,7 +448,6 @@ rawshark_LDADD = \
 	wsutil/libwsutil.la		\
 	@SSL_LIBS@			\
 	$(plugin_ldadd)			\
-	@PCRE_LIBS@			\
 	@GLIB_LIBS@ -lm			\
 	@PCAP_LIBS@			\
 	@SOCKET_LIBS@			\
@@ -379,6 +456,7 @@ rawshark_LDADD = \
 	@ADNS_LIBS@			\
 	@KRB5_LIBS@			\
 	@CORESERVICES_FRAMEWORKS@	\
+	@PY_LIBS@			\
 	@LIBGCRYPT_LIBS@		\
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@
@@ -400,7 +478,7 @@ mergecap_LDADD = \
 	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 = \
@@ -427,7 +505,7 @@ randpkt_LDADD = \
 	@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 = \
@@ -436,7 +514,6 @@ dftest_LDADD = \
 	epan/libwireshark.la		\
 	@SSL_LIBS@			\
 	$(plugin_ldadd)			\
-	@PCRE_LIBS@			\
 	@GLIB_LIBS@ -lm			\
 	@PCAP_LIBS@			\
 	@SOCKET_LIBS@			\
@@ -444,6 +521,7 @@ dftest_LDADD = \
 	@C_ARES_LIBS@			\
 	@ADNS_LIBS@			\
 	@KRB5_LIBS@			\
+	@PY_LIBS@			\
 	@LIBGCRYPT_LIBS@		\
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@
@@ -451,7 +529,6 @@ dftest_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
 # Libraries with which to link dumpcap.
 dumpcap_LDADD = \
-	wiretap/libwiretap.la		\
 	wsutil/libwsutil.la		\
 	@GLIB_LIBS@			\
 	@PCAP_LIBS@			\
@@ -459,7 +536,7 @@ dumpcap_LDADD = \
 	@NSL_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 \
@@ -509,36 +586,36 @@ ps.c: print.ps $(srcdir)/tools/rdps.py
 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	\
-	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			\
-	services
+	ylwrap
 
 EXTRA_DIST = \
 	INSTALL.configure	\
@@ -548,6 +625,7 @@ EXTRA_DIST = \
 	Makefile.nmake.inc	\
 	README.aix		\
 	README.bsd		\
+	README.DECT		\
 	README.hpux		\
 	README.irix		\
 	README.linux		\
@@ -555,6 +633,7 @@ EXTRA_DIST = \
 	README.tru64		\
 	README.vmware		\
 	README.windows		\
+	abi-descriptor.template	\
 	aclocal-fallback/glib-2.0.m4 \
 	aclocal-fallback/gtk-2.0.m4 \
 	aclocal-flags		\
@@ -566,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	\
@@ -599,7 +678,8 @@ EXTRA_DIST = \
 	debian/wireshark.files \
 	debian/wireshark.manpages \
 	debian/wireshark.menu	\
-	dfilters 		\
+	epan/dfilter/README.dfilter	\
+	dfilters		\
 	doxygen.cfg.in		\
 	dumpcap.c	\
 	editcap.c		\
@@ -614,6 +694,7 @@ EXTRA_DIST = \
 	fix/hfDecl.xsl		\
 	fix/hfField.xsl		\
 	fix/hfList.xsl		\
+	idl/coseventcomm.idl	\
 	idl/cosnaming.idl	\
 	idl/tango.idl	\
 	idl/parlay/am.idl	\
@@ -678,6 +759,7 @@ 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	\
@@ -725,6 +807,10 @@ EXTRA_DIST = \
 	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	\
@@ -770,17 +856,23 @@ EXTRA_DIST = \
 	image/wslogo.svg	\
 	image/wssplash-dev.xpm	\
 	image/wssplash.xpm	\
-	ipmap.html	\
-	make-manuf		\
+	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)		\
+	$(uiqt_DATA)		\
 	$(wimaxasncp_DATA)	\
 	randpkt.c		\
 	smi_modules		\
@@ -797,47 +889,55 @@ EXTRA_DIST = \
 	wiretap/CMakeLists.txt	\
 	README.cmake		\
 	ConfigureChecks.cmake	\
-	cmake/modules/readme.txt		\
-	cmake/modules/FindLYNX.cmake		\
-	cmake/modules/FindYACC.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/UseLemon.cmake		\
-	cmake/modules/FindPCRE.cmake		\
-	cmake/modules/FindZLIB.cmake		\
-	cmake/modules/FindPORTAUDIO.cmake	\
-	cmake/modules/FindPCAP.cmake		\
-	cmake/modules/FindSMI.cmake		\
 	cmake/modules/FindCARES.cmake		\
-	cmake/modules/FindXSLTPROC.cmake	\
-	cmake/modules/FindSH.cmake		\
-	cmake/modules/FindGNUTLS.cmake		\
+	cmake/modules/FindFOP.cmake		\
 	cmake/modules/FindGCRYPT.cmake		\
-	cmake/modules/UseMakeDissectorReg.cmake	\
-	cmake/modules/FindLEX.cmake		\
-	cmake/modules/FindPYTHON.cmake		\
-	cmake/modules/FindLUA.cmake		\
-	cmake/modules/FindYAPP.cmake		\
 	cmake/modules/FindGEOIP.cmake		\
-	cmake/modules/FindXMLLINT.cmake		\
-	cmake/modules/FindSED.cmake		\
 	cmake/modules/FindGLIB2.cmake		\
-	cmake/modules/FindHtmlViewer.cmake	\
+	cmake/modules/FindGMODULE2.cmake	\
+	cmake/modules/FindGNUTLS.cmake		\
+	cmake/modules/FindGTHREAD2.cmake	\
 	cmake/modules/FindGTK2.cmake		\
-	cmake/modules/FindFOP.cmake		\
-	cmake/modules/LICENSE.txt		\
-	cmake/modules/CMakeInstallDirs.cmake	\
-	cmake/modules/CheckCLinkerFlag.cmake	\
-	cmake/modules/UseMakeTapReg.cmake	\
-	cmake/modules/FindM.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		\
+	all.vcproj				\
+	dumpcap.vcproj				\
+	packaging.vcproj			\
+	tshark.vcproj				\
 	wireshark.vcproj
 
 install-exec-hook:
@@ -855,7 +955,7 @@ endif
 endif
 
 
-DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil docbook
+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
@@ -944,7 +1044,11 @@ 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 ; \
@@ -959,21 +1063,26 @@ osx-install: osx-app
 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