From be3131f666b890de3039d16f3d73f7cf0dd719f3 Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus+github@metta.systems>
Date: Mon, 7 Sep 2020 22:18:44 +0300
Subject: [PATCH] Improve cargo makefile

---
 Makefile.toml | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/Makefile.toml b/Makefile.toml
index f7efd8a..62eff66 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -8,7 +8,7 @@ min_version = "0.24.0"
 default_to_workspace = true
 
 [env]
-CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = "false"
+CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 
 DEFAULT_TARGET = "aarch64-vesper-metta"
 
@@ -44,33 +44,9 @@ KERNEL_BIN = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/kernel8.img"
 [tasks.default]
 alias = "all"
 
-[tasks.modules]
-command = "cargo"
-args = ["modules", "tree"]
-
 [tasks.all]
 dependencies = ["kernel-binary"]
 
-[tasks.kernel-binary] # Forward build to vesper/Makefile.toml
-env = { "CARGO_MAKE_MEMBER_TASK" = "kernel-binary" }
-run_task = "do-on-members"
-
-[tasks.build] # Forward build to vesper/Makefile.toml
-env = { "CARGO_MAKE_MEMBER_TASK" = "build" }
-run_task = "do-on-members"
-
-[tasks.qemu]
-env = { "CARGO_MAKE_MEMBER_TASK" = "qemu" }
-run_task = "do-on-members"
-
-[tasks.sdcard]
-env = { "CARGO_MAKE_MEMBER_TASK" = "sdcard" }
-run_task = "do-on-members"
-
-[tasks.sdeject]
-env = { "CARGO_MAKE_MEMBER_TASK" = "sdeject" }
-run_task = "do-on-members"
-
-[tasks.clippy]
-env = { "CARGO_MAKE_MEMBER_TASK" = "clippy" }
-run_task = "do-on-members"
+[tasks.modules]
+command = "cargo"
+args = ["modules", "tree"]