X-Git-Url: http://git.megacz.com/?p=coq-hetmet.git;a=blobdiff_plain;f=examples%2FMakefile;h=7926143dcfb372bf61d6fb74a5e34db366c3b752;hp=1ee6f7fa6cd1c8c40fb26d75a4742fb69d2870e1;hb=d5f12624745edf327b49e515a1ebb5aeb265b70c;hpb=c48b4f9b38c25704467b8d511e6e2ac582ee21c4

diff --git a/examples/Makefile b/examples/Makefile
index 1ee6f7f..7926143 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,11 +1,11 @@
-ghc_opt := -fwarn-incomplete-patterns -Werror
+ghc_opt := -fwarn-incomplete-patterns -Werror -odir .build -hidir .build 
 
 open:
 	make demo
 	open .build/test.pdf
 
 #sanity += BiGArrow.hs
-#sanity += CircuitExample.hs
+sanity += CircuitExample.hs
 sanity += CommandSyntaxExample.hs
 sanity += DotProduct.hs
 sanity += GArrowTutorial.hs
@@ -14,18 +14,20 @@ sanity += ImmutableHeap.hs
 sanity += IsomorphismForCodeTypes.hs
 sanity += LambdaCalculusInterpreter.hs
 sanity += TypeSafeRun.hs
-sanity += Unflattening.hs
+#sanity += Unflattening.hs
 
-sanity_opts = -dcore-lint -fforce-recomp -fcoqpass -ddump-coqpass -ddump-to-file
+sanity_opts  = -dcore-lint -fforce-recomp -fcoqpass -ddump-coqpass -ddump-to-file
+sanity_opts += -fsimpleopt-before-flatten
+sanity_opts += -odir .build -hidir .build 
 
 sanity:
-	for A in $(sanity); do ../../../inplace/bin/ghc-stage2 $(sanity_opts) $$A +RTS -K500M || exit -1; done
+	for A in $(sanity); do echo; echo; ../../../inplace/bin/ghc-stage2 $(sanity_opts) $$A +RTS -K500M || exit -1; done
 
 
 demo:
 	mkdir -p .build
-	../../../inplace/bin/ghc-stage2 $(ghc_opt) -odir .build -hidir .build -c Demo.hs -fforce-recomp
-	../../../inplace/bin/ghc-stage2 $(ghc_opt) -odir .build -hidir .build --show-iface .build/Demo.hi
-	../../../inplace/bin/ghc-stage2 $(ghc_opt) -odir .build -hidir .build GArrowTikZ.hs Demo.hs DemoMain.hs Unify.hs -o .build/demo
+	../../../inplace/bin/ghc-stage2 $(ghc_opt) -c Demo.hs -fforce-recomp
+	../../../inplace/bin/ghc-stage2 $(ghc_opt) --show-iface .build/Demo.hi
+	../../../inplace/bin/ghc-stage2 $(ghc_opt) GArrowTikZ.hs Demo.hs DemoMain.hs Unify.hs -o .build/demo
 	./.build/demo > .build/test.tex
 	cd .build; pdflatex test.tex