[gnome-initial-setup] summary: Port to standalone resources

[Jasper St. Pierre <jstpierre src gnome org>]

commit 55104fc5fd6f53edf8ffeeb901f64d6559202ed9
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Jan 25 00:19:11 2013 -0500

    summary: Port to standalone resources

 .gitignore                                         |    4 ++--
 gnome-initial-setup/Makefile.am                    |   12 +-----------
 gnome-initial-setup/pages/summary/Makefile.am      |   14 ++++++++++++--
 .../pages/summary/gis-summary-page.c               |    2 ++
 .../summary/summary.gresource.xml}                 |    2 +-
 5 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c5605d..63fb9a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,8 +43,6 @@ gnome-initial-setup-*.tar.gz
 gnome-initial-setup-*.tar.bz2
 gnome-initial-setup-*.tar.xz
 
-gnome-initial-setup/gis-resources.c
-gnome-initial-setup/gis-resources.h
 gnome-initial-setup/gnome-initial-setup
 gnome-initial-setup/gnome-initial-setup-copy-worker
 
@@ -68,6 +66,8 @@ gnome-initial-setup/pages/location/location-resources.c
 gnome-initial-setup/pages/location/location-resources.h
 gnome-initial-setup/pages/language/language-resources.c
 gnome-initial-setup/pages/language/language-resources.h
+gnome-initial-setup/pages/summary/summary-resources.c
+gnome-initial-setup/pages/summary/summary-resources.h
 gnome-initial-setup/pages/welcome/welcome-resources.c
 gnome-initial-setup/pages/welcome/welcome-resources.h
 
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index 27ccaf7..169884c 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -11,15 +11,6 @@ AM_CPPFLAGS = \
 
 libexec_PROGRAMS = gnome-initial-setup gnome-initial-setup-copy-worker
 
-BUILT_SOURCES =
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/setup.gresource.xml)
-gis-resources.c: setup.gresource.xml $(resource_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
-gis-resources.h: setup.gresource.xml $(resource_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
-BUILT_SOURCES += gis-resources.c gis-resources.h
-
 gnome_initial_setup_SOURCES =	\
 	gnome-initial-setup.c gnome-initial-setup.h \
 	gdm-languages.c gdm-languages.h \
@@ -27,8 +18,7 @@ gnome_initial_setup_SOURCES =	\
 	gis-assistant.c gis-assistant.h gis-assistant-private.h \
 	gis-assistant-gtk.c gis-assistant-gtk.h \
 	gis-page.c gis-page.h \
-	gis-driver.c gis-driver.h \
-	$(BUILT_SOURCES)
+	gis-driver.c gis-driver.h
 
 if HAVE_CLUTTER
 gnome_initial_setup_SOURCES += \
diff --git a/gnome-initial-setup/pages/summary/Makefile.am b/gnome-initial-setup/pages/summary/Makefile.am
index 0a3561f..5fc2720 100644
--- a/gnome-initial-setup/pages/summary/Makefile.am
+++ b/gnome-initial-setup/pages/summary/Makefile.am
@@ -6,8 +6,18 @@ AM_CPPFLAGS = \
 	-DLOCALSTATEDIR="\"$(localstatedir)\"" \
 	-DUIDIR="\"$(uidir)\""
 
-libgissummary_la_SOURCES =	\
-	gis-summary-page.c gis-summary-page.h
+BUILT_SOURCES =
+
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/summary.gresource.xml)
+summary-resources.c: summary.gresource.xml $(resource_files)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+summary-resources.h: summary.gresource.xml $(resource_files)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
+BUILT_SOURCES += summary-resources.c summary-resources.h
+
+libgissummary_la_SOURCES =			\
+	gis-summary-page.c gis-summary-page.h	\
+	$(BUILT_SOURCES)
 
 libgissummary_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "$(srcdir)/../.."
 libgissummary_la_LIBADD = $(INITIAL_SETUP_LIBS)
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c
index 5b671d1..18d2561 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -26,6 +26,7 @@
 #define PAGE_ID "summary"
 
 #include "config.h"
+#include "summary-resources.h"
 #include "gis-summary-page.h"
 
 #include <glib/gstdio.h>
@@ -302,6 +303,7 @@ gis_summary_page_class_init (GisSummaryPageClass *klass)
 static void
 gis_summary_page_init (GisSummaryPage *page)
 {
+  g_resources_register (summary_get_resource ());
   page->priv = GET_PRIVATE (page);
 }
 
diff --git a/gnome-initial-setup/setup.gresource.xml b/gnome-initial-setup/pages/summary/summary.gresource.xml
similarity index 81%
rename from gnome-initial-setup/setup.gresource.xml
rename to gnome-initial-setup/pages/summary/summary.gresource.xml
index f390420..91191bc 100644
--- a/gnome-initial-setup/setup.gresource.xml
+++ b/gnome-initial-setup/pages/summary/summary.gresource.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/initial-setup">
-    <file preprocess="xml-stripblanks" alias="gis-summary-page.ui">pages/summary/gis-summary-page.ui</file>
+    <file preprocess="xml-stripblanks" alias="gis-summary-page.ui">gis-summary-page.ui</file>
   </gresource>
 </gresources>