[glib/glib-2-48] Fix paths for non-srcdir builds
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-48] Fix paths for non-srcdir builds
- Date: Wed, 17 Aug 2016 21:39:17 +0000 (UTC)
commit 8a457393499aa02dd87aabd83ea1c0d8db515d25
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sat Jun 4 13:49:46 2016 +0100
Fix paths for non-srcdir builds
This fixes a build failure in Continuous that resulted in the error:
../../../gio/tests/test.gresource.xml: Failed to locate
'test-generated.txt' in any source directory.
Makefile:4676: recipe for target 'test.gresource' failed
make[6]: *** [test.gresource] Error 1
gio/tests/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 89730bf..749267b 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -548,8 +548,8 @@ test_resources2.h test_resources2.c: test3.gresource.xml Makefile $(shell $(glib
plugin_resources.c: test4.gresource.xml Makefile $(shell $(glib_compile_resources) --sourcedir=$(srcdir)
--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) --sourcedir=$(srcdir)
--generate-dependencies $(srcdir)/test.gresource.xml)
- $(AM_V_GEN) $(glib_compile_resources) --target=$@ --sourcedir=$(srcdir) $<
+test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --sourcedir=.
--sourcedir=$(srcdir) --generate-dependencies $(srcdir)/test.gresource.xml)
+ $(AM_V_GEN) $(glib_compile_resources) --target=$@ --sourcedir=. --sourcedir=$(srcdir) $<
EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt
test4.gresource.xml
CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]