13 files changed, 35 insertions, 31 deletions
diff --git a/modules/gnome.py b/modules/gnome.py
index a1c5025..f6d13a9 100644
--- a/modules/gnome.py
+++ b/modules/gnome.py
@@ -26,7 +26,7 @@ class GnomeModule:
     def compile_resources(self, state, args, kwargs):
         cmd = ['glib-compile-resources', '@INPUT@', '--generate']
         if 'source_dir' in kwargs:
-            d = os.path.join(state.build_to_src, kwargs.pop('source_dir'))
+            d = os.path.join(state.build_to_src, state.subdir, kwargs.pop('source_dir'))
             cmd += ['--sourcedir', d]
         if 'c_name' in kwargs:
             cmd += ['--c-name', kwargs.pop('c_name')]
diff --git a/test cases/frameworks/7 gnome/golib.c b/test cases/frameworks/7 gnome/gir/golib.c
index 8d70649..8d70649 100644
--- a/test cases/frameworks/7 gnome/golib.c
+++ b/test cases/frameworks/7 gnome/gir/golib.c
diff --git a/test cases/frameworks/7 gnome/golib.h b/test cases/frameworks/7 gnome/gir/golib.h
index 40bf901..40bf901 100644
--- a/test cases/frameworks/7 gnome/golib.h
+++ b/test cases/frameworks/7 gnome/gir/golib.h
diff --git a/test cases/frameworks/7 gnome/gir/meson.build b/test cases/frameworks/7 gnome/gir/meson.build
new file mode 100644
index 0000000..115631e
--- /dev/null
+++ b/test cases/frameworks/7 gnome/gir/meson.build
@@ -0,0 +1,15 @@
+
+libsources = ['golib.c', 'golib.h']
+
+girexe = executable('girprog', libsources, 'prog.c',
+dependencies : [glib, gobj, gir, gmod])
+
+gnome.generate_gir(girexe,
+sources : libsources,
+nsversion : '1.0',
+namespace : 'Meson',
+install : true,
+install_dir : 'typelibdir',
+)
+
+test('gobject introspection', girexe)
diff --git a/test cases/frameworks/7 gnome/prog.c b/test cases/frameworks/7 gnome/gir/prog.c
index 71584d6..71584d6 100644
--- a/test cases/frameworks/7 gnome/prog.c
+++ b/test cases/frameworks/7 gnome/gir/prog.c
diff --git a/test cases/frameworks/7 gnome/meson.build b/test cases/frameworks/7 gnome/meson.build
index 957e8ab..4a45e62 100644
--- a/test cases/frameworks/7 gnome/meson.build
+++ b/test cases/frameworks/7 gnome/meson.build
@@ -7,33 +7,7 @@ gobj = dependency('gobject-2.0')
 gir = dependency('gobject-introspection-1.0')
 gmod = dependency('gmodule-2.0')
 
-myres = gnome.compile_resources('myresources', 'myresource.gresource.xml',
-source_dir : 'data',
-c_name : 'myres')
+subdir('resources')
+subdir('gir')
+subdir('schemas')
 
-resexe = executable('resprog', 'main.c', myres,
-dependencies : gio)
-test('resource test', resexe)
-
-libsources = ['golib.c', 'golib.h']
-
-girexe = executable('girprog', libsources, 'prog.c',
-dependencies : [glib, gobj, gir, gmod])
-
-gnome.generate_gir(girexe,
-sources : libsources,
-nsversion : '1.0',
-namespace : 'Meson',
-install : true,
-install_dir : 'typelibdir',
-)
-
-test('gobject introspection', girexe)
-
-gnome.compile_schemas()
-install_data('com.github.meson.gschema.xml',
-install_dir : 'share/glib-2.0/schemas')
-
-schemaexe = executable('schemaprog', 'schemaprog.c',
-dependencies : gio)
-test('schema test', schemaexe)
diff --git a/test cases/frameworks/7 gnome/data/res1.txt b/test cases/frameworks/7 gnome/resources/data/res1.txt
index e10afea..e10afea 100644
--- a/test cases/frameworks/7 gnome/data/res1.txt
+++ b/test cases/frameworks/7 gnome/resources/data/res1.txt
diff --git a/test cases/frameworks/7 gnome/main.c b/test cases/frameworks/7 gnome/resources/main.c
index 471f07e..471f07e 100644
--- a/test cases/frameworks/7 gnome/main.c
+++ b/test cases/frameworks/7 gnome/resources/main.c
diff --git a/test cases/frameworks/7 gnome/resources/meson.build b/test cases/frameworks/7 gnome/resources/meson.build
new file mode 100644
index 0000000..937dc47
--- /dev/null
+++ b/test cases/frameworks/7 gnome/resources/meson.build
@@ -0,0 +1,7 @@
+myres = gnome.compile_resources('myresources', 'myresource.gresource.xml',
+source_dir : 'data',
+c_name : 'myres')
+
+resexe = executable('resprog', 'main.c', myres,
+dependencies : gio)
+test('resource test', resexe)
diff --git a/test cases/frameworks/7 gnome/myresource.gresource.xml b/test cases/frameworks/7 gnome/resources/myresource.gresource.xml
index b44c879..b44c879 100644
--- a/test cases/frameworks/7 gnome/myresource.gresource.xml
+++ b/test cases/frameworks/7 gnome/resources/myresource.gresource.xml
diff --git a/test cases/frameworks/7 gnome/com.github.meson.gschema.xml b/test cases/frameworks/7 gnome/schemas/com.github.meson.gschema.xml
index 741518d..741518d 100644
--- a/test cases/frameworks/7 gnome/com.github.meson.gschema.xml
+++ b/test cases/frameworks/7 gnome/schemas/com.github.meson.gschema.xml
diff --git a/test cases/frameworks/7 gnome/schemas/meson.build b/test cases/frameworks/7 gnome/schemas/meson.build
new file mode 100644
index 0000000..b4765b6
--- /dev/null
+++ b/test cases/frameworks/7 gnome/schemas/meson.build
@@ -0,0 +1,8 @@
+
+gnome.compile_schemas()
+install_data('com.github.meson.gschema.xml',
+install_dir : 'share/glib-2.0/schemas')
+
+schemaexe = executable('schemaprog', 'schemaprog.c',
+dependencies : gio)
+test('schema test', schemaexe)
diff --git a/test cases/frameworks/7 gnome/schemaprog.c b/test cases/frameworks/7 gnome/schemas/schemaprog.c
index 51bfbd9..17dab65 100644
--- a/test cases/frameworks/7 gnome/schemaprog.c
+++ b/test cases/frameworks/7 gnome/schemas/schemaprog.c
@@ -9,7 +9,7 @@ int main(int argc, char **argv) {
     GVariant *value;
 
     GError *error = NULL;
-    src = g_settings_schema_source_new_from_directory(".",
+    src = g_settings_schema_source_new_from_directory("schemas",
             g_settings_schema_source_get_default(), TRUE, &error);
     if(error) {
         fprintf(stderr, "Fail: %s\n", error->message);