From e62813420e0da2d9a566cd66d30b860bbb8594f6 Mon Sep 17 00:00:00 2001
From: Ozbolt Menegatti <ozbolt.menegatti@gmail.com>
Date: Mon, 11 Nov 2019 22:59:53 +0100
Subject: [PATCH] WIP: By using new transcrypt, we have better simpler make all

Also bundling without separate js file
---
 build/Makefile | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/build/Makefile b/build/Makefile
index 8d199a2..548b4cc 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -4,6 +4,9 @@ RES_FOLDER=$(CURDIR)/../res
 TS_BUILD=tsbuild
 TS_FLAGS=-da -n -m -od ../build/$(TS_BUILD) # has to be relative for some reason
 
+BR_FLAGS=-p esmify --debug
+LESS_FLAGS=--include-path=../node_modules/picnic
+
 LESS_FILE=$(RES_FOLDER)/main.less
 PY_FILE=$(SRC_FOLDER)/main.py
 HTML_FILE=$(RES_FOLDER)/main.html
@@ -14,28 +17,26 @@ HTML_FILE=$(RES_FOLDER)/main.html
 # mypy: 
 # 	mypy src/main.py
 
-all: main.css bundle.js main.html
+all: main.css bundle.js index.html
 
-transcrypt: $(PY_FILE) $(TS_BUILD) 
-	# ln -s $(TS_BUILD) $(SRC_FOLDER)/__target__	
+transcrypt: $(PY_FILE) $(TS_BUILD)
 	transcrypt $(TS_FLAGS) $<
-	# rm $(SRC_FOLDER)/__target__
 
 bundle.js: transcrypt
-	node browserify.js $(TS_BUILD)/main.js > bundle.js
+	cd ..; browserify $(BR_FLAGS) build/$(TS_BUILD)/main.js -o build/bundle.js
 
 main.css: $(LESS_FILE)
-	lessc $< > $@
+	lessc $(LESS_FLAGS) $< > $@
 
 $(TS_BUILD):
 	mkdir -p $(TS_BUILD)
 
-main.html: $(HTML_FILE)
-	cp $(RES_FOLDER)/main.html ./
+index.html: $(HTML_FILE)
+	cp $(RES_FOLDER)/main.html $@
 
 clean:
-	rm -r $(TS_BUILD)
-	rm bundle.js main.html main.css
+	rm -fr $(TS_BUILD)
+	rm -f bundle.js index.html main.css