aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Herklotz <git@yannherklotz.com>2020-03-25 23:44:47 +0000
committerYann Herklotz <git@yannherklotz.com>2020-03-25 23:44:47 +0000
commitb21ac469facf8d9f9a20d86b306eecd0a70d8749 (patch)
treee77be13a5a066bc26586de9fb1254cb2002d239b
parentd389da26515d525a0cc7cbc688f5b43009335915 (diff)
downloadvericert-kvx-b21ac469facf8d9f9a20d86b306eecd0a70d8749.tar.gz
vericert-kvx-b21ac469facf8d9f9a20d86b306eecd0a70d8749.zip
Update dependencies
-rw-r--r--Makefile16
-rw-r--r--_CoqProject15
2 files changed, 15 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index c575bde..63d6436 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
-COMPCERTRECDIRS := lib common $(ARCHDIRS) backend cfrontend driver flocq exportclight \
+COMPCERTRECDIRS := lib common x86_64 x86 backend cfrontend driver flocq exportclight \
MenhirLib cparser
COMPCERTCOQINCLUDES := $(foreach d, $(COMPCERTRECDIRS), -R lib/CompCert/$(d) compcert.$(d))
-COQINCLUDES := -R src/Common CoqUp.Common -R src/Verilog CoqUp.Verilog -R src/Driver CoqUp.Driver -R src/Extraction CoqUp.Extraction $(COMPCERTCOQINCLUDES)
+COQINCLUDES := -R src/common coqup.common -R src/verilog coqup.verilog -R src/extraction coqup.extraction -R src/translation coqup.translation $(COMPCERTCOQINCLUDES)
COQEXEC := $(COQBIN)coqtop $(COQINCLUDES) -batch -load-vernac-source
COQMAKE := "$(COQBIN)coq_makefile"
-COQUPDIRS := SMTrans Common Driver Verilog
+COQUPDIRS := translation common verilog
VS := $(foreach d, $(COQUPDIRS), src/$(d)/*.v)
.PHONY: all install proof clean
@@ -25,17 +25,17 @@ install:
proof: Makefile.coq
$(MAKE) -f Makefile.coq
-extraction: src/Extraction/STAMP
+extraction: src/extraction/STAMP
-compile: src/Extraction/STAMP
+compile: src/extraction/STAMP
@echo "OCaml bin/coqup"
@mkdir -p bin
@dune build src/Driver/Driver.exe
@cp _build/default/src/Driver/Driver.exe bin/coqup
-src/Extraction/STAMP:
- @echo "COQEXEC ./src/Extraction/Extraction.v"
- @$(COQEXEC) ./src/Extraction/Extraction.v
+src/extraction/STAMP:
+ @echo "COQEXEC ./src/extraction/Extraction.v"
+ @$(COQEXEC) ./src/extraction/Extraction.v
@touch $@
Makefile.coq:
diff --git a/_CoqProject b/_CoqProject
index 5fac407..a1a5144 100644
--- a/_CoqProject
+++ b/_CoqProject
@@ -1,17 +1,16 @@
-R src/common coqup.common
--R src/verilog coqup.verilog
--R src/driver coqup.driver
-R src/extraction coqup.extraction
-R src/translation coqup.translation
+-R src/verilog coqup.verilog
--R lib/CompCert/lib compcert.lib
--R lib/CompCert/common compcert.common
--R lib/CompCert/x86 compcert.x86
+-R lib/CompCert/MenhirLib compcert.MenhirLib
-R lib/CompCert/backend compcert.backend
-R lib/CompCert/cfrontend compcert.cfrontend
+-R lib/CompCert/common compcert.common
+-R lib/CompCert/cparser compcert.cparser
-R lib/CompCert/driver compcert.driver
--R lib/CompCert/flocq compcert.flocq
-R lib/CompCert/exportclight compcert.exportclight
--R lib/CompCert/cparser compcert.cparser
--R lib/CompCert/MenhirLib compcert.MenhirLib
+-R lib/CompCert/flocq compcert.flocq
+-R lib/CompCert/lib compcert.lib
+-R lib/CompCert/x86 compcert.x86
-R lib/CompCert/x86_64 compcert.x86_64