Separate client and server watch

1 files changed, 19 insertions, 37 deletions

diff --git a/Makefile b/Makefile
index 72ab852..2717f9b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,50 +1,32 @@
-all: build
+# Server
+# ------
 
-clean:
+clean-server:
 	@stack clean > /dev/null
-	@rm -r elm-stuff >/dev/null 2>&1 || true
 
-install:
+install-server:
 	@stack setup
-	@elm package install --yes
-
-# Watch
-# -----
-
-watch: watch-server watch-elm watch-js
-
-watch-server:
-	@nodemon -e hs,conf --exec 'clear && make build-and-launch-server --silent' &
-
-watch-elm:
-	@nodemon -e elm --exec 'clear && make build-elm --silent' &
-
-watch-js:
-	@nodemon --watch src/client/js  --exec 'make build-js --silent'
 
-# Build and launch
-# ----------------
-
-build-and-launch-server: build-server kill-server launch-server
+build-server:
+	@stack build || :
 
 launch-server:
-	@stack exec sharedCost &
-
-kill-server:
-	@killall sharedCost || :
+	@(killall sharedCost || :) && stack exec sharedCost
 
+watch-server:
+	@nodemon -e hs,conf --exec 'clear && make build-server --silent && make launch-server'
 
-# Build
-# -----
+# Client
+# ------
 
-.PHONY: build
-build: build-server build-elm build-js
+clean-client:
+	@rm -r elm-stuff >/dev/null 2>&1 || true
 
-build-server:
-	@stack build || true
+install-client:
+	@elm package install --yes
 
-build-elm:
-	@elm make src/client/elm/Main.elm --output public/javascripts/client.js || true
+build-client:
+	@elm make src/client/Main.elm --output public/javascripts/client.js || true
 
-build-js:
-	@cp src/client/js/main.js public/javascripts/main.js || true
+watch-client:
+	@nodemon -e elm --exec 'clear && make build-client --silent'