From 3e864d2c96da060320057cfba839482ba2651aaa Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Wed, 8 Feb 2023 22:43:41 +0100
Subject: Improved the makefile

---
 GNUmakefile | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index fd41a37..3567787 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,16 +1,30 @@
+.DEFAULT_GOAL := help
 SHELL:=bash
+.SHELLFLAGS := -eu -o pipefail -c
+.ONESHELL:
+.DELETE_ON_ERROR:
+MAKEFLAGS += --warn-undefined-variables
+MAKEFLAGS += --no-builtin-rules
+
 REVISION=$(shell git rev-parse HEAD)
 
 .PHONY: build
-build: ## make build	# Builds a cartridge
-	zig build -Drelease-small=true
+build: zig-out/lib/cart.wasm ## make build		# Builds a cartridge
 
 .PHONY: buildah
 buildah: ## make buildah	# Builds the container image
 	deploy/build-image.sh
 
+.PHONY: clean
+clean: ## make clean		# Cleans build files
+	rm -rf zig-cache zig-out
+
+.PHONY: depclean
+depclean: clean ## make depclean	# Cleans build files and node dependencies
+	rm -rf node_modules
+
 .PHONY: deploy
-deploy: ## make deploy	# deploy the cartridge the active kubernetes context
+deploy: ## make deploy	# deploy the cartridge to the active kubernetes context
 	sed -i deploy/kubernetes.yaml -e 's/^\(\s*image:[^:]*:\).*$$/\1$(REVISION)/'
 	kubectl apply -f deploy/kubernetes.yaml
 
@@ -19,20 +33,24 @@ help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: init
-init: ## make init	# initialize project dependencies
+init: node_modules ## make init		# initialize project dependencies
+
+node_modules: README.md
 	npm install wasm4
 	rm package.json package-lock.json  # w4 will think it is an AssemblyScript game if we leave these files
+	                                   # because of that this make target depends on the README which lists the wasm4 version
 
 .PHONY: push
-push: ## make push	# push the built image to quay.io
+push: ## make push		# push the built image to quay.io
 	buildah push adyxax/grenade-brothers quay.io/adyxax/grenade-brothers:$(REVISION)
 
 .PHONY: run
-run: ## make run	# run a nodejs web server
+run: node_modules  build ## make run		# run a nodejs production web server
 	node_modules/.bin/w4 run --port 80 --no-open --no-qr zig-out/lib/cart.wasm
 
 .PHONY: serve
-serve: ## make serve	# run a nodejs development web server that watches the code file and recompiles upon changes
+serve: node_modules ## make serve		# run a nodejs development web server that watches the code files and recompiles upon changes
 	node_modules/.bin/w4 watch --no-open --no-qr
 
-.DEFAULT_GOAL := help
+zig-out/lib/cart.wasm:  build.zig  $(wildcard src/*.zig)
+	zig build -Drelease-small=true
-- 
cgit v1.2.3