From 95aefc464469d56997185218f59297c9268b9420 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 6 Sep 2020 23:54:06 +0100
Subject: [PATCH] fix Makefile for bundle-sources

---
 Makefile | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 37f819ad..9502d199 100644
--- a/Makefile
+++ b/Makefile
@@ -5,20 +5,37 @@
 
 SHELL=/bin/bash
 
+default: debug
+
 CARGO ?= cargo
 CARGO_TARGET_DIR ?= target
 
-ifneq (,../Cargo.nail)
+ifneq (,$(wildcard(../Cargo.nail)))
 CARGO = nailing-cargo
-CARGO_TARGET_DIR = ../Build/target
+CARGO_TARGET_DIR = ../Build/$(notdir $(PWD))/target
+BUNDLE_SOURCES_DIR = ../bundle-sources
+BUNDLE_SOURCES = ../Build/bundle-sources/target/debug/bundle-rust-sources
+
+ifneq (,$(wildcard $(BUNDLE_SOURCES_DIR)))
+$(BUNDLE_SOURCES):
+	cd ../bundle-sources && $(CARGO) build
+.PHONY: $(BUNDLE_SOURCES)
+endif
 endif
 
-default: debug
-
-debug release:: %: $(CARGO_TARGET_DIR)/%/server templates/script.js
+debug release:: %: $(CARGO_TARGET_DIR)/%/server templates/script.js extra-%
 	@echo Built $@.
+.PHONY: $(CARGO_TARGET_DIR)/debug/server
+.PHONY: $(CARGO_TARGET_DIR)/release/server
+
+extra-debug:
+extra-release: bundled-sources
 
-.PHONY: $(CARGO_TARGET_DIR)/%/server
+bundled-sources: $(CARGO_TARGET_DIR)/bundled-sources
+$(CARGO_TARGET_DIR)/bundled-sources: $(BUNDLE_SOURCES)
+	nailing-cargo --- $(abspath $(BUNDLE_SOURCES)) --output $(abspath $@)
+	@echo Bundled sources.
+.PHONY: bundle-sources $(CARGO_TARGET_DIR)/bundled-sources
 
 $(CARGO_TARGET_DIR)/debug/server:
 	$(CARGO) build
-- 
2.30.2