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

[Libreoffice Gerrit user]

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

New commits:
commit 74f19fce6f91a1651efce415fb4b495a89faff23
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Mar 21 17:17:56 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Mar 21 17:20:27 2019 +0200

    We insert global.js in loleaflet.html and shouldn't include it in bundle.js
    
    Also, make loleaflet.html depend also on the two files that are inserted into
    it with the m4 syscmd thing, bundle.css and global.js.
    
    Change-Id: Iba261aeff70786eec114e5508b748dadd8663038

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 5f51a91a4..6a9b0cb37 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -175,7 +175,6 @@ $(builddir)/dist/bundle.css: $(LOLEAFLET_CSS_DST)
 
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_DST) \
 	$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
-	$(builddir)/dist/global.js \
 	$(builddir)/dist/jquery.mCustomScrollbar.js \
 	$(builddir)/dist/w2ui-1.5.rc1.js
 	@touch $@
@@ -201,12 +200,10 @@ $(builddir)/dist/global.js: $(srcdir)/js/global.js
 
 $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
 	$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
-	$(builddir)/dist/global.js \
 	$(srcdir)/js/jquery.mCustomScrollbar.js \
 	$(srcdir)/js/w2ui-1.5.rc1.js
 	@echo "Uglify loleaflet js files..."
 	NODE_PATH=$(abs_builddir)/node_modules $(NODE) node_modules/uglify-js/bin/uglifyjs \
-		$(srcdir)/js/global.js \
 		$(L10N_IOS_ALL_JS) \
 		$(NODE_MODULES_JS) \
 		$(srcdir)/js/jquery.mCustomScrollbar.js \
@@ -215,7 +212,8 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
 		--output $@
 endif
 
-$(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HTML_DST) \
+$(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HTML_DST) $(builddir)/dist/bundle.css $(builddir)/dist/global.js \
+\
 	$(builddir)/dist/bundle.css $(builddir)/dist/bundle.js
 	@echo "Generating loleaflet.html..."
 	@m4 -E -DDEBUG=$(ENABLE_DEBUG) \