From 122e6f617f99f7dd87d4aaf450f6d0bdb689b33f Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Mon, 6 Mar 2017 12:39:22 -0500 Subject: Remove display .vo from default target --- .travis.yml | 2 +- Makefile | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6484120cd..ab38614fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ before_script: - uname -a - source ./etc/ci/travis_keep_alive.sh -script: COQPATH="$(pwd)/$COQPRIME" ./etc/coq-scripts/timing/make-pretty-timed.sh -j2 && make COQPATH="$(pwd)/$COQPRIME" TIMED=1 -j2 +script: COQPATH="$(pwd)/$COQPRIME" ./etc/coq-scripts/timing/make-pretty-timed.sh -j2 && make COQPATH="$(pwd)/$COQPRIME" coq specific-display TIMED=1 -j2 after_success: - kill $PID_KEEP_ALIVE diff --git a/Makefile b/Makefile index 44ed1ce03..88455dea9 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ HIDE := $(if $(VERBOSE),,@) .PHONY: coq clean update-_CoqProject cleanall install \ install-coqprime clean-coqprime coqprime \ - display \ + specific-display display \ specific non-specific \ small-specific-gen medium-specific-gen specific-gen \ extraction ghc @@ -47,7 +47,7 @@ update-_CoqProject:: $(VOFILES): | coqprime # add files to this list to prevent them from being built by default -UNMADE_VOFILES := src/SpecificGen/% +UNMADE_VOFILES := src/SpecificGen/% src/Specific/%Display.vo COQ_VOFILES := $(filter-out $(UNMADE_VOFILES),$(VOFILES)) SPECIFIC_VO := $(filter src/Specific/%,$(VOFILES)) @@ -55,8 +55,10 @@ SPECIFIC_GEN_VO := $(filter src/SpecificGen/%,$(VOFILES)) MEDIUM_SPECIFIC_GEN_VO := $(filter-out src/SpecificGen/GF5211_32%,$(SPECIFIC_GEN_VO)) SMALL_SPECIFIC_GEN_VO := $(filter-out src/SpecificGen/GF41417_32%,$(MEDIUM_SPECIFIC_GEN_VO)) NON_SPECIFIC_VO := $(filter-out $(SPECIFIC_VO),$(VO_FILES)) -DISPLAY_VO := $(filter src/Specific/%Display.vo src/SpecificGen/%Display.vo,$(VOFILES)) -DISPLAY_JAVA_VO := $(filter src/Specific/%JavaDisplay.vo src/SpecificGen/%JavaDisplay.vo,$(DISPLAY_VO)) +SPECIFIC_DISPLAY_VO := $(filter src/Specific/%Display.vo,$(VOFILES)) +SPECIFIC_GEN_DISPLAY_VO := $(filter src/SpecificGen/%Display.vo,$(VOFILES)) +DISPLAY_VO := $(SPECIFIC_DISPLAY_VO) $(SPECIFIC_GEN_DISPLAY_VO) +DISPLAY_JAVA_VO := $(filter %JavaDisplay.vo,$(DISPLAY_VO)) DISPLAY_NON_JAVA_VO := $(filter-out $(DISPLAY_JAVA_VO),$(DISPLAY_VO)) specific: $(SPECIFIC_VO) coqprime @@ -64,6 +66,7 @@ specific-gen: $(SPECIFIC_GEN_VO) coqprime medium-specific-gen: $(MEDIUM_SPECIFIC_GEN_VO) coqprime small-specific-gen: $(SMALL_SPECIFIC_GEN_VO) coqprime non-specific: $(NON_SPECIFIC_VO) coqprime +specific-display: $(SPECIFIC_DISPLAY_VO:.vo=.log) coqprime display: $(DISPLAY_VO:.vo=.log) coqprime coq: $(COQ_VOFILES) coqprime -- cgit v1.2.3