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

[Libreoffice Gerrit user]

 loleaflet/Makefile.am |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f8c1c1a74ab47504f3c00726cf10f23fd7e01578
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Tue Aug 14 10:38:17 2018 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Tue Aug 14 10:43:32 2018 -0400

    loleaflet: run eslint when toolbar.js is modified
    
    Change-Id: I84272849e20fefea775118960b876e62112c3701

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 3b15d68ca..c5baba4b9 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -99,6 +99,9 @@ PLUGINS_JS =\
 	toolbar.js \
 	main.js
 
+PLUGINS_JS_SRC = $(shell find $(srcdir)/js -name '*.js')
+PLUGINS_JS_DST = $(patsubst $(srcdir)/js/%.js,$(builddir)/dist/%.js,$(PLUGINS_JS_SRC))
+
 LOLEAFLET_JS_SRC = $(shell find $(srcdir)/src -name '*.js')
 LOLEAFLET_JS_DST = $(patsubst $(srcdir)/src/%.js,$(builddir)/dist/src/%.js,$(LOLEAFLET_JS_SRC))
 
@@ -135,7 +138,7 @@ $(LOLEAFLET_PREFIX)/dist/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
 	@awk 'FNR == 1 {print ""} 1' $(patsubst %.js,$(srcdir)/%.js,$(call LOLEAFLET_JS,$(srcdir)/admin/build/build.js)) > $@
 
 if ENABLE_DEBUG
-$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST) $(LOLEAFLET_DRAW_JS_DST)
+$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST) $(LOLEAFLET_DRAW_JS_DST) $(PLUGINS_JS_DST)
 	@echo "Checking for loleaflet JS errors..."
 	@NODE_PATH=$(abs_builddir)/node_modules $(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src $(srcdir)/plugins/draw-$(DRAW_VERSION)/src  $(srcdir)/js --ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
 	@touch $@