updates on master-makefile of oooJava: generates a separate rcr executable file.

diff --git a/Robust/src/Benchmarks/oooJava/master-makefile b/Robust/src/Benchmarks/oooJava/master-makefile
index 65f3b2ff53752b5af4ac083da1ed34b1989f1aca..49fccb4edc14ac97838c6e71d060fce0c3fa33ec 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/master-makefile
+++ b/Robust/src/Benchmarks/oooJava/master-makefile
@@ -30,9 +30,9 @@ USECOREPROF= #-coreprof $(COREPROFOVERFLOW) \
 #      -coreprof-enable cpe_taskstallmem
 
 
-USEOOO= -ooojava 24 2  #-ooodebug #-rcr # -ooodebug-disable-task-mem-pool
-USERCR= -ooojava 24 2  -rcr
-BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 8000 -garbagestats -joptimize -noloop -debug -nooptimize #src-after-pp #-debug
+USEOOO= -ooojava 24 2  -ooodebug # -ooodebug-disable-task-mem-pool
+USERCR= -ooojava 24 2  -rcr -ooodebug
+BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 8000 -garbagestats -joptimize -noloop -optimize -debug #-nooptimize #src-after-pp #-debug
 
 DRELEASEMODE=-disjoint-release-mode -disjoint-dvisit-stack-callees-on-top -disjoint-alias-file aliases.txt tabbed
 DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
@@ -47,11 +47,11 @@ ooo:
        $(BUILDSCRIPT)         $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINT) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES) 
 
 rcr:
-       $(BUILDSCRIPT)         $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES) 
+       $(BUILDSCRIPT)         $(BSFLAGS) $(USECOREPROF) $(USERCR) $(DISJOINT) -o $(PROGRAM)r -builddir rcr  $(SOURCE_FILES) 
 
 clean:
        rm -f  $(PROGRAM)p.bin $(PROGRAM)s.bin
-       rm -fr par sing
+       rm -fr par sing rcr
        rm -f tmp.c
        rm -f  *~
        rm -f  *.dot