From 277feca9af47d81a101975cdc80d3a2a3ce16d59 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 15 Apr 2016 00:05:29 -0700
Subject: Use stamp files to avoid rebuilding parent directory local.ninja
 unnecessarily

---
 build.ninja | 2 +-
 setup.rc    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.ninja b/build.ninja
index 8f0d5148..b2f35345 100644
--- a/build.ninja
+++ b/build.ninja
@@ -3,5 +3,5 @@ include rules.ninja
 
 subninja local.ninja
 
-build build.ninja: stamp | local.ninja
+build build.ninja: stamp | $builddir/gen.stamp
   generator = 1
diff --git a/setup.rc b/setup.rc
index 39bfc984..b3e282b0 100755
--- a/setup.rc
+++ b/setup.rc
@@ -11,7 +11,7 @@ fn usage {
 
 fn subgen {
 	subninja '$srcdir'/$1/local.ninja
-	gen_inputs=( $gen_inputs '$srcdir'/$1/local.ninja )
+	gen_inputs=( $gen_inputs '$outdir'/$1/gen.stamp )
 	tree_inputs=( $tree_inputs '$outdir'/$1/root.tree )
 	tree_perms=( $tree_perms '$outdir'/$1/root.perms )
 	if(~ $recurse 1) @ gen $1 &
@@ -39,7 +39,8 @@ fn gen {
 		ifs=() { old_pwd=`{pwd | head -c -1} }
 		. ./gen.rc
 
-		build '$srcdir'/local.ninja gen '|' setup.rc ninja.rc '$srcdir'/gen.rc $gen_inputs
+		build '$outdir'/gen.stamp stamp '|' '$srcdir'/local.ninja $gen_inputs
+		build '$srcdir'/local.ninja gen '|' setup.rc ninja.rc '$srcdir'/gen.rc
 
 		if(! ~ $#tree_perms 0) {
 			printf '%s\n' $tree_perms >$old_pwd/local.perms
-- 
cgit v1.2.3