aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Robert Sloan <varomodt@gmail.com>2016-06-06 11:51:47 -0400
committerGravatar Robert Sloan <varomodt@gmail.com>2016-06-06 11:51:47 -0400
commit049df0166f80ac95bac98c4afbbffde4d9af1c11 (patch)
tree409ca1c8a6897fb9d37c2d19a159e95f49c8b906
parent9b64d1191f318f8c354c325f2c630dd6d88d0a2d (diff)
Meshing Assembly machinery into the Makefile
-rw-r--r--Makefile18
-rw-r--r--_CoqProject1
2 files changed, 11 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 35cbcde24..125d59c13 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,27 @@
+
MOD_NAME := Crypto
SRC_DIR := src
+FLAGS := Coqprime/Coqprime
.PHONY: coq clean install coqprime update-_CoqProject
.DEFAULT_GOAL := coq
update-_CoqProject::
- (echo '-R $(SRC_DIR) $(MOD_NAME)'; git ls-files src/*.v) > _CoqProject
+ @(echo "-R $(SRC_DIR) $(MOD_NAME) $(FLAGS)"; git ls-files src/*.v) > _CoqProject
coq: coqprime Makefile.coq
- $(MAKE) -f Makefile.coq
+ @$(MAKE) -f Makefile.coq
coqprime:
- $(MAKE) -C coqprime
+ @$(MAKE) -C coqprime
Makefile.coq: Makefile _CoqProject
- coq_makefile -f _CoqProject -o Makefile.coq
+ @coq_makefile -f _CoqProject -o Makefile.coq 2> /dev/null
clean: Makefile.coq
- $(MAKE) -f Makefile.coq clean
- rm -f Makefile.coq
+ @$(MAKE) -f Makefile.coq clean
+ @rm -f Makefile.coq
install: coq Makefile.coq
- $(MAKE) -f Makefile.coq install
- $(MAKE) -C coqprime install
+ @$(MAKE) -f Makefile.coq install
+ @$(MAKE) -C coqprime install
diff --git a/_CoqProject b/_CoqProject
index bb92c783a..c92f9481c 100644
--- a/_CoqProject
+++ b/_CoqProject
@@ -1,4 +1,5 @@
-R src Crypto
+-R Coqprime/Coqprime Coqprime
src/BaseSystem.v
src/BaseSystemProofs.v
src/EdDSAProofs.v