From fdc794f5dc9de5b55fff71939ee4374ea38efa8f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 30 Mar 2009 18:47:32 +0000 Subject: Compile things into separate build dir. Move .tpr files to test dir. git-svn-id: http://svn.drobilla.net/resp/tuplr@109 ad02d1e2-f140-0410-9f75-f8b11f17cedd --- Makefile | 7 ++++--- ack.tpr | 8 -------- fac.tpr | 7 ------- list.tpr | 3 --- test/ack.tpr | 8 ++++++++ test/fac.tpr | 7 +++++++ test/list.tpr | 3 +++ 7 files changed, 22 insertions(+), 21 deletions(-) delete mode 100644 ack.tpr delete mode 100644 fac.tpr delete mode 100644 list.tpr create mode 100644 test/ack.tpr create mode 100644 test/fac.tpr create mode 100644 test/list.tpr diff --git a/Makefile b/Makefile index 5ab2806..83fdfb0 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,12 @@ LLVM_LDFLAGS=`llvm-config --ldflags --libs core jit native` CXXFLAGS=-O0 -g -Wall -Wextra -Wno-unused-parameter $(LLVM_CXXFLAGS) LDFLAGS=$(LLVM_LDFLAGS) -lm -tuplr: tuplr.o typing.o llvm.o write.o +build/tuplr: build/tuplr.o build/typing.o build/llvm.o build/write.o g++ -o $@ $^ $(LDFLAGS) -%.o: %.cpp tuplr.hpp +build/%.o: %.cpp tuplr.hpp + mkdir -p build g++ $(CXXFLAGS) -o $@ -c $< clean: - rm -f tuplr *.o + rm -rf build diff --git a/ack.tpr b/ack.tpr deleted file mode 100644 index 1fe38d5..0000000 --- a/ack.tpr +++ /dev/null @@ -1,8 +0,0 @@ -(def ack - (fn (m n) - (if (= 0 m) (+ n 1) - (= 0 n) (ack (- m 1) 1) - (ack (- m 1) (ack m (- n 1)))))) - -(ack 3 10) - diff --git a/fac.tpr b/fac.tpr deleted file mode 100644 index 77e4776..0000000 --- a/fac.tpr +++ /dev/null @@ -1,7 +0,0 @@ -; Factorial -(def fac (fn (n) - (if (= 0 n) 1 - (* n (fac (- n 1)))))) - -(fac 5) - diff --git a/list.tpr b/list.tpr deleted file mode 100644 index 947fe97..0000000 --- a/list.tpr +++ /dev/null @@ -1,3 +0,0 @@ -(def l (cons 1 (cons 2 (cons 3 4)))) - -(car (cdr (cdr l))) diff --git a/test/ack.tpr b/test/ack.tpr new file mode 100644 index 0000000..1fe38d5 --- /dev/null +++ b/test/ack.tpr @@ -0,0 +1,8 @@ +(def ack + (fn (m n) + (if (= 0 m) (+ n 1) + (= 0 n) (ack (- m 1) 1) + (ack (- m 1) (ack m (- n 1)))))) + +(ack 3 10) + diff --git a/test/fac.tpr b/test/fac.tpr new file mode 100644 index 0000000..77e4776 --- /dev/null +++ b/test/fac.tpr @@ -0,0 +1,7 @@ +; Factorial +(def fac (fn (n) + (if (= 0 n) 1 + (* n (fac (- n 1)))))) + +(fac 5) + diff --git a/test/list.tpr b/test/list.tpr new file mode 100644 index 0000000..947fe97 --- /dev/null +++ b/test/list.tpr @@ -0,0 +1,3 @@ +(def l (cons 1 (cons 2 (cons 3 4)))) + +(car (cdr (cdr l))) -- cgit v1.2.1