From a6f7f10b28569f94d8bf087fc615aa03c9f96a39 Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Tue, 30 Jun 2015 21:44:01 -0400 Subject: [PATCH] Tweaks to fix build - perhaps this was broken by "self"? --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index e9c45a1c..658e449f 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,7 @@ TESTSCM = unit-tests TESTFILES = $(addprefix tests/, $(addsuffix .scm, $(TESTSCM))) -all: cyclone scheme/base.o scheme/read.o scheme/write.o scheme/char.o scheme/eval.o scheme/file.o icyc - -#scheme/cyclone/util.o: cyclone scheme/cyclone/util.sld -.PHONY: self -self: - ./cyclone scheme/cyclone/util.sld - ./cyclone scheme/cyclone/libraries.sld - ./cyclone scheme/cyclone/transforms.sld - ./cyclone scheme/cyclone/cgen.sld - ./cyclone cyclone.scm +all: cyclone icyc scheme/base.o: cyclone scheme/base.sld ./cyclone scheme/base.sld @@ -68,6 +59,15 @@ debug2: libcyclone.so.1 cyclone: cyclone.scm transforms.so util.so cgen.so libraries.so parser.so libcyclone.a csc cyclone.scm +#scheme/cyclone/util.o: cyclone scheme/cyclone/util.sld +.PHONY: self +self: + ./cyclone scheme/cyclone/util.sld + ./cyclone scheme/cyclone/libraries.sld + ./cyclone scheme/cyclone/transforms.sld + ./cyclone scheme/cyclone/cgen.sld + ./cyclone cyclone.scm + .PHONY: test test: $(TESTFILES) cyclone $(foreach f,$(TESTSCM), echo tests/$(f) ; ./cyclone tests/$(f).scm && tests/$(f) && rm -rf tests/$(f);) @@ -94,7 +94,7 @@ test2: examples/hello-library/int-test/hello.c libcyclone.a ## END temporary directives ########################### -icyc: cyclone icyc.scm eval.scm libraries.scm parser.scm runtime.h +icyc: cyclone icyc.scm eval.scm libraries.scm parser.scm runtime.h scheme/base.o scheme/read.o scheme/write.o scheme/char.o scheme/eval.o scheme/file.o ./cyclone icyc.scm .PHONY: tags