make StrongAlt a parameter rather than field in StrongCaseBranch and ProofCaseBranch

[coq-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index ba1fb28..06d0382 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,14 @@
 coqc     := coqc -noglob
 coqc     := coqc -noglob

-coqfiles := $(shell find src -name \*.v)
-allfiles := $(coqfiles) $(shell find src -name \*.hs)
+coqfiles := $(shell find src -name \*.v  | grep -v \\\#)
+allfiles := $(coqfiles) $(shell find src -name \*.hs | grep -v \\\#)

 
 default: build/CoqPass.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
        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
 
 build/Makefile.coq: $(coqfiles)
        mkdir -p build

@@ -26,6 +23,14 @@ clean:
 
 
 # this is for Adam's use only!
 
 
 # this is for Adam's use only!

+push: build/CoqPass.hs
+       git push http://git.megacz.com/coq-hetmet.git master
+       git add -f build/CoqPass.hs; \
+         git commit -m 'update baked-in CoqPass.hs' && \
+         (git push -f http://git.megacz.com/coq-hetmet.git master:coq-extraction-baked-in; \
+          git reset HEAD^)
+       make publish
+

 publish:
        rm -rf .temp
        mkdir .temp
 publish:
        rm -rf .temp
        mkdir .temp

@@ -49,4 +54,4 @@ 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/
          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