make mlp related makefiles use a relative buildscript so everyone can use easily...

diff --git a/Robust/src/Benchmarks/mlp/raytracer/makefile b/Robust/src/Benchmarks/mlp/raytracer/makefile
index e5b9f8c6bd781ce20b59493b664cc0ca7166f7ec..3f264cda53ced0b738c6532a89dab0915483b0d0 100644 (file)
--- 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 9375cb3b5bad7c926c1b4e870eb597a0393069d9..e5a44507e3f4842fb6b487cb1e74424248799131 100644 (file)
--- 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 9375cb3b5bad7c926c1b4e870eb597a0393069d9..e5a44507e3f4842fb6b487cb1e74424248799131 100644 (file)
--- 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