[gnome-shell] build: Also look for resources in $(builddir)
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] build: Also look for resources in $(builddir)
- Date: Wed, 30 Oct 2013 18:02:37 +0000 (UTC)
commit 106d827a21a342cc41cd65b7cea71901ce99e5fb
Author: Colin Walters <walters verbum org>
Date: Wed Oct 30 14:00:58 2013 -0400
build: Also look for resources in $(builddir)
Since misc/config.js is built, we need to tell the resource compiler
to find it too.
Fixes the build in Continuous where srcdir != builddir.
js/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/js/Makefile.am b/js/Makefile.am
index fce6c58..86b6222 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -14,9 +14,9 @@ misc/config.js: misc/config.js.in Makefile
js_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies
$(srcdir)/js-resources.gresource.xml)
js-resources.h: js-resources.gresource.xml $(js_resource_files) misc/config.js
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name
shell_js_resources $<
+ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir)
--generate --c-name shell_js_resources $<
js-resources.c: js-resources.gresource.xml $(js_resource_files) misc/config.js
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name
shell_js_resources $<
+ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir)
--generate --c-name shell_js_resources $<
js_built_sources = js-resources.c js-resources.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]