[glib/wip/resources] Unbreak out-of-source build
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/resources] Unbreak out-of-source build
- Date: Tue, 10 Jan 2012 15:54:27 +0000 (UTC)
commit ba47f7dd6bdd10f620cc8f06f49cbfeea500e045
Author: Pavel Holejsovsky <pholejs src gnome org>
Date: Tue Jan 10 16:52:47 2012 +0100
Unbreak out-of-source build
When compiling resource tests, we need to pass --sourcedir option to
glib-compile-resources.
gio/tests/Makefile.am | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 73eb046..55d9214 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -577,16 +577,16 @@ test.mo: de.po
BUILT_SOURCES += test_resources.c test_resources2.c test_resources2.h
test_resources.c: test2.gresource.xml test1.txt
- $(top_builddir)/gio/glib-compile-resources --target=$@ --generate-source --c-name _g_test1 $(srcdir)/test2.gresource.xml
+ $(top_builddir)/gio/glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name _g_test1 $(srcdir)/test2.gresource.xml
test_resources2.c: test3.gresource.xml test1.txt
- $(top_builddir)/gio/glib-compile-resources --target=$@ --generate-source --c-name _g_test2 --manual-register $(srcdir)/test3.gresource.xml
+ $(top_builddir)/gio/glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name _g_test2 --manual-register $(srcdir)/test3.gresource.xml
test_resources2.h: test3.gresource.xml
- $(top_builddir)/gio/glib-compile-resources --target=$@ --generate-header --c-name _g_test2 --manual-register $(srcdir)/test3.gresource.xml
+ $(top_builddir)/gio/glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name _g_test2 --manual-register $(srcdir)/test3.gresource.xml
plugin_resources.c: test4.gresource.xml test1.txt
- $(top_builddir)/gio/glib-compile-resources --target=$@ --generate-source --c-name _g_plugin $(srcdir)/test4.gresource.xml
+ $(top_builddir)/gio/glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name _g_plugin $(srcdir)/test4.gresource.xml
test.gresource: test.gresource.xml test1.txt test2.txt test3.txt
$(top_builddir)/gio/glib-compile-resources --target=$@ --sourcedir=$(srcdir) $(srcdir)/test.gresource.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]