[gnome-shell] js/Makefile.am: Fix dependency generation with srcdir != builddir
- From: Owen Taylor <otaylor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] js/Makefile.am: Fix dependency generation with srcdir != builddir
- Date: Sun, 29 Jun 2014 22:30:36 +0000 (UTC)
commit b95c0682b0b39ddc6ac9c889ded9df3ff7cdbfca
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Thu Jun 5 15:00:01 2014 -0400
js/Makefile.am: Fix dependency generation with srcdir != builddir
If reusing an existing separate builddir, the generation of dependencies
for the JS resource file would fail because it couldn't find misc/config.js,
resulting in the resource file not being regenerated.
https://bugzilla.gnome.org/show_bug.cgi?id=732348
js/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/js/Makefile.am b/js/Makefile.am
index 09ceab1..6d9b85b 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -13,7 +13,7 @@ misc/config.js: misc/config.js.in Makefile
-e "s|[ ]sysconfdir@|$(sysconfdir)|g" \
$< > $@
-js_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies
$(srcdir)/js-resources.gresource.xml)
+js_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --sourcedir=$(builddir)
--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) --sourcedir=$(builddir)
--generate --c-name shell_js_resources $<
js-resources.c: js-resources.gresource.xml $(js_resource_files) misc/config.js
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]