From a60f475b36a35081913c8fa51dc4de6381aaee56 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 1 Feb 2012 15:48:28 +0200 Subject: [PATCH] gio/tests: Fix out-of-source build The glib-compile-resources --generate-dependencies call was failing, although not stopping the build. Failed to open file 'test2.gresource.xml': No such file or directory Failed to open file 'test3.gresource.xml': No such file or directory Failed to open file 'test4.gresource.xml': No such file or directory Failed to open file 'test.gresource.xml': No such file or directory --- gio/tests/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am index f11a992fe..e987fd113 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am @@ -589,16 +589,16 @@ else endif BUILT_SOURCES += test_resources.c test_resources2.c test_resources2.h -test_resources.c: test2.gresource.xml Makefile $(shell $(glib_compile_resources) --generate-dependencies test2.gresource.xml) +test_resources.c: test2.gresource.xml Makefile $(shell $(glib_compile_resources) --generate-dependencies $(srcdir)/test2.gresource.xml) $(AM_V_GEN) $(glib_compile_resources) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name _g_test1 $< -test_resources2.h test_resources2.c: test3.gresource.xml Makefile $(shell $(glib_compile_resources) --generate-dependencies test3.gresource.xml) +test_resources2.h test_resources2.c: test3.gresource.xml Makefile $(shell $(glib_compile_resources) --generate-dependencies $(srcdir)/test3.gresource.xml) $(AM_V_GEN) $(glib_compile_resources) --target=$@ --sourcedir=$(srcdir) --generate --c-name _g_test2 --manual-register $< -plugin_resources.c: test4.gresource.xml Makefile $(shell $(glib_compile_resources) --generate-dependencies test4.gresource.xml) +plugin_resources.c: test4.gresource.xml Makefile $(shell $(glib_compile_resources) --generate-dependencies $(srcdir)/test4.gresource.xml) $(AM_V_GEN) $(glib_compile_resources) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name _g_plugin $< -test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --generate-dependencies test.gresource.xml) +test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --generate-dependencies $(srcdir)/test.gresource.xml) $(AM_V_GEN) $(glib_compile_resources) --target=$@ --sourcedir=$(srcdir) $< noinst_LTLIBRARIES = libresourceplugin.la