aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile27
1 files changed, 13 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 0f393fd..e432c86 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,15 @@
-all: install build
+all: build
clean:
- @echo "Cleaning…"
@cabal clean > /dev/null
@rm -r elm-stuff >/dev/null 2>&1 || true
@rm -r node_modules >/dev/null 2>&1 || true
install:
- cabal2nix --shell . > sharedCost.nix
- nix-shell sharedCost.nix -I ~ --command 'cabal configure'
- elm package install
- npm install
+ @cabal2nix --shell . > sharedCost.nix
+ @nix-shell sharedCost.nix -I ~ --command 'cabal configure'
+ @elm package install
+ @npm install
# Watch
# -----
@@ -18,13 +17,13 @@ install:
watch: watch-server watch-elm watch-js
watch-server:
- ./node_modules/nodemon/bin/nodemon.js -e hs,conf --exec 'make build-and-launch-server --silent'
+ @./node_modules/nodemon/bin/nodemon.js -e hs,conf --exec 'clear && make build-and-launch-server --silent' &
watch-elm:
- ./node_modules/nodemon/bin/nodemon.js -e elm --exec 'make build-elm --silent'
+ @./node_modules/nodemon/bin/nodemon.js -e elm --exec 'clear && make build-elm --silent' &
watch-js:
- ./node_modules/nodemon/bin/nodemon.js --watch src/client/js --exec 'make build-js --silent'
+ @./node_modules/nodemon/bin/nodemon.js --watch src/client/js --exec 'make build-js --silent'
# Build and launch
# ----------------
@@ -32,10 +31,10 @@ watch-js:
build-and-launch-server: build-server kill-server launch-server
launch-server:
- ./dist/build/sharedCost/sharedCost &
+ @./dist/build/sharedCost/sharedCost &
kill-server:
- pkill sharedCost || true
+ @pkill sharedCost || true
# Build
# -----
@@ -43,10 +42,10 @@ kill-server:
build: build-server build-elm build-js
build-server:
- cabal build
+ @cabal build || true
build-elm:
- elm make src/client/elm/Main.elm --output public/javascripts/client.js
+ @elm make src/client/elm/Main.elm --output public/javascripts/client.js || true
build-js:
- cp src/client/js/main.js public/javascripts/main.js
+ @cp src/client/js/main.js public/javascripts/main.js || true