loleaflet/Makefile.am | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
New commits: commit 4a31a3beac9892d98138af8a9446025587293891 Author: Henry Castro <[email protected]> AuthorDate: Sun Feb 10 20:21:18 2019 -0400 Commit: Henry Castro <[email protected]> CommitDate: Tue Mar 5 23:37:27 2019 -0400 loleaflet: fix debug makefile rules Change-Id: I90f7e1789e631d1a3194316e1c01012326f671ab diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 4bb13c046..81d8c4614 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -249,12 +249,6 @@ NODE_MODULES_JS_DST = $(patsubst %.js,$(builddir)/dist/%.js,$(NODE_MODULES_JS)) LOLEAFLET_JS = $(strip $(shell NODE_PATH=$(abs_builddir)/node_modules $(NODE) -e "try {console.log(require('$(1)').getFiles().join(' '))} catch(e) {}")) LOPLUGIN_JS = $(strip $(shell NODE_PATH=$(abs_builddir)/node_modules $(NODE) -e "try {console.log(require('$(1)').deps.join(' '))} catch(e) {}")) -PLUGINS_JS =\ - jquery.mCustomScrollbar.js \ - w2ui-1.5.rc1.js \ - toolbar.js \ - main.js - LOLEAFLET_JS_SRC = $(shell find $(srcdir)/src -name '*.js') LOLEAFLET_JS_DST = $(patsubst $(srcdir)/src/%.js,$(builddir)/dist/src/%.js,$(LOLEAFLET_JS_SRC)) @@ -380,9 +374,12 @@ $(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT -DBUNDLE_CSS="$(abs_builddir)/dist/bundle.css" \ -DGLOBAL_JS="$(abs_builddir)/dist/global.js" \ -DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(NODE_MODULES_JS) \ + jquery.mCustomScrollbar.js \ + w2ui-1.5.rc1.js \ $(call LOLEAFLET_JS,$(srcdir)/build/build.js) \ $(patsubst %.js,plugins/path-transform/%.js,$(call LOPLUGIN_JS,$(srcdir)/plugins/path-transform/build/deps.js)) \ - $(PLUGINS_JS))" \ + toolbar.js \ + main.js)" \ $(srcdir)/html/loleaflet.html.m4 > $@ node_modules: npm-shrinkwrap.json _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
