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

Henry Castro (via logerrit) logerrit at kemper.freedesktop.org
Thu May 28 20:46:23 UTC 2020


 loleaflet/Makefile.am |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit da49edd7d16ac47ec89009f7c55ebfe579eb480c
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Tue May 26 09:20:50 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Thu May 28 22:46:05 2020 +0200

    loleaflet: makefile: remove duplicates prerequisites
    
    Change-Id: I409225be5f69524105967d3a72466ff284afc724
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94866
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 827d97b59..50fb781b9 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -418,9 +418,11 @@ $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_SRC) \
 		--output $@
 endif
 
-$(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HTML_DST) $(LOLEAFLET_WELCOME_DST) $(DIST_FOLDER)/bundle.css $(DIST_FOLDER)/global.js \
-\
-	$(DIST_FOLDER)/bundle.css $(DIST_FOLDER)/bundle.js
+$(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 \
+	$(LOLEAFLET_HTML_DST) \
+	$(DIST_FOLDER)/bundle.css \
+	$(DIST_FOLDER)/global.js \
+	$(DIST_FOLDER)/bundle.js
 	@echo "Generating loleaflet.html..."
 	@m4 -PE -DDEBUG=$(ENABLE_DEBUG) \
 		-DIOSAPP=$(ENABLE_IOSAPP) \


More information about the Libreoffice-commits mailing list