X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=c77a3dd71609383b4c4fc257354d10e552429fdd;hb=5929a28895c9e8a12f3b60abf024a455ebe11e4c;hp=2d65894b3daf58e9f346403bf7fed89b912e3ebb;hpb=743099bc348cfa97fb4d94c7e7ae3e53d2717e87;p=coq-hetmet.git

diff --git a/Makefile b/Makefile
index 2d65894..c77a3dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,17 @@
-coqc     := coqc -noglob
+coqc     := coqc -noglob -opt
 coqfiles := $(shell find src -name \*.v  | grep -v \\\#)
 allfiles := $(coqfiles) $(shell find src -name \*.hs | grep -v \\\#)
 
-default: build/CoqPass.hs
+default: all
+
+all: $(allfiles)
+	$(MAKE) build/Makefile.coq
+	cd build; $(MAKE) -f Makefile.coq OPT="-opt -dont-load-proofs" All.vo
 
 build/CoqPass.hs: $(allfiles)
 	make build/Makefile.coq
-	cd build; make -f Makefile.coq OPTS=-dont-load-proofs ExtractionMain.vo
-	cd build; make -f Makefile.coq Extraction.vo
+	cd build; $(MAKE) -f Makefile.coq OPT="-opt -dont-load-proofs" ExtractionMain.vo
+	cd build; $(MAKE) -f Makefile.coq Extraction.vo
 	cat src/Extraction-prefix.hs                                     > build/CoqPass.hs
 	cat build/Extraction.hs | grep -v '^module' | grep -v '^import' >> build/CoqPass.hs
 
@@ -20,7 +24,7 @@ build/Makefile.coq: $(coqfiles) src/categories/src
 
 src/categories/src:
 	git submodule update --init src/categories
-	cd compiler/categories; git checkout master
+	cd src/categories; git checkout master
 
 clean:
 	rm -rf build
@@ -36,6 +40,11 @@ merged:
 	echo COMPILATION OK
 	echo
 
+pushcheck:
+	ssh megacz.com -- 'rm -rf /tmp/pushcheck; mkdir /tmp/pushcheck; cd /tmp/pushcheck; git clone http://git.megacz.com/ghc-hetmet.git && git clone http://git.megacz.com/coq-hetmet.git ghc-hetmet/compiler/hetmet'
+	rsync -are ssh --progress --verbose --exclude .git --exclude src/categories/build/ --exclude build/ ./ megacz.com:/tmp/pushcheck/ghc-hetmet/compiler/hetmet/
+	ssh megacz.com -- '/vol/megacz/pushcheck2.sh'
+
 
 # this is for Adam's use only!
 push: build/CoqPass.hs