1 files changed, 14 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 12f5f53..754b1e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 include config.mk
 
-BINARY_PATH=./bin
+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'))
@@ -13,7 +14,7 @@ LESSC := ./node_modules/less/bin/lessc
 
 -include $(DEPFILES)
 
-all: assets app
+all: assets $(TARGET) $(IMPORTER)
 
 print_info:
         @echo $(CSS_FILES)
@@ -21,8 +22,10 @@ print_info:
         @echo $(JS_FILES)
         @echo $(DEPFILES)
 
-app:
-        go build -o $(BINARY_PATH)/$(NAME)
+$(NAME): $(TARGET)
+
+$(TARGET): eventlogging/events.go
+        go build -o $@
 
 .npm_update: package.json
         touch $@
@@ -51,6 +54,9 @@ 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 < $< > $@
+
 clean:
         -rm -- $(BINARY_PATH)/$(NAME)
         -rm -- $(CSS_FILES)
@@ -58,6 +64,7 @@ clean:
         -rm -- $(JS_FILES)
         -rm -- $(DEPFILES)
         -rm -- importer
+        -rm -- eventlogging/events.go
 
 superclean: clean
         -rm -- .npm_update
@@ -66,11 +73,11 @@ superclean: clean
 ultraclean: superclean
         -rm -r -- node_modules
 
-run: assets
-        go run *.go
+run: assets $(TARGET)
+        $(TARGET)
 
 importer: $(IMPORTER_FILES)
         go build -o importer tools/importer/*.go
 
-.PHONY: all assets app print_info clean superclean ultraclean run
+.PHONY: all assets $(NAME) $(TARGET) print_info clean superclean ultraclean run