[Libreoffice-commits] online.git: loleaflet/Makefile.am

[Henry Castro]

 loleaflet/Makefile.am |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f838e0998e19b1b60e4efb845af5f0ac808a948e
Author: Henry Castro <hcastro at collabora.com>
Date:   Sat May 26 10:26:47 2018 -0400

    loleaflet: fix make -j N
    
    Change-Id: I994ff4b352c93ff910d93f5f176c4e7ced2dc21d

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index dadc1b5a1..bb18427cd 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -111,8 +111,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 \
-	$(LOLEAFLET_L10N_DST) \
+all-local: node_modules
+
+build-loleaflet: | $(LOLEAFLET_L10N_DST) \
 	$(L10N_JSON) \
 	$(LOLEAFLET_IMAGES_DST) \
 	$(JQUERY_UI_DIST_IMAGES) \
@@ -189,8 +190,9 @@ $(builddir)/dist/loleaflet.html: $(srcdir)/loleaflet.html.m4 $(LOLEAFLET_HTML_DS
 		$(srcdir)/loleaflet.html.m4 > $@
 
 node_modules: npm-shrinkwrap.json
-	npm install
-	touch node_modules
+	@npm install
+	@touch node_modules
+	@$(MAKE) build-loleaflet
 
 $(builddir)/dist/plugins/%.js: $(srcdir)/plugins/%.js
 	@mkdir -p $(dir $@)