From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 13 Sep 2020 22:59:15 +0000 (+0100)
Subject: Sort out build a bit
X-Git-Tag: otter-0.2.0~940
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=834f83367bdb3a69ea7289c06843c586cd36e737;p=otter.git

Sort out build a bit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/.gitignore b/.gitignore
index 81a69249..fbdf62d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 templates/script.js
 save/lock
+/library/*/*.usvg
diff --git a/Makefile b/Makefile
index 6919812d..f7b050fc 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 
 SHELL=/bin/bash
 
-default: debug libraries
+default: debug
 
 CARGO ?= cargo
 CARGO_TARGET_DIR ?= target
@@ -38,9 +38,11 @@ include $(wildcard library/*/files.make)
 
 LIBRARY_PROCESS_SVG = ./usvg-processor $@ $^ '$(USVG)'
 
+assets: templates/script.js libraries
+
 libraries: $(LIBRARY_FILES)
 
-debug release:: %: $(CARGO_TARGET_DIR)/%/server templates/script.js extra-%
+debug release:: %: $(CARGO_TARGET_DIR)/%/server assets extra-%
 	@echo Built $@.
 .PHONY: $(CARGO_TARGET_DIR)/debug/server
 .PHONY: $(CARGO_TARGET_DIR)/release/server