[baobab] Fix srcdir != builddir

[Stefano Facchini <sfacchini src gnome org>]

commit f17e43f98e0a12d389df81fa09af49087aff4a76
Author: Stefano Facchini <stefano facchini gmail com>
Date:   Tue Jul 8 22:12:26 2014 +0200

    Fix srcdir != builddir
    
    This partially reverts commit 28b322ce4d583304d8ded89029440915a8176f08.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=732919

 src/Makefile.am                               |   10 +++++-----
 src/{resources/ui => }/baobab-location-row.ui |    0
 src/{resources/ui => }/baobab-main-window.ui  |    0
 src/{resources => }/baobab.css                |    0
 src/baobab.gresource.xml                      |   13 +++++++++++++
 src/{resources/gtk => }/menus.ui              |    0
 src/resources/baobab.gresource.xml            |    9 ---------
 7 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 0b6aa8b..db0fcbb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ baobab_VALAFLAGS = \
        --pkg gtk+-3.0                          \
        --pkg gio-2.0                           \
        --pkg gio-unix-2.0                      \
-       --gresources=$(srcdir)/resources/baobab.gresource.xml   \
+       --gresources=baobab.gresource.xml       \
        $(NULL)
 
 VALA_SOURCES = \
@@ -37,9 +37,9 @@ baobab_SOURCES = \
        $(BUILT_SOURCES)                \
        $(NULL)
 
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir)/resources 
$(srcdir)/resources/baobab.gresource.xml)
-baobab-resources.c: $(srcdir)/resources/baobab.gresource.xml $(resource_files)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/resources --generate-source $<
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) 
$(srcdir)/baobab.gresource.xml)
+baobab-resources.c: baobab.gresource.xml $(resource_files)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
 
 AM_CFLAGS = \
        $(BAOBAB_CFLAGS)                \
@@ -61,7 +61,7 @@ MAINTAINERCLEANFILES =        \
        $(NULL)
 
 EXTRA_DIST = \
-       resources/baobab.gresource.xml  \
+       baobab.gresource.xml    \
        $(resource_files)               \
        $(NULL)
 
diff --git a/src/resources/ui/baobab-location-row.ui b/src/baobab-location-row.ui
similarity index 100%
rename from src/resources/ui/baobab-location-row.ui
rename to src/baobab-location-row.ui
diff --git a/src/resources/ui/baobab-main-window.ui b/src/baobab-main-window.ui
similarity index 100%
rename from src/resources/ui/baobab-main-window.ui
rename to src/baobab-main-window.ui
diff --git a/src/resources/baobab.css b/src/baobab.css
similarity index 100%
rename from src/resources/baobab.css
rename to src/baobab.css
diff --git a/src/baobab.gresource.xml b/src/baobab.gresource.xml
new file mode 100644
index 0000000..b854dd9
--- /dev/null
+++ b/src/baobab.gresource.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/baobab/ui">
+    <file compressed="true">baobab-location-row.ui</file>
+    <file compressed="true">baobab-main-window.ui</file>
+  </gresource>
+  <gresource prefix="/org/gnome/baobab/gtk">
+    <file compressed="true">menus.ui</file>
+  </gresource>
+  <gresource prefix="/org/gnome/baobab">
+    <file compressed="true">baobab.css</file>
+  </gresource>
+</gresources>
diff --git a/src/resources/gtk/menus.ui b/src/menus.ui
similarity index 100%
rename from src/resources/gtk/menus.ui
rename to src/menus.ui