diff options
| author |  Jason Gross <jagro@google.com> | 2018-08-07 11:25:07 -0400 |
|---|---|---|
| committer |  Jason Gross <jasongross9@gmail.com> | 2018-08-13 13:12:50 -0400 |
| commit | 44d631a07795e971ee24456dca0945de2f1d55e3 (patch) | |
| tree | 44888343c4c4827c739d5a8d5ac9ac090fa2b863 /Makefile | |
| parent | ae994ad0304006f1ea2db1b5cbb272e390230735 (diff) | |
Split up new-pipeline more
Also change the travis config so that it's easier to insert new stages
without globally renaming everything
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -24,7 +24,7 @@ INSTALLDEFAULTROOT := Crypto nobigmem print-nobigmem \ specific-c specific-display display \ specific non-specific lite only-heavy printlite lite-display print-lite-display \ - new-pipeline \ + new-pipeline pre-standalone \ curves-proofs no-curves-proofs no-curves-proofs-non-specific \ selected-specific selected-specific-display nonautogenerated-specific nonautogenerated-specific-display nonautogenerated-c build-selected-test selected-test build-selected-bench selected-bench selected-c \ build-test test build-bench bench c \ @@ -52,7 +52,7 @@ COQ_VERSION := $(firstword $(subst $(COQ_VERSION_PREFIX),,$(shell "$(COQBIN)coqc -include Makefile.coq endif -ifeq ($(filter curves-proofs no-curves-proofs no-curves-proofs-non-specific selected-specific selected-specific-display lite only-heavy printdeps printreversedeps printlite print-lite-display lite-display nobigmem print-nobigmem new-pipeline,$(MAKECMDGOALS)),) +ifeq ($(filter curves-proofs no-curves-proofs no-curves-proofs-non-specific selected-specific selected-specific-display lite only-heavy printdeps printreversedeps printlite print-lite-display lite-display nobigmem print-nobigmem new-pipeline pre-standalone,$(MAKECMDGOALS)),) -include etc/coq-scripts/Makefile.vo_closure else include etc/coq-scripts/Makefile.vo_closure @@ -107,6 +107,7 @@ NO_CURVES_PROOFS_UNMADE_VOFILES := src/Curves/Weierstrass/AffineProofs.vo \ NO_CURVES_PROOFS_NON_SPECIFIC_UNMADE_VOFILES := $(filter $(NO_CURVES_PROOFS_UNMADE_VOFILES) src/Specific/%.vo,$(VOFILES)) REAL_SPECIFIC_GENERATED_VOFILES := $(filter $(SPECIFIC_GENERATED_VOFILES),$(VOFILES)) NEW_PIPELINE_PRE_VOFILES := $(filter src/Experiments/NewPipeline/%,$(REGULAR_VOFILES)) +PRE_STANDALONE_PRE_VOFILES := $(filter src/Experiments/NewPipeline/Standalone%.vo,$(REGULAR_VOFILES)) SELECTED_PATTERN := \ src/Specific/X25519/C64/% \ @@ -159,6 +160,9 @@ endif ifneq ($(filter new-pipeline,$(MAKECMDGOALS)),) NEW_PIPELINE_VOFILES := $(call vo_closure,$(NEW_PIPELINE_PRE_VOFILES)) endif +ifneq ($(filter pre-standalone,$(MAKECMDGOALS)),) +PRE_STANDALONE_VOFILES := $(call vo_closure,$(PRE_STANDALONE_PRE_VOFILES)) +endif specific: $(SPECIFIC_VO) @@ -172,6 +176,7 @@ curves-proofs: $(CURVES_PROOFS_VOFILES) no-curves-proofs: $(NO_CURVES_PROOFS_VOFILES) no-curves-proofs-non-specific: $(NO_CURVES_PROOFS_NON_SPECIFIC_VOFILES) new-pipeline: $(NEW_PIPELINE_VOFILES) +pre-standalone: $(PRE_STANDALONE_VOFILES) specific-display: $(SPECIFIC_DISPLAY_VO:.vo=.log) specific-c: $(filter-out $(UNMADE_C_FILES),$(SPECIFIC_DISPLAY_VO:Display.vo=.c) $(SPECIFIC_DISPLAY_VO:Display.vo=.h)) selected-specific: $(SELECTED_SPECIFIC_VOFILES) |