From 3510e3528c0eada0483b4facd0875be25c6bbda5 Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 25 Feb 2007 20:35:10 -0500 Subject: [PATCH 1/1] Makefile cleanup darcs-hash:20070226013510-5007d-f11055b05c56cf16c79dfcfcd84955da9834b6c8.gz --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 43d6717..51fde73 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,8 @@ regress: 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 @@ -201,12 +200,13 @@ bin/HaskellDemo: src/SBP.hs \ 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 +#profile=-agentlib:yjpagent 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 -- 1.7.10.4