From 4dd1d5e09ba27ccd5228d80d9a2797ceea383bbb Mon Sep 17 00:00:00 2001
From: Fred Sauer <fredsa@google.com>
Date: Sun, 22 Feb 2026 12:42:05 -0800
Subject: [PATCH] cleanup `make tsweb` subprocesses on ctrl-c

---
 Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index dcbc9913..db5c06ee 100644
--- a/Makefile
+++ b/Makefile
@@ -55,14 +55,16 @@ distro: buildtsc
 	rm -r $(TMP)/doc $(TMP)/scripts $(TMP)/test* $(TMP)/tools $(TMP)/.[a-z]* $(TMP)/ts*.json # $(TMP)/meta
 	rm -f $(TMP)/javatari && mkdir -p $(TMP)/javatari && cp -p javatari.js/release/javatari/* $(TMP)/javatari/
 
-tsweb: submodules buildgrammars
+tsweb: submodules node_modules
 	npm run esbuild-clean
 	(ip addr || ifconfig) | grep inet
-	$(TSC) -w --preserveWatchOutput &
-	make watchgrammars &
-	sleep 9999999 | npm run esbuild-worker -- --watch &
-	sleep 9999999 | npm run esbuild-ui -- --watch &
-	python3 scripts/serveit.py 2>> /dev/null #http.out
+	trap 'kill 0' EXIT; \
+	$(TSC) -w --preserveWatchOutput & \
+	make watchgrammars & \
+	npm run esbuild-worker -- --watch & \
+	npm run esbuild-ui -- --watch & \
+	python3 scripts/serveit.py 2>> /dev/null & \
+	wait
 
 astrolibre.b64.txt: astrolibre.rom
 	lzg -9 $< | base64 -w 0 > $@