[cheese/build-system-rewrite: 5/8] Make data directory build non-recursively

[David King <davidk src gnome org>]

commit 71422fc6cf786cfa6c92e60a7dc9d4773b48a2d3
Author: David King <amigadave amigadave com>
Date:   Sun Oct 16 09:55:10 2011 +0200

    Make data directory build non-recursively

 Makefile.am  |  101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac |   16 ---------
 2 files changed, 100 insertions(+), 17 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1002aea..c3b99c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = src po data help docs
+SUBDIRS = src po help docs
 
 marshal_data = \
 	libcheese/cheese-marshal.c \
@@ -238,9 +238,104 @@ tests_cheese_test_widget_LDADD = \
 	libcheese-gtk.la
 tests_test_webcam_button_LDADD = $(XTEST_LIBS)
 
+ INTLTOOL_DESKTOP_RULE@
+desktopdir = $(datadir)/applications
+desktop_in_files = data/cheese.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+ INTLTOOL_XML_NOMERGE_RULE@
+gsettings_in_file = data/org.gnome.Cheese.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+ GSETTINGS_RULES@
+
+dist_pkgdata_DATA = \
+	data/cheese.css \
+	data/cheese-about.ui \
+	data/cheese-actions.ui \
+	data/cheese-main-window.ui \
+	data/cheese-prefs.ui \
+	data/cheese-viewport.json
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = \
+	data/cheese.pc \
+	data/cheese-gtk.pc
+
+iconthemedir = $(datadir)/icons/hicolor
+
+appsicon16dir = $(iconthemedir)/16x16/apps
+appsicon22dir = $(iconthemedir)/22x22/apps
+appsicon24dir = $(iconthemedir)/24x24/apps
+appsicon32dir = $(iconthemedir)/32x32/apps
+appsicon48dir = $(iconthemedir)/48x48/apps
+appsicon256dir = $(iconthemedir)/256x256/apps
+
+actionsicon16dir = $(iconthemedir)/16x16/actions
+actionsicon22dir = $(iconthemedir)/22x22/actions
+actionsicon24dir = $(iconthemedir)/24x24/actions
+actionsicon32dir = $(iconthemedir)/32x32/actions
+actionsicon48dir = $(iconthemedir)/48x48/actions
+actionsiconscalabledir = $(iconthemedir)/scalable/actions
+
+dist_appsicon16_DATA = data/icons/16x16/cheese.png
+dist_appsicon22_DATA = data/icons/22x22/cheese.png
+dist_appsicon24_DATA = data/icons/24x24/cheese.png
+dist_appsicon32_DATA = data/icons/32x32/cheese.png
+dist_appsicon48_DATA = data/icons/48x48/cheese.png
+dist_appsicon256_DATA = data/icons/256x256/cheese.png
+
+dist_actionsicon16_DATA = \
+	data/icons/16x16/actions/browse-webcam-effects.png \
+	data/icons/16x16/actions/cheese-take-burst.png \
+	data/icons/16x16/actions/cheese-take-photo.png
+dist_actionsicon22_DATA = \
+	data/icons/22x22/actions/browse-webcam-effects.png \
+	data/icons/22x22/actions/cheese-take-burst.png \
+	data/icons/22x22/actions/cheese-take-photo.png
+dist_actionsicon24_DATA = \
+	data/icons/24x24/actions/browse-webcam-effects.png \
+	data/icons/24x24/actions/cheese-take-burst.png \
+	data/icons/24x24/actions/cheese-take-photo.png
+dist_actionsicon32_DATA = \
+	data/icons/32x32/actions/browse-webcam-effects.png \
+	data/icons/32x32/actions/cheese-take-burst.png \
+	data/icons/32x32/actions/cheese-take-photo.png
+dist_actionsicon48_DATA = \
+	data/icons/48x48/actions/browse-webcam-effects.png \
+	data/icons/48x48/actions/cheese-take-burst.png \
+	data/icons/48x48/actions/cheese-take-photo.png
+dist_actionsiconscalable_DATA = \
+	data/icons/scalable/actions/browse-webcam-effects.svg \
+	data/icons/scalable/actions/cheese-take-burst.svg \
+	data/icons/scalable/actions/cheese-take-photo.svg
+
+update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
+
+install-data-hook: install-update-icon-cache
+uninstall-hook: uninstall-update-icon-cache
+
+install-update-icon-cache:
+	$(AM_V_at)$(POST_INSTALL)
+	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
+
+uninstall-update-icon-cache:
+	$(AM_V_at)$(POST_UNINSTALL)
+	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
+
+pixmapsdir = $(pkgdatadir)/pixmaps
+dist_pixmaps_DATA = \
+	data/pixmaps/thumbnail-frame.png \
+	data/pixmaps/camera-icon.svg \
+	data/pixmaps/cheese-1.svg \
+	data/pixmaps/cheese-2.svg \
+	data/pixmaps/cheese-3.svg
+
 dist_noinst_DATA = \
 	build-aux/gnome-doc-utils.make \
 	ChangeLog.pre-git \
+	$(desktop_in_files) \
+	$(gsettings_in_file) \
+	$(service_in_files) \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
@@ -254,6 +349,9 @@ dist_noinst_SCRIPTS = \
 	autogen.sh
 
 CLEANFILES = \
+	$(desktop_DATA) \
+	$(gsettings_SCHEMAS) \
+	$(pkgconfig_DATA) \
 	$(marshal_data) \
 	$(enum_data) \
 	$(gir_DATA) \
@@ -276,6 +374,7 @@ MAINTAINERCLEANFILES = \
 	build-aux/missing \
 	aclocal.m4 \
 	config.h.n \
+	$(gsettings_SCHEMAS:.xml=.valid) \
 	mkinstalldirs \
 	omf.make \
 	xmldocs.make
diff --git a/configure.ac b/configure.ac
index 9da4b74..a5867db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,25 +173,9 @@ Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml
-data/Makefile
 data/cheese.pc
 data/cheese-gtk.pc
 data/cheese.desktop.in
-data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/22x22/Makefile
-data/icons/24x24/Makefile
-data/icons/32x32/Makefile
-data/icons/48x48/Makefile
-data/icons/256x256/Makefile
-data/icons/scalable/Makefile
-data/icons/16x16/actions/Makefile
-data/icons/22x22/actions/Makefile
-data/icons/24x24/actions/Makefile
-data/icons/32x32/actions/Makefile
-data/icons/48x48/actions/Makefile
-data/icons/scalable/actions/Makefile
-data/pixmaps/Makefile
 help/Makefile
 src/Makefile
 po/Makefile.in