[vinagre] Convert data subdirectory to build non-recursively

[David King <davidk src gnome org>]

commit 2855acf669fba35d2bc5fba0614a6ffc6d4ff1f6
Author: David King <amigadave amigadave com>
Date:   Mon Mar 7 17:56:56 2011 +0100

    Convert data subdirectory to build non-recursively

 Makefile.am      |  127 +++++++++++++++++++++++++++++++++++-------------------
 configure.ac     |    1 -
 data/Makefile.am |   91 --------------------------------------
 3 files changed, 82 insertions(+), 137 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index eacb8f7..7229963 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,51 +1,88 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = vinagre help po data plugins
-
-vinagredocdir = ${datadir}/doc/vinagre
-vinagredoc_DATA = \
-	README\
-	COPYING\
-	AUTHORS\
-	ChangeLog\
-	INSTALL\
-	NEWS
-
-EXTRA_DIST =			\
-	$(vinagredoc_DATA)	\
-	intltool-extract.in	\
-	intltool-merge.in	\
-	intltool-update.in
+SUBDIRS = vinagre help po data/icons plugins
 
-DISTCLEANFILES =		\
-	intltool-extract	\
-	intltool-merge		\
-	intltool-update
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --without-panelapplet
 
-MAINTAINERCLEANFILES = 		\
-	compile			\
-	aclocal.m4		\
-	config.guess		\
-	config.h.in		\
-	config.sub		\
-	depcomp			\
-	gnome-doc-utils.make	\
-	install-sh		\
-	ltmain.sh		\
-	missing			\
-	mkinstalldirs		\
-	omf.make		\
-	xmldocs.make		\
-	`find "$(srcdir)" -type f -name Makefile.in -print`	\
-	`find "$(topdir)/help" -type f -name *.mo -print`
+dist_man_MANS = data/vinagre.1
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --without-panelapplet
+pkgconfigdir = $(libdir)/pkgconfig
+nodist_pkgconfig_DATA = data/vinagre- VINAGRE_API_VERSION@.pc
+
+data/vinagre- VINAGRE_API_VERSION@.pc: data/vinagre.pc
+	$(AM_V_GEN)cp $< $@
+
+uidir = $(pkgdatadir)
+dist_ui_DATA = \
+	data/vinagre-ui.xml \
+	data/GNOME_VinagreApplet.xml \
+	data/vinagre.ui \
+	data/vinagre-fav-ui.xml
+
+ INTLTOOL_DESKTOP_RULE@
+desktopdir = $(datadir)/applications
+desktop_in_files = data/vinagre.desktop.in data/vinagre-file.desktop.in
+nodist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+ INTLTOOL_XML_RULE@
+mimedir = $(datadir)/mime/packages
+nodist_mime_DATA = data/vinagre-mime.xml
+
+gsettings_in_file = data/org.gnome.Vinagre.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+# @INTLTOOL_XML_NOMERGE_RULE@
+# This rule is overriden by the above INTLTOOL_XML_RULE macro.
+# Here is the workaround. Could break if intltools changes arguments.
+$(gsettings_SCHEMAS): $(gsettings_in_file)
+	$(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
 
-# Copy all the spec files. Of cource, only one is actually used.
-dist-hook:
-	for specfile in *.spec; do \
-		if test -f $$specfile; then \
-			cp -p $$specfile $(distdir); \
-		fi \
-	done
+ GSETTINGS_RULES@
+
+if VINAGRE_HAVE_TELEPATHY_GLIB
+clientfiledir = $(datarootdir)/telepathy/clients
+dist_clientfile_DATA = data/Vinagre.client
+
+servicedir = $(datadir)/dbus-1/services
+service_in_file = data/org.freedesktop.Telepathy.Client.Vinagre.service.in
+nodist_service_DATA = $(service_in_file:.in=)
+
+$(nodist_service_DATA): $(service_in_file) Makefile
+	$(AM_V_GEN)$(SED) -e "s|[ ]bindir[@]|$(bindir)|" $< > $@
+endif
+
+dist_noinst_DATA = \
+	data/vinagre.pc.in \
+	data/vinagre-mime.xml.in \
+	$(desktop_in_files) \
+	$(gsettings_in_file) \
+	$(service_in_file) \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in
+
+CLEANFILES = \
+	$(nodist_desktop_DATA) \
+	$(nodist_mime_DATA) \
+	$(gsettings_SCHEMAS) \
+	$(nodist_pkgconfig_DATA) \
+	data/org.freedesktop.Telepathy.Client.Vinagre.service
+
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update
 
--include $(top_srcdir)/git.mk
+MAINTAINERCLEANFILES = \
+	build-aux/compile \
+	build-aux/config.guess \
+	build-aux/config.sub \
+	build-aux/depcomp \
+	build-aux/gnome-doc-utils.make \
+	build-aux/install-sh \
+	build-aux/ltmain.sh \
+	build-aux/missing \
+	aclocal.m4 \
+	$(gsettings_SCHEMAS:.xml=.valid) \
+	config.h.in \
+	mkinstalldirs \
+	omf.make \
+	xmldocs.make
diff --git a/configure.ac b/configure.ac
index fabcf84..f363527 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,7 +279,6 @@ GLIB_GSETTINGS
 
 AC_CONFIG_FILES([
 Makefile
-data/Makefile
 data/vinagre.desktop.in
 data/vinagre-file.desktop.in
 data/vinagre.pc