Makefile; wip arrangements re usvg

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

diff --git a/Makefile b/Makefile
index 0d35d909a9ebb414b68dbe9f2e7d9f3ea4c8b466..fd74ab40a646104e780846840d7c2648c95e1c79 100644 (file)
--- 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