diff options
author | Joris | 2016-10-30 20:27:16 +0100 |
---|---|---|
committer | Joris | 2016-10-30 20:27:16 +0100 |
commit | a0ee1260e7efaf6248df9445d4d7165e2fc16cae (patch) | |
tree | ea9250ca96459041a45aea619f9a8741643ff7ee /Makefile | |
parent | e899cecde7fb10b5e7ae1b6130922437297f5cb0 (diff) |
Simplify build
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -3,13 +3,9 @@ all: build clean: @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 # Watch # ----- @@ -17,13 +13,13 @@ install: watch: watch-server watch-elm watch-js watch-server: - @./node_modules/nodemon/bin/nodemon.js -e hs,conf --exec 'clear && make build-and-launch-server --silent' & + @nodemon -e hs,conf --exec 'clear && make build-and-launch-server --silent' & watch-elm: - @./node_modules/nodemon/bin/nodemon.js -e elm --exec 'clear && make build-elm --silent' & + @nodemon -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' + @nodemon --watch src/client/js --exec 'make build-js --silent' # Build and launch # ---------------- @@ -39,6 +35,7 @@ kill-server: # Build # ----- +.PHONY: build build: build-server build-elm build-js build-server: |