1014 - reorganize build system to prepare for .mu layers

1 files changed, 7 insertions, 3 deletions

diff --git a/cpp/makefile b/cpp/makefile
index d49d8887..a42667c9 100644
--- a/cpp/makefile
+++ b/cpp/makefile
@@ -1,14 +1,17 @@
-mu: makefile tangle/tangle mu.cc
+mu: makefile enumerate/enumerate tangle/tangle mu.cc
 	g++ -g -Wall -Wextra -fno-strict-aliasing mu.cc -o mu
 
 # To see what the program looks like after all layers have been applied, read
 # mu.cc
 mu.cc: 0*
-	./tangle/tangle --until 999 |grep -v "^\s*//:" > mu.cc
+	./tangle/tangle $$(./enumerate/enumerate --until 999 |grep -v '.mu$$') |grep -v "^\s*//:" > mu.cc
 	@make autogenerated_lists >/dev/null
 
+enumerate/enumerate:
+	cd enumerate && make && ./enumerate test
+
 tangle/tangle:
-	cd tangle && make && tangle test
+	cd tangle && make && ./tangle test
 
 # auto-generated files; by convention they end in '_list'.
 .PHONY: autogenerated_lists test clena 
@@ -27,5 +30,6 @@ test_list: mu.cc
 
 clena: clean
 clean:
+	cd enumerate && make clean
 	cd tangle && make clean
 	rm -rf mu.cc mu *_list