[glom] Move icons and .glade files into the same GResource.

[Murray Cumming <murrayc src gnome org>]

commit 01df7d47593395dd918f24a8ca686119ca6170b8
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 22 12:53:59 2013 +0200

    Move icons and .glade files into the same GResource.

 Makefile_glom.am                                   |   21 ++++++------------
 .../glom-ui.gresource.xml => glom.gresource.xml}   |   11 +++++++++-
 data/icons/glom-icons.gresource.xml                |   22 --------------------
 3 files changed, 17 insertions(+), 37 deletions(-)
---
diff --git a/Makefile_glom.am b/Makefile_glom.am
index 3b67e57..d78445c 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -28,12 +28,12 @@ bin_PROGRAMS += glom/glom
 
 glom_glom_CPPFLAGS = $(glom_includes) $(GLOM_CFLAGS) $(PYTHON_CPPFLAGS) $(BOOST_PYTHON_CFLAGS) 
$(GCOV_CFLAGS) $(glom_defines)
 
-# Generate the GResource source file for .glade files:
+# Generate the GResource source file for .glade and icons files:
 # TODO: Do not use all .glade files in the client-only build.
-glom_ui_resource_file = data/ui/glom-ui.gresource.xml
-BUILT_SOURCES = data/ui/glom-ui-resources.c
-data/ui/glom-ui-resources.c: $(glom_ui_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies $(glom_ui_resource_file))
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(glom_ui_resource_file)
+glom_resource_file = data/glom.gresource.xml
+BUILT_SOURCES = data/glom-resources.c
+data/glom-resources.c: $(glom_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
$(glom_resource_file))
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(glom_resource_file)
 
 # Generate the GResource source file for example .glom files:
 glom_examples_resource_file = examples/glom-examples.gresource.xml
@@ -41,16 +41,9 @@ BUILT_SOURCES += examples/glom-examples-resources.c
 examples/glom-examples-resources.c: $(glom_examples_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies $(glom_examples_resource_file))
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(glom_examples_resource_file)
 
-# Generate the GResource source file for icon files:
-glom_icons_resource_file = data/icons/glom-icons.gresource.xml
-BUILT_SOURCES += data/icons/glom-icons-resources.c
-data/icons/glom-icons-resources.c: $(glom_icons_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies $(glom_icons_resource_file))
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(glom_icons_resource_file)
-
 EXTRA_DIST = \
-       $(glom_ui_resource_file) \
-       $(glom_examples_resource_file) \
-       $(glom_icons_resource_file)
+       $(glom_resource_file) \
+       $(glom_examples_resource_file)
 
 
 glom_eggspreadtable_files =  \
diff --git a/data/ui/glom-ui.gresource.xml b/data/glom.gresource.xml
similarity index 91%
rename from data/ui/glom-ui.gresource.xml
rename to data/glom.gresource.xml
index 3371ea5..8fb7427 100644
--- a/data/ui/glom-ui.gresource.xml
+++ b/data/glom.gresource.xml
@@ -53,7 +53,16 @@
     <file preprocess="xml-stripblanks">data/ui/operator/dialog_import_csv_progress.glade</file>
     <file preprocess="xml-stripblanks">data/ui/operator/dialog_new_record.glade</file>
     <file preprocess="xml-stripblanks">data/ui/operator/window_main.glade</file>
-
+    <file>data/icons/glom-button.png</file>
+    <file>data/icons/glom-field.png</file>
+    <file>data/icons/glom-group.png</file>
+    <file>data/icons/glom-image.png</file>
+    <file>data/icons/glom-line-horizontal.png</file>
+    <file>data/icons/glom-line-vertical.png</file>
+    <file>data/icons/glom-notebook.png</file>
+    <file>data/icons/glom-related-records.png</file>
+    <file>data/icons/glom-text.png</file>
+    <file>data/icons/48x48/glom.png</file>
   </gresource>
 </gresources>