Makefile.am           |    2 -
 configure.ac          |    1 
 loleaflet/Makefile    |   91 -----------------------------------------------
 loleaflet/Makefile.am |   95 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 97 insertions(+), 92 deletions(-)

New commits:
commit b3db321e85b85d5992dc412662cf0aa782a4808b
Author: Pranav Kant <pran...@collabora.co.uk>
Date:   Mon Dec 12 17:53:32 2016 +0530

    Unify loleaflet's make with top level make
    
    Top level make would now build loleaflet too if necessary.
    
    Respect value of ENABLE_DEBUG and if present add debug-info to
    generated js bundles too.
    
    Add new rule, clean-local in loleaflet.
    
    Change-Id: I3a9b727824f2877fc72719a8bfdeebed5448cb7d

diff --git a/Makefile.am b/Makefile.am
index b04da13..b1f1932 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . test
+SUBDIRS = . test loleaflet
 
 export ENABLE_DEBUG
 
diff --git a/configure.ac b/configure.ac
index a9be21d..6e1004b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,6 +300,7 @@ AC_SUBST(LOOLWSD_DATADIR)
 
 AC_CONFIG_FILES([Makefile
                  test/Makefile
+                 loleaflet/Makefile
                  loolwsd.spec
                  loolwsd.xml
                  maketarballfordeb.sh])
diff --git a/loleaflet/Makefile b/loleaflet/Makefile.am
similarity index 91%
rename from loleaflet/Makefile
rename to loleaflet/Makefile.am
index b9a3303..227a0c8 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile.am
@@ -8,14 +8,13 @@ VERSION=2.0.0+
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
 
-DEBUG=false
 MINIFY=false
 
 .PHONY: build
 build: node_modules
        rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p 
dist/plugins/draw-$(DRAW_VERSION)
        cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist 
../../dist/plugins/draw-$(DRAW_VERSION)
-       jake build debug=$(DEBUG) minify=$(MINIFY)
+       jake build debug=$(ENABLE_DEBUG) minify=$(MINIFY)
 
 node_modules: npm-shrinkwrap.json
        npm install
@@ -30,11 +29,11 @@ build-l10n:
        util/po2json.py --quiet po/styles/*.po
        mv po/styles/*.json dist/l10n/styles/
 
-all: build build-l10n
+all-local: build
 
 .PHONY: dist
 dist: MINIFY=true
-dist: all
+dist: all build-l10n
        rm -rf loleaflet-$(VERSION)
        mkdir loleaflet-$(VERSION)
        cp -ar dist loleaflet-$(VERSION)
@@ -70,6 +69,11 @@ l10n: pot
        for i in po/ui-*.po; do pot2po --input=po/templates/loleaflet-ui.pot 
--template=$$i --output=$$i.new; mv $$i.new $$i;done
        for i in po/help-*.po; do pot2po 
--input=po/templates/loleaflet-help.pot --template=$$i --output=$$i.new; mv 
$$i.new $$i;done
 
+clean-local:
+       rm -rf node_modules
+       cd dist && rm -f bundle.js bundle.js.map admin-bundle.js 
admin-bundle.js.map
+       cd plugins/draw-$(DRAW_VERSION) && rm -f dist/*.js
+
 spec/data/load-test:
        if [ ! -d spec/data/load_test ]; then \
                mkdir -p spec/data/load_test; \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to