From cfea60a2dbaa145973e89484a52c7d3153674abf Mon Sep 17 00:00:00 2001
From: John Jenkins <jjenkins@wolve.com>
Date: Wed, 9 Mar 2022 09:44:59 -0600
Subject: [PATCH] Split out source dep generation for tests

Additionally, use "-include" instead of "include" to suppress first time
run errors when .depend(-test) doesn't exist
---
 runtime/.gitignore  |  1 +
 runtime/GNUmakefile | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/runtime/.gitignore b/runtime/.gitignore
index 75a300c..0b8ac83 100644
--- a/runtime/.gitignore
+++ b/runtime/.gitignore
@@ -4,6 +4,7 @@
 test
 TTTest
 .depend
+.depend-test
 
 testHelper/GeneratedCode.cc
 decompressor
diff --git a/runtime/GNUmakefile b/runtime/GNUmakefile
index a56c9bd..5f2336c 100644
--- a/runtime/GNUmakefile
+++ b/runtime/GNUmakefile
@@ -61,18 +61,22 @@ decompressor: $(GENERATED_OBJ) Cycles.o Util.o Log.o LogDecompressor.cc
 	$(CXX) $(CXX_ARGS) $(EXTRA_NANOLOG_FLAGS) $^ -o decompressor $(INCLUDES) -Igenerated -Werror
 
 clean:
-	rm -f Perf test compressedLog ./decompressor $(GENERATED_OBJ) $(TEST_BUILD_DIR)/*.o *.o *.gch *.log ./.depend
+	rm -f Perf test compressedLog ./decompressor $(GENERATED_OBJ) $(TEST_BUILD_DIR)/*.o *.o *.gch *.log ./.depend ./.depend-test
 
 clean-all: clean
 	rm -f libgtest.a testHelper/GeneratedCode.cc
 
 # Automatic rules to build *.h dependencies. Taken from
 # https://stackoverflow.com/questions/2394609/makefile-header-dependencies
-depend: .depend
+depend: .depend .depend-test
 
 .depend: $(SRCS)
 	rm -f ./.depend
 	$(CXX) $(CXX_ARGS) $(INCLUDES) -MM $^ > ./.depend;
-	sed 's|[a-zA-Z0-9_-]*\.o|$(TEST_BUILD_DIR)/&|' ./.depend >> ./.depend
 
-include .depend
+.depend-test: .depend
+	rm -f ./.depend-test
+	sed 's|[a-zA-Z0-9_-]*\.o|$(TEST_BUILD_DIR)/&|' ./.depend > ./.depend-test
+
+-include .depend
+-include .depend-test