unbreak lots more stuff

[coq-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index a691257..eab7dd4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,15 @@ 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="-opt -dont-load-proofs" \
-         ExtractionMain.vo \
-         ProgrammingLanguageGeneralizedArrow.vo \
-         ProgrammingLanguageArrow.vo \
-         ProgrammingLanguageFlattening.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
@@ -24,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