Merge branches 'master' and 'master' of http://git.megacz.com/coq-hetmet

[coq-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index d8bc76a..eab7dd4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,16 @@
-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 OPT=-dont-load-proofs ExtractionMain.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