[recipes] Split resources into two



commit 8a267812d62bea4c094e6d306bdf932108c2516b
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Dec 15 15:10:49 2016 -0500

    Split resources into two
    
    The images take a long time, resourcify, and never change.
    So lets keep them separate.

 src/Makefile.am                                    |   21 ++++++++++++++-----
 src/recipes-images.gresource.xml                   |   18 +++++++++++++++++
 ...ipes.gresource.xml => recipes-ui.gresource.xml} |   13 ------------
 3 files changed, 33 insertions(+), 19 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 1d9e9dc..8ee2fc3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,7 +96,8 @@ recipes_SOURCES = \
        gr-utils.c              \
        gr-window.h             \
        gr-window.c             \
-       resources.c             \
+       resources-ui.c          \
+       resources-images.c      \
        types.h                 \
        types.c                 \
        gr-shell-search-provider.h \
@@ -105,18 +106,25 @@ recipes_SOURCES = \
        gr-shell-search-provider-dbus.c
 
 BUILT_SOURCES = \
-       resources.c             \
+       resources-ui.c          \
+       resources-images.c      \
        types.h                 \
        types.c                 \
        gr-shell-search-provider-dbus.h \
        gr-shell-search-provider-dbus.c
 
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/recipes.gresource.xml)
+resource_ui_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/recipes-ui.gresource.xml)
 
-resources.c: recipes.gresource.xml $(resource_files)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/recipes.gresource.xml \
+resources-ui.c: recipes-ui.gresource.xml $(resource_ui_files)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/recipes-ui.gresource.xml \
                 --target=$@ --sourcedir=$(srcdir) --generate-source
 
+resource_image_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/recipes-images.gresource.xml)
+
+resources-images.c: recipes-images.gresource.xml $(resource_image_files)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/recipes-images.gresource.xml \
+               --target=$@ --sourcedir=$(srcdir) --generate-source
+
 types.h: types.h.template gr-diet.h
        $(AM_V_GEN) ($(GLIB_MKENUMS) --template types.h.template gr-diet.h ) > xgen-eh && \
        cp xgen-eh $@ && \
@@ -138,7 +146,8 @@ searchproviderdir = $(datadir)/gnome-shell/search-providers
 searchprovider_DATA = org.gnome.Recipes-search-provider.ini
 
 EXTRA_DIST = \
-       $(resource_files)       \
+       $(resource_ui_files)    \
+       $(resource_image_files) \
        types.h.template        \
        types.c.template
 
diff --git a/src/recipes-images.gresource.xml b/src/recipes-images.gresource.xml
new file mode 100644
index 0000000..3512d02
--- /dev/null
+++ b/src/recipes-images.gresource.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Recipes">
+    <file>org.gnome.Recipes-symbolic.symbolic.png</file>
+    <file>recipes.css</file>
+    <file>cuisine.css</file>
+    <file>american.png</file>
+    <file>chinese.png</file>
+    <file>italian.png</file>
+    <file>mediterranean.png</file>
+    <file>turkish.png</file>
+    <file>big-american.png</file>
+    <file>big-chinese.png</file>
+    <file>big-italian.png</file>
+    <file>big-mediterranean.png</file>
+    <file>big-turkish.png</file>
+  </gresource>
+</gresources>
diff --git a/src/recipes.gresource.xml b/src/recipes-ui.gresource.xml
similarity index 79%
rename from src/recipes.gresource.xml
rename to src/recipes-ui.gresource.xml
index a746b7e..42e8e53 100644
--- a/src/recipes.gresource.xml
+++ b/src/recipes-ui.gresource.xml
@@ -24,19 +24,6 @@
     <file preprocess="xml-stripblanks">gr-window.ui</file>
     <file preprocess="xml-stripblanks">chef-conflict-dialog.ui</file>
     <file preprocess="xml-stripblanks">recipe-conflict-dialog.ui</file>
-    <file>org.gnome.Recipes-symbolic.symbolic.png</file>
-    <file>recipes.css</file>
-    <file>cuisine.css</file>
-    <file>american.png</file>
-    <file>chinese.png</file>
-    <file>italian.png</file>
-    <file>mediterranean.png</file>
-    <file>turkish.png</file>
-    <file>big-american.png</file>
-    <file>big-chinese.png</file>
-    <file>big-italian.png</file>
-    <file>big-mediterranean.png</file>
-    <file>big-turkish.png</file>
   </gresource>
   <gresource prefix="/org/gnome/Recipes/gtk">
     <file preprocess="xml-stripblanks">menus.ui</file>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]