Merge branch 'master' of projekte.fagott.pw:grilist

1 files changed, 17 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 452e1d5..754b1e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 include config.mk
 
+BINARY_PATH = ./bin
+TARGET = $(BINARY_PATH)/$(NAME)
 IMPORTER_FILES = $(shell find tools/importer/ -type f -name '*.go')
 
 CSS_FILES = $(patsubst assets_src/%, assets/%, $(shell find assets_src/css/ -type f -name '*.css'))
@@ -12,7 +14,7 @@ LESSC := ./node_modules/less/bin/lessc
 
 -include $(DEPFILES)
 
-all: $(CSS_FILES) $(LESS_FILES) $(JS_FILES) eventlogging/events.go
+all: assets $(TARGET) $(IMPORTER)
 
 print_info:
         @echo $(CSS_FILES)
@@ -20,6 +22,11 @@ print_info:
         @echo $(JS_FILES)
         @echo $(DEPFILES)
 
+$(NAME): $(TARGET)
+
+$(TARGET): eventlogging/events.go
+        go build -o $@
+
 .npm_update: package.json
         touch $@
         npm install
@@ -27,7 +34,9 @@ print_info:
 package.json: package.json.tpl config.mk
         export NAME=$(NAME) &&\
         export VERSION=$(VERSION) &&\
-        ./bin/template.awk < $< | sh > $@
+        $(BINARY_PATH)/template.awk < $< | sh > $@
+
+assets: $(CSS_FILES) $(LESS_FILES) $(JS_FILES)
 
 assets/css/%.css: assets_src/css/%.css
         @mkdir -p $(@D)
@@ -39,16 +48,17 @@ assets/css/%.css: assets_src/css/%.less .npm_update
         @$(LESSC) $< > $@
 
 assets_src/js/%.d: assets_src/js/%.js
-        @./bin/generate-dependencies $(patsubst assets_src/%, assets/%, $<) $< $@
+        @$(BINARY_PATH)/generate-dependencies $(patsubst assets_src/%, assets/%, $<) $< $@
 
 assets/js/%.js: assets_src/js/%.js assets_src/js/%.d .babelrc .npm_update
         @echo browserify $< -o $@
         @$(BROWSERIFY) --debug $< -o $@ -t babelify
 
 eventlogging/events.go: eventlogging/events.txt
-        @./bin/generate-events < $< > $@
+        ./bin/generate-events < $< > $@
 
 clean:
+        -rm -- $(BINARY_PATH)/$(NAME)
         -rm -- $(CSS_FILES)
         -rm -- $(LESS_FILES)
         -rm -- $(JS_FILES)
@@ -63,11 +73,11 @@ superclean: clean
 ultraclean: superclean
         -rm -r -- node_modules
 
-run: all
-        go run *.go
+run: assets $(TARGET)
+        $(TARGET)
 
 importer: $(IMPORTER_FILES)
         go build -o importer tools/importer/*.go
 
-.PHONY: all print_info clean superclean ultraclean run
+.PHONY: all assets $(NAME) $(TARGET) print_info clean superclean ultraclean run