about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-08-29 00:40:31 -0700
committerKartik K. Agaram <vc@akkartik.com>2016-08-29 00:40:31 -0700
commit4ed126000a44f1e03116973071bb1c2f7fe18458 (patch)
tree0ef4ed1dbfbc0c4679924ce53b8b2071880e0302
parentb856e7e15f36939bd5cecf090a2c0d4a26ab7850 (diff)
downloadmu-4ed126000a44f1e03116973071bb1c2f7fe18458.tar.gz
3277
Streamline the build process a bit.
-rwxr-xr-xbuild_until1
-rw-r--r--makefile10
2 files changed, 2 insertions, 9 deletions
diff --git a/build_until b/build_until
index 77c217dd..2b75d792 100755
--- a/build_until
+++ b/build_until
@@ -8,7 +8,6 @@ make --no-print-directory tangle/tangle
 make --no-print-directory enumerate/enumerate
 
 ./tangle/tangle $(./enumerate/enumerate --until $1 |grep -v '.mu$') |grep -v "^\s*//:" > mu.cc
-make --no-print-directory autogenerated_lists
 
 cat /dev/null $(./enumerate/enumerate --until $1 |grep '.mu$') > core.mu
 
diff --git a/makefile b/makefile
index af4dfe81..a4c97916 100644
--- a/makefile
+++ b/makefile
@@ -5,14 +5,13 @@ CXXFLAGS ?= -g -O3
 # reduce memory usage for small servers
 CXXFLAGS := ${CXXFLAGS} --param ggc-min-expand=1 --param ggc-min-heapsize=32768
 
-mu_bin: makefile mu.cc termbox/libtermbox.a
+mu_bin: makefile mu.cc termbox/libtermbox.a function_list test_list
 	${CXX} ${CXXFLAGS} -Wall -Wextra -ftrapv -fno-strict-aliasing mu.cc termbox/libtermbox.a -o mu_bin
 
 # To see what the program looks like after all layers have been applied, read
 # mu.cc
 mu.cc: [0-9]*.cc enumerate/enumerate tangle/tangle
 	./tangle/tangle $$(./enumerate/enumerate --until zzz |grep -v '.mu$$') > mu.cc
-	make --no-print-directory autogenerated_lists
 
 core.mu: [0-9]*.mu mu.cc
 	cat $$(./enumerate/enumerate --until zzz |grep '.mu$$') > core.mu
@@ -27,7 +26,6 @@ termbox/libtermbox.a: termbox/*.c termbox/*.h termbox/*.inl
 	cd termbox && make
 
 # auto-generated files; by convention they end in '_list'.
-autogenerated_lists: mu.cc function_list test_list
 
 # autogenerated list of function declarations, so I can define them in any order
 function_list: mu.cc
@@ -45,11 +43,7 @@ test_list: mu.cc
 	@grep -h "^\s*void test_" mu.cc |perl -pwe 's/^\s*void (.*)\(\) \{.*/$$1,/' > test_list
 	@grep -h "^\s*TEST(" mu.cc |perl -pwe 's/^\s*TEST\((.*)\)$$/test_$$1,/' >> test_list
 
-#
-.PHONY: all autogenerated_lists clean clena
-
-test: autogenerated_lists mu_bin core.mu
-	./mu_bin test
+.PHONY: all clean clena
 
 clena: clean
 clean: