[gnome-themes-standard] build: cleanup GResource dependency generation

[Cosimo Cecchi <cosimoc src gnome org>]

commit 8cb6ea49e9cdd8ef1955504ebd3db0b9c46074a8
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jan 14 18:44:43 2013 -0500

    build: cleanup GResource dependency generation
    
    - make sure to use --sourcedir=$(srcdir)
    - use the generated dependency list to add files to EXTRA_DIST instead
      of doing it manually

 configure.ac                               |    2 -
 themes/Adwaita/gtk-3.0/Makefile.am         |   20 +---
 themes/Adwaita/gtk-3.0/assets/Makefile.am  |  171 ----------------------------
 themes/Adwaita/gtk-3.0/borders/Makefile.am |   34 ------
 themes/HighContrast/gtk-3.0/Makefile.am    |    5 +-
 5 files changed, 7 insertions(+), 225 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9a64044..4696fdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,8 +90,6 @@ themes/Adwaita/backgrounds/Makefile
 themes/Adwaita/cursors/Makefile
 themes/Adwaita/gtk-2.0/Makefile
 themes/Adwaita/gtk-3.0/Makefile
-themes/Adwaita/gtk-3.0/assets/Makefile
-themes/Adwaita/gtk-3.0/borders/Makefile
 themes/Adwaita/metacity-1/Makefile
 themes/HighContrast/Makefile
 themes/HighContrast/gtk-2.0/Makefile
diff --git a/themes/Adwaita/gtk-3.0/Makefile.am b/themes/Adwaita/gtk-3.0/Makefile.am
index 5f0f758..6dd498d 100644
--- a/themes/Adwaita/gtk-3.0/Makefile.am
+++ b/themes/Adwaita/gtk-3.0/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = assets borders
-
 enginedir = $(libdir)/gtk-3.0/$(GTK3_VERSION)/theming-engines
 engine_LTLIBRARIES =
 engine_LTLIBRARIES += libadwaita.la
@@ -19,25 +17,15 @@ theme_DATA = 		\
 	gtk-dark.css	\
 	settings.ini
 
-gtk.gresource: gtk.gresource.xml  $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/gtk.gresource.xml)
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/gtk.gresource.xml)
+gtk.gresource: gtk.gresource.xml $(resource_files)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)  $<
 
 EXTRA_DIST = \
-	gnome-applications.css \
-	gtk.gresource.xml \
+	$(resource_files) \
 	gtk.css \
 	gtk-dark.css \
-	gtk-fallback.css \
-	gtk-main.css \
-	gtk-main-common.css \
-	gtk-main-dark.css \
-	gtk-widgets.css \
-	gtk-widgets-backgrounds.css \
-	gtk-widgets-borders.css \
-	gtk-widgets-borders-dark.css \
-	gtk-widgets-dark-overrides.css \
-	gtk-widgets-assets.css \
-	gtk-widgets-assets-dark.css \
+	gtk.gresource.xml \
 	settings.ini
 
 CLEANFILES = \
diff --git a/themes/HighContrast/gtk-3.0/Makefile.am b/themes/HighContrast/gtk-3.0/Makefile.am
index a095b5d..7d691da 100644
--- a/themes/HighContrast/gtk-3.0/Makefile.am
+++ b/themes/HighContrast/gtk-3.0/Makefile.am
@@ -1,4 +1,5 @@
-gtk.gresource: gtk.gresource.xml  $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/gtk.gresource.xml)
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/gtk.gresource.xml)
+gtk.gresource: gtk.gresource.xml $(resource_files)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)  $<
 
 themedir = $(datadir)/themes/HighContrast/gtk-3.0
@@ -8,8 +9,8 @@ theme_DATA = \
 	settings.ini
 
 EXTRA_DIST = \
+	$(resource_files) \
 	gtk.css \
-	gtk-widgets.css \
 	gtk.gresource.xml \
 	settings.ini