summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGökay Şatır <gokay.satir@collabora.com>2021-02-09 13:33:40 +0300
committerGökay Şatır <gokay.satir@collabora.com>2021-02-09 18:48:37 +0300
commita4a97b8b106cf94eaf1a7c2b04543a5a7a94cd65 (patch)
tree577137a05fa340bf7f685b53f7d05fc113950fad
parentcypress: typo fix (diff)
downloadonline-private/gokay/canvasscroll2.tar.gz
online-private/gokay/canvasscroll2.zip
loleaflet: Update makefile for typescript files. private/gokay/canvasscroll2
It now detects and compiles ts files in specified directories. Signed-off-by: Gökay Şatır <gokay.satir@collabora.com> Change-Id: Ia8a399650480001193be7177b05b5cbb195a98c7
-rw-r--r--loleaflet/Makefile.am12
1 files changed, 8 insertions, 4 deletions
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 24cde6b8d3..676136552d 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -27,13 +27,17 @@ $(L10N_IOS_ALL_JS) : $(wildcard $(srcdir)/po/ui-*.po) $(shell find $(srcdir)/l10
done
endif
-SRC_TS = $(wildcard $(srcdir)/src/layer/tile/*.ts) $(srcdir)/src/layer/vector/CanvasOverlay.ts
-SRC_TS_JS = $(patsubst $(srcdir)/src/layer/tile/%.ts,$(srcdir)/src/layer/tile/%.js,$(SRC_TS)) $(srcdir)/src/layer/vector/CanvasOverlay.js
-SRC_TS_JS_DST = $(patsubst $(srcdir)/src/layer/tile/%.js,$(DIST_FOLDER)/src/layer/tile/%.js,$(SRC_TS_JS)) $(DIST_FOLDER)/src/layer/vector/CanvasOverlay.js
+DIRECTORY_TS = $(srcdir)/src/layer/tile $(srcdir)/src/control # Add ts directories here.
+SRC_TS_ALL := $(foreach dir, $(DIRECTORY_TS), $(wildcard $(dir)/*.ts))
+SRC_TS_JS_FILES := $(SRC_TS_ALL:.ts=.js)
-$(srcdir)/src/layer/tile/%.js: $(srcdir)/src/layer/tile/%.ts
+$(SRC_TS_ALL:.ts=.js): $(SRC_TS_ALL)
$(builddir)/node_modules/typescript/bin/tsc $< --outfile $@ --module none --lib dom,es2016 --target ES5
+SRC_TS = $(srcdir)/src/layer/vector/CanvasOverlay.ts
+SRC_TS_JS = $(srcdir)/src/layer/vector/CanvasOverlay.js
+SRC_TS_JS_DST = $(patsubst $(srcdir)/%.js,$(DIST_FOLDER)/%.js,$(SRC_TS_JS_FILES)) $(DIST_FOLDER)/src/layer/vector/CanvasOverlay.js
+
$(srcdir)/src/layer/vector/CanvasOverlay.js: $(srcdir)/src/layer/vector/*.ts
$(builddir)/node_modules/typescript/bin/tsc $(srcdir)/src/layer/vector/CanvasOverlay.ts --outfile $(srcdir)/src/layer/vector/CanvasOverlay.js --module none --lib dom,es2016 --target ES5