[gnome-maps] Build: Fix make rules for parallel build
- From: Jonas Danielsson <jonasdn src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps] Build: Fix make rules for parallel build
- Date: Mon, 1 Sep 2014 19:46:05 +0000 (UTC)
commit 08423c2943c2bc73688a7ee1acb5c3508a0b6f7a
Author: Dominique Leuenberger <dimstar opensuse org>
Date: Sun Aug 24 13:38:24 2014 +0200
Build: Fix make rules for parallel build
https://bugzilla.gnome.org/show_bug.cgi?id=734507
configure.ac | 2 ++
src/Makefile-js.am | 19 +++----------------
2 files changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cb9d245..406b9ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,5 +54,7 @@ AC_CONFIG_FILES([
data/org.gnome.Maps.desktop.in
data/icons/Makefile
po/Makefile.in
+ src/config.js
+ src/path.js
])
AC_OUTPUT
diff --git a/src/Makefile-js.am b/src/Makefile-js.am
index 3737997..f237ef0 100644
--- a/src/Makefile-js.am
+++ b/src/Makefile-js.am
@@ -1,17 +1,4 @@
-BUILT_SOURCES += \
- path.js \
- config.js
-
-path.js: Makefile path.js.in
- $(AM_V_GEN) $(do_subst) $(srcdir)/path.js.in > $(builddir)/path.js
-config.js: Makefile config.js.in
- $(AM_V_GEN) $(do_subst) $(srcdir)/config.js.in > $(builddir)/config.js
-
-js_files = $(shell $(GLIB_COMPILE_RESOURCES) \
- --sourcedir=$(srcdir) \
- --generate-dependencies $(srcdir)/gnome-maps.js.gresource.xml)
-
-gnome-maps-js.h: gnome-maps.js.gresource.xml $(js_files)
+gnome-maps-js.h: gnome-maps.js.gresource.xml
$(AM_V_GEN) \
$(GLIB_COMPILE_RESOURCES) \
--target=$@ \
@@ -19,7 +6,7 @@ gnome-maps-js.h: gnome-maps.js.gresource.xml $(js_files)
--sourcedir=$(builddir) \
--generate \
--c-name gnome_maps_js $<
-gnome-maps-js.c: gnome-maps.js.gresource.xml $(js_files)
+gnome-maps-js.c: gnome-maps.js.gresource.xml
$(AM_V_GEN) \
$(GLIB_COMPILE_RESOURCES) \
--target=$@ \
@@ -37,6 +24,6 @@ CLEANFILES += \
EXTRA_DIST += \
gnome-maps.js.gresource.xml \
- $(filter-out $(BUILT_SOURCES),$(subst ./,,$(js_files))) \
+ $(filter-out $(BUILT_SOURCES),$(wildcard $(srcdir)/*.js)) \
path.js.in \
config.js.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]