[shotwell] Move gresource to top-level

[Jens Georg <jensgeorg src gnome org>]

commit 7da6f0ea5fe79cc377ef01af685e8458c0a8e05a
Author: Jens Georg <mail jensge org>
Date:   Sun Dec 4 20:55:26 2016 +0100

    Move gresource to top-level
    
    Prepare for vala --gresources which does not have the --sourcedir parameter so
    it looks for the referenced files next to the resource file
    
    Signed-off-by: Jens Georg <mail jensge org>

 org.gnome.Shotwell.gresource.xml     |   11 +++++++++++
 shotwell.am                          |   14 +++++---------
 src/org.gnome.Shotwell.gresource.xml |   11 -----------
 3 files changed, 16 insertions(+), 20 deletions(-)
---
diff --git a/org.gnome.Shotwell.gresource.xml b/org.gnome.Shotwell.gresource.xml
new file mode 100644
index 0000000..ad8c75a
--- /dev/null
+++ b/org.gnome.Shotwell.gresource.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Shotwell">
+      <file alias="crop-pivot-reticle.png">icons/crop-pivot-reticle.png</file>
+      <file alias="search_sidebar_context.ui">ui/search_sidebar_context.ui</file>
+      <file alias="tag_sidebar_context.ui">ui/tag_sidebar_context.ui</file>
+      <file alias="sidebar_default_context.ui">ui/sidebar_default_context.ui</file>
+      <file alias="search_bar.ui">ui/search_bar.ui</file>
+      <file alias="appmenu.ui">ui/appmenu.ui</file>
+  </gresource>
+</gresources>
diff --git a/shotwell.am b/shotwell.am
index 1422009..ac73241 100644
--- a/shotwell.am
+++ b/shotwell.am
@@ -20,21 +20,17 @@ shotwell_VALAFLAGS = $(COMMON_VALAFLAGS) \
        $(UNITY_VALAFLAGS) \
        $(COMMON_VALAFLAGS_POST)
 
-dist_noinst_DATA += src/org.gnome.Shotwell.gresource.xml
+dist_noinst_DATA += org.gnome.Shotwell.gresource.xml
 
 nodist_shotwell_SOURCES = \
-       src/resource.c
-MOSTLYCLEANFILES += src/resource.c
+       resource.c
+MOSTLYCLEANFILES += resource.c
 
 shotwell_resource_deps = $(shell $(GLIB_COMPILE_RESOURCES) \
-               --sourcedir=$(abs_top_srcdir)/icons \
-               --sourcedir=$(abs_top_srcdir)/ui \
-               --generate-dependencies $(abs_top_srcdir)/src/org.gnome.Shotwell.gresource.xml)
+               --generate-dependencies $(abs_top_srcdir)/org.gnome.Shotwell.gresource.xml)
 
-src/resource.c: src/org.gnome.Shotwell.gresource.xml $(shotwell_resource_deps)
+resource.c: org.gnome.Shotwell.gresource.xml $(shotwell_resource_deps)
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
-               --sourcedir=$(abs_top_srcdir)/icons \
-               --sourcedir=$(abs_top_srcdir)/ui \
                --generate $<
 
 shotwell_SOURCES = \