From 19f50dd01f8acc793e94fb40271769697869f895 Mon Sep 17 00:00:00 2001
From: jjenista <jjenista>
Date: Fri, 29 Jan 2010 01:29:40 +0000
Subject: [PATCH] make mlp related makefiles use a relative buildscript so
 everyone can use easily, and added rules to raytracer to make 32bit versions
 easily

---
 Robust/src/Benchmarks/mlp/raytracer/makefile | 28 ++++++++++++++++----
 Robust/src/Tests/mlp/regression/makefile     |  2 +-
 Robust/src/Tests/mlp/tinyTest/makefile       |  2 +-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/Robust/src/Benchmarks/mlp/raytracer/makefile b/Robust/src/Benchmarks/mlp/raytracer/makefile
index e5b9f8c6..3f264cda 100644
--- a/Robust/src/Benchmarks/mlp/raytracer/makefile
+++ b/Robust/src/Benchmarks/mlp/raytracer/makefile
@@ -1,24 +1,42 @@
 PROGRAM=test
 
+PROGRAM1=testSingle
+PROGRAM2=testMulti
+
 SOURCE_FILES=test.java
 
-BUILDSCRIPT=~/eclipse/workspaces/irvine_sep09/Robust/src/buildscript
+BUILDSCRIPT=../../../buildscript
 
+USE64BIT= -64bit
 USEMLP=  -mlp 8 2 -mlpdebug  # use to turn mlp on and off and make sure rest of build not broken
-BSFLAGS= -64bit -nooptimize -debug -garbagestats -mainclass test 
+BSFLAGS= -nooptimize -debug -garbagestats -mainclass test 
 OWNERSHIP= -ownership -ownallocdepth 1 -enable-assertions  -methodeffects -flatirusermethods -ownwritedots final -ownaliasfile aliases.txt 
 
 default:
-	../../../buildscript -nojava $(USEMLP) $(BSFLAGS) $(OWNERSHIP) -o $(PROGRAM) $(SOURCE_FILES)
+	../../../buildscript -nojava $(USEMLP) $(USE64BIT) $(BSFLAGS) $(OWNERSHIP) -o $(PROGRAM) $(SOURCE_FILES)
 
 single:
-	../../../buildscript $(BSFLAGS) -o $(PROGRAM) $(SOURCE_FILES)
+	../../../buildscript $(USE64BIT) $(BSFLAGS) -o $(PROGRAM) $(SOURCE_FILES)
 
 java:
-	../../../buildscript $(USEMLP) $(BSFLAGS) $(OWNERSHIP) -o $(PROGRAM) $(SOURCE_FILES)
+	../../../buildscript $(USEMLP) $(USE64BIT) $(BSFLAGS) $(OWNERSHIP) -o $(PROGRAM) $(SOURCE_FILES)
+
+both32bit: $(PROGRAM1).bin $(PROGRAM2).bin
+
+
+$(PROGRAM1).bin: $(SOURCE_FILES)
+	$(BUILDSCRIPT)           $(BSFLAGS) -o $(PROGRAM1) $(SOURCE_FILES)
+	rm -fr tmpbuilddirectory
+
+$(PROGRAM2).bin: $(SOURCE_FILES)
+	$(BUILDSCRIPT) $(USEMLP) $(BSFLAGS) -o $(PROGRAM2) $(SOURCE_FILES)
+
+
 
 clean:
 	rm -f  $(PROGRAM).bin
+	rm -f  $(PROGRAM1).bin
+	rm -f  $(PROGRAM2).bin
 	rm -fr tmpbuilddirectory
 	rm -f  *~
 	rm -f  *.dot
diff --git a/Robust/src/Tests/mlp/regression/makefile b/Robust/src/Tests/mlp/regression/makefile
index 9375cb3b..e5a44507 100644
--- a/Robust/src/Tests/mlp/regression/makefile
+++ b/Robust/src/Tests/mlp/regression/makefile
@@ -3,7 +3,7 @@ PROGRAM2=testMulti
 
 SOURCE_FILES=test.java
 
-BUILDSCRIPT=~/research/Robust/src/buildscript
+BUILDSCRIPT=../../../buildscript
 
 USEMLP= -mlp 8 2 -mlpdebug -methodeffects -ownership -ownallocdepth 1 -ownaliasfile aliases.txt
 BSFLAGS= -nooptimize -debug -garbagestats -mainclass Test -enable-assertions
diff --git a/Robust/src/Tests/mlp/tinyTest/makefile b/Robust/src/Tests/mlp/tinyTest/makefile
index 9375cb3b..e5a44507 100644
--- a/Robust/src/Tests/mlp/tinyTest/makefile
+++ b/Robust/src/Tests/mlp/tinyTest/makefile
@@ -3,7 +3,7 @@ PROGRAM2=testMulti
 
 SOURCE_FILES=test.java
 
-BUILDSCRIPT=~/research/Robust/src/buildscript
+BUILDSCRIPT=../../../buildscript
 
 USEMLP= -mlp 8 2 -mlpdebug -methodeffects -ownership -ownallocdepth 1 -ownaliasfile aliases.txt
 BSFLAGS= -nooptimize -debug -garbagestats -mainclass Test -enable-assertions
-- 
2.34.1