From 3b00954d94ebe5e8fad5ed86f1675b8668b65336 Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Tue, 7 Jul 2015 22:33:57 -0400
Subject: [PATCH] Added header comments, tweaks

---
 Makefile           |  6 +++++-
 Makefile-bootstrap | 20 +++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 50d9b30c..fba6c099 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,7 @@
+# Cyclone Scheme
+# Copyright (c) 2014, Justin Ethier
+# All rights reserved.
+
 TESTSCM = unit-tests
 TESTFILES = $(addprefix tests/, $(addsuffix .scm, $(TESTSCM)))
 
@@ -116,8 +120,8 @@ bootstrap:
 	cp scheme/eval.c tmp/scheme
 	cp scheme/file.c tmp/scheme
 	cp scheme/cyclone/common.c tmp/scheme/cyclone
-#	cp icyc.c tmp
 	cp icyc.scm tmp
+	cp tests/unit-tests.scm tmp
 	cp scheme/cyclone/libraries.c tmp/scheme/cyclone
 	cp scheme/cyclone/transforms.c tmp/scheme/cyclone
 	cp scheme/cyclone/cgen.c tmp/scheme/cyclone
diff --git a/Makefile-bootstrap b/Makefile-bootstrap
index 5a545093..c5be7f20 100644
--- a/Makefile-bootstrap
+++ b/Makefile-bootstrap
@@ -1,9 +1,8 @@
-# TODO
-#gcc test2.c -I/home/justin/Documents/cyclone/ -g -c -o test2.o
-#gcc test2.o  /home/justin/Documents/cyclone/scheme/base.o  /home/justin/Documents/cyclone/scheme/write.o  /home/justin/Documents/cyclone/scheme/file.o  -L/home/justin/Documents/cyclone/ -lcyclone -lm -I/home/justin/Documents/cyclone/ -g -o test2
-#"gcc cyclone-self.o  /home/justin/Documents/cyclone/scheme/base.o  /home/justin/Documents/cyclone/scheme/char.o  /home/justin/Documents/cyclone/scheme/file.o  /home/justin/Documents/cyclone/scheme/read.o  /home/justin/Documents/cyclone/scheme/cyclone/util.o  /home/justin/Documents/cyclone/scheme/write.o  /home/justin/Documents/cyclone/scheme/cyclone/common.o  /home/justin/Documents/cyclone/scheme/cyclone/libraries.o  /home/justin/Documents/cyclone/scheme/eval.o  /home/justin/Documents/cyclone/scheme/cyclone/transforms.o  /home/justin/Documents/cyclone/scheme/cyclone/cgen.o  -L/home/justin/Documents/cyclone/ -lcyclone -lm -I/home/justin/Documents/cyclone/ -g -o cyclone-self"
-
-# TODO: let's pretty this up, then port some of that back to the main makefile:
+# Cyclone Scheme
+# Copyright (c) 2014, Justin Ethier
+# All rights reserved.
+#
+# Makefile for bootstrapping cyclone from generated C files.
 
 CC = gcc
 CFLAGS = -g -I.
@@ -14,9 +13,9 @@ CFILES = $(addsuffix .c, $(COBJ))
 COBJECTS=$(CFILES:.c=.o)
 
 %.o: %.c %.h
-  $(CC) $(CFLAGS) $< -c -o $@
+	$(CC) $(CFLAGS) $< -c -o $@
 
-all: cyclone icyc
+all: cyclone icyc unit-tests
 
 libcyclone.a: runtime.c runtime.h
 	$(CC) -g -c runtime.c -o runtime.o
@@ -29,9 +28,8 @@ cyclone: $(COBJECTS) libcyclone.a
 icyc: cyclone
 	./cyclone icyc.scm
 
-#test: $(TOBJECTS) config.h
-#  $(CC) $(CFLAGS) $(TOBJECTS) $(LIBS) -o stack-tests
-#  ./stack-tests
+unit-tests: unit-tests.scm
+	./cyclone unit-tests.scm && ./unit-tests
 
 #.PHONY: clean
 #clean: