Makefile updates

[coq-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index ba1fb28..8abce1b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,11 @@ allfiles := $(coqfiles) $(shell find src -name \*.hs)
 
 default: build/CoqPass.hs
 
-build/CoqPass.hs: build/Makefile.coq $(allfiles)
-
-        # first we build with -dont-load-proofs, since that runs very quickly
-       cd build; make -f Makefile.coq OPT="-dont-load-proofs" Main.vo
-
-        # however the final extraction must be done without -dont-load-proofs
+build/CoqPass.hs: $(allfiles)
+       make build/Makefile.coq
        cd build; make -f Makefile.coq Extraction.vo
-       cat src/Extraction-prefix.hs build/Extraction.hs > build/CoqPass.hs
+       cat src/Extraction-prefix.hs                                     > build/CoqPass.hs
+       cat build/Extraction.hs | grep -v '^module' | grep -v '^import' >> build/CoqPass.hs
 
 build/Makefile.coq: $(coqfiles)
        mkdir -p build
@@ -49,4 +46,11 @@ publish:
          pdflatex $$A.tex < /dev/null; done
        ssh login.eecs.berkeley.edu -- 'rm public_html/coq-in-ghc/pdfs/*.pdf' ; true
        scp .temp/*.pdf login.eecs.berkeley.edu:public_html/coq-in-ghc/pdfs/
-       rm -rf .temp
\ No newline at end of file
+       rm -rf .temp
+
+push: build/CoqPass.hs
+       git push http://git.megacz.com/coq-garrows.git master
+       git add -f build/CoqPass.hs
+       git commit -m 'update baked-in CoqPass.hs'
+       git push http://git.megacz.com/coq-garrows.git master:coq-extraction-baked-in
+       git reset HEAD^