From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 12 Sep 2020 11:55:41 +0000 (+0100)
Subject: Makefile; wip arrangements re usvg
X-Git-Tag: otter-0.2.0~952
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9dc9baa04f7204d3076d42dde6297e94385b2fec;p=otter.git

Makefile; wip arrangements re usvg

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

diff --git a/Makefile b/Makefile
index 0d35d909..fd74ab40 100644
--- a/Makefile
+++ b/Makefile
@@ -12,13 +12,21 @@ default: debug
 
 CARGO ?= cargo
 CARGO_TARGET_DIR ?= target
+USVG ?= USVG
 
 ifneq (,$(wildcard(../Cargo.nail)))
-CARGO = nailing-cargo
+NAILING_CARGO = nailing-cargo
+CARGO = $(NAILING_CARGO)
 CARGO_TARGET_DIR = ../Build/$(notdir $(PWD))/target
+
 BUNDLE_SOURCES_DIR = ../bundle-sources
 BUNDLE_SOURCES = ../Build/bundle-sources/target/debug/bundle-rust-sources
 
+USVG_BINARY = ../resvg/target/release/usvg
+USVG = $(NAILING_CARGO) -- $(USVG)
+# To build usvg
+# zealot:resvg$ nailing-cargo build -p usvg --release
+
 ifneq (,$(wildcard $(BUNDLE_SOURCES_DIR)))
 $(BUNDLE_SOURCES):
 	cd ../bundle-sources && $(CARGO) build