loleaflet/Makefile.am | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 7d03ebcf5581f38f9b78a1b6e14ab2529c874591
Author: Henry Castro <hcas...@collabora.com>
Date: Sun May 27 00:20:29 2018 -0400
loleaflet: use the recursive Makefile to avoid parallel node_modules target
Change-Id: I1bc7d8bc4b228d104196dbd2355576bcd94c913d
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index ff47889c5..e0a0d9d8b 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -110,7 +110,9 @@ LOLEAFLET_PREFIX := $(if
$(ENABLE_DEBUG),$(abs_builddir),$(abs_builddir)/build)
EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
-all-local: node_modules
+all-local:
+ @$(MAKE) node_modules
+ @$(MAKE) build-loleaflet
build-loleaflet: | $(LOLEAFLET_L10N_DST) \
$(L10N_JSON) \
@@ -195,7 +197,6 @@ $(builddir)/dist/loleaflet.html:
$(srcdir)/loleaflet.html.m4 $(LOLEAFLET_HTML_DS
node_modules: npm-shrinkwrap.json
@npm install
@touch node_modules
- @$(MAKE) build-loleaflet
$(builddir)/dist/plugins/%.js: $(srcdir)/plugins/%.js
@mkdir -p $(dir $@)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
