projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
fe637b4
)
Makefile cleanup
author
adam
<adam@megacz.com>
Mon, 26 Feb 2007 01:35:10 +0000
(20:35 -0500)
committer
adam
<adam@megacz.com>
Mon, 26 Feb 2007 01:35:10 +0000
(20:35 -0500)
darcs-hash:
20070226013510
-5007d-
f11055b05c56cf16c79dfcfcd84955da9834b6c8
.gz
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
43d6717
..
51fde73
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-25,9
+25,8
@@
regress:
make test
profile: edu.berkeley.sbp.jar
make test
profile: edu.berkeley.sbp.jar
- $(java) -agentlib:yjpagent \
- -cp $< edu.berkeley.sbp.misc.RegressionTests \
- -profile \
+ $(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
+ -profile -agentlib:yjpagent \
tests/meta.g \
tests/testcase.g \
tests/regression.tc
tests/meta.g \
tests/testcase.g \
tests/regression.tc
@@
-201,12
+200,13
@@
bin/HaskellDemo: src/SBP.hs \
ghcroot = /usr/local/brian/ghc
ghcroot = /usr/local/brian/ghc
-ghc = $(ghcroot)/compiler/ghc-inplace
+ghc = $(ghcroot)/compiler/ghc-inplace -fallow-undecidable-instances -fallow-overlapping-instances
ghclibs = $(ghcroot)/rts/HSrts.jar:$(ghcroot)/libraries/base/HSbase.jar:$(ghcroot)/libraries/stm/HSstm.jar
bin/Main.class: src/Main.lhs src/SBP.lhs
cd src; $(ghc) -fglasgow-exts -cpp -odir ../bin -c -java SBP.lhs
cd src; $(ghc) -fglasgow-exts -cpp -odir ../bin -java Main.lhs
ghclibs = $(ghcroot)/rts/HSrts.jar:$(ghcroot)/libraries/base/HSbase.jar:$(ghcroot)/libraries/stm/HSstm.jar
bin/Main.class: src/Main.lhs src/SBP.lhs
cd src; $(ghc) -fglasgow-exts -cpp -odir ../bin -c -java SBP.lhs
cd src; $(ghc) -fglasgow-exts -cpp -odir ../bin -java Main.lhs
+#profile=-agentlib:yjpagent
go: bin/Main.class edu.berkeley.sbp.jar
go: bin/Main.class edu.berkeley.sbp.jar
- java -cp bin:$(ghclibs):edu.berkeley.sbp.jar Main
\ No newline at end of file
+ java $(profile) -cp bin:$(ghclibs):edu.berkeley.sbp.jar Main
\ No newline at end of file