forked from pool/gnome-maps
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
|
From 2cd8913be7de51733509916e79d58dcf47938280 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dominique Leuenberger <dimstar@opensuse.org>
|
||
|
|
Date: Sun, 24 Aug 2014 13:38:24 +0200
|
||
|
|
Subject: [PATCH] Build: fix make rules for parallel build
|
||
|
|
|
||
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=734507
|
||
|
|
---
|
||
|
|
configure.ac | 2 ++
|
||
|
|
src/Makefile-js.am | 10 +---------
|
||
|
|
2 files changed, 3 insertions(+), 9 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..4561ffe 100644
|
||
|
|
--- a/src/Makefile-js.am
|
||
|
|
+++ b/src/Makefile-js.am
|
||
|
|
@@ -1,14 +1,6 @@
|
||
|
|
-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) \
|
||
|
|
+ --sourcedir=$(builddir) \
|
||
|
|
--generate-dependencies $(srcdir)/gnome-maps.js.gresource.xml)
|
||
|
|
|
||
|
|
gnome-maps-js.h: gnome-maps.js.gresource.xml $(js_files)
|
||
|
|
--
|
||
|
|
2.0.4
|
||
|
|
|