X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=Makefile.am;h=4da0e668ab829774334f8d11bb4174e10a7e9384;hp=312f799cdc2a51b276093478300e92b5db45d51a;hb=b3cb678b85db17fa97e194a6c4f22f54ab310f7a;hpb=52a3047cdf8134d5f8fde14520b6a8154ad704c8

diff --git a/Makefile.am b/Makefile.am
index 312f799cdc..4da0e668ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,15 +47,10 @@ 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).
@@ -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
@@ -261,6 +258,13 @@ 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 wimaxasncp directory files in the "wimaxasncp" subdirectory
@@ -282,13 +286,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
@@ -321,15 +323,14 @@ endif
 # @GTK_LIBS@ (as those are also needed for X applications, and GTK+
 # applications are X applications).
 wireshark_LDADD = \
-	gtk/libui.a			\
-	gtk/libui_dirty.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@			\
@@ -337,6 +338,7 @@ wireshark_LDADD = \
 	@KRB5_LIBS@			\
 	@LAUNCHSERVICES_FRAMEWORKS@	\
 	@CORESERVICES_FRAMEWORKS@	\
+	@PY_LIBS@			\
 	@LIBGCRYPT_LIBS@		\
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@		\
@@ -356,7 +358,6 @@ tshark_LDADD = \
 	wsutil/libwsutil.la		\
 	@SSL_LIBS@			\
 	$(plugin_ldadd)			\
-	@PCRE_LIBS@			\
 	@GLIB_LIBS@ -lm			\
 	@PCAP_LIBS@			\
 	@SOCKET_LIBS@			\
@@ -365,6 +366,7 @@ tshark_LDADD = \
 	@ADNS_LIBS@			\
 	@KRB5_LIBS@			\
 	@CORESERVICES_FRAMEWORKS@	\
+	@PY_LIBS@			\
 	@LIBGCRYPT_LIBS@		\
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@
@@ -383,7 +385,6 @@ rawshark_LDADD = \
 	wsutil/libwsutil.la		\
 	@SSL_LIBS@			\
 	$(plugin_ldadd)			\
-	@PCRE_LIBS@			\
 	@GLIB_LIBS@ -lm			\
 	@PCAP_LIBS@			\
 	@SOCKET_LIBS@			\
@@ -392,6 +393,7 @@ rawshark_LDADD = \
 	@ADNS_LIBS@			\
 	@KRB5_LIBS@			\
 	@CORESERVICES_FRAMEWORKS@	\
+	@PY_LIBS@			\
 	@LIBGCRYPT_LIBS@		\
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@
@@ -449,7 +451,6 @@ dftest_LDADD = \
 	epan/libwireshark.la		\
 	@SSL_LIBS@			\
 	$(plugin_ldadd)			\
-	@PCRE_LIBS@			\
 	@GLIB_LIBS@ -lm			\
 	@PCAP_LIBS@			\
 	@SOCKET_LIBS@			\
@@ -457,6 +458,7 @@ dftest_LDADD = \
 	@C_ARES_LIBS@			\
 	@ADNS_LIBS@			\
 	@KRB5_LIBS@			\
+	@PY_LIBS@			\
 	@LIBGCRYPT_LIBS@		\
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@
@@ -521,35 +523,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
+	missing			\
+	ylwrap
 
 EXTRA_DIST = \
 	INSTALL.configure	\
@@ -559,6 +562,7 @@ EXTRA_DIST = \
 	Makefile.nmake.inc	\
 	README.aix		\
 	README.bsd		\
+	README.DECT		\
 	README.hpux		\
 	README.irix		\
 	README.linux		\
@@ -566,6 +570,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		\
@@ -577,8 +582,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	\
@@ -610,7 +615,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		\
@@ -625,6 +631,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	\
@@ -737,6 +744,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	\
@@ -783,6 +794,10 @@ EXTRA_DIST = \
 	image/wssplash-dev.xpm	\
 	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		\
@@ -793,6 +808,7 @@ EXTRA_DIST = \
 	$(dtds_DATA)		\
 	$(radius_DATA)		\
 	$(tpncp_DATA)		\
+	$(ui_DATA)		\
 	$(wimaxasncp_DATA)	\
 	randpkt.c		\
 	smi_modules		\
@@ -809,52 +825,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		\
-	win32/Makefile.nmake	\
-	win32/file_dlg_win32.c		\
-	win32/file_dlg_win32.h		\
+	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		\
+	win32/Makefile.nmake			\
+	win32/file_dlg_win32.c			\
+	win32/file_dlg_win32.h			\
 	win32/print_win32.c			\
 	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:
@@ -872,7 +891,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
@@ -980,6 +999,11 @@ 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)