From 2e6d512c29c72bb220dacabc79392334283d604e Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Tue, 28 Jul 2015 11:16:38 +0200 Subject: factor common Makefile stuff --- mathcomp/Makefile | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'mathcomp/Makefile') diff --git a/mathcomp/Makefile b/mathcomp/Makefile index 880977c..120c127 100644 --- a/mathcomp/Makefile +++ b/mathcomp/Makefile @@ -4,17 +4,15 @@ ifeq "$(COQBIN)" "" COQBIN=$(dir $(shell which coqtop))/ endif -ifeq "$(shell $(COQBIN)/coqtop -v | head -1 | grep trunk | wc -l | sed 's/ *//g')" "1" -V=trunk -else -V=$(shell $(COQBIN)/coqtop -v | head -1 | \ - sed 's/.*version \([0-9]\.[0-9]\)[^ ]* .*/v\1/') -endif +# this sets variable V +include ssreflect/Makefile.detect-coq-version +# this defined coqmakefile +include Makefile.coq-makefile ifeq "$V" "v8.4" COQDEP=../etc/utils/ssrcoqdep else -COQDEP=$(COQBIN)/coqdep +COQDEP=$(COQBIN)coqdep endif OLD_MAKEFLAGS:=$(MAKEFLAGS) @@ -29,15 +27,6 @@ MAKEFLAGS+=-B -f Makefile.coq $* \ COQDEP='$(COQDEP) -exclude-dir plugin -c' -define coqmakefile - (echo "Generating Makefile.coq for Coq $(V) with COQBIN=$(COQBIN)";\ - ln -sf ssreflect/plugin/$(V)/ssreflect.mllib .;\ - ln -sf ssreflect/plugin/$(V)/ssrmatching.mli .;\ - ln -sf ssreflect/plugin/$(V)/ssrmatching.ml4 .;\ - ln -sf ssreflect/plugin/$(V)/ssreflect.ml4 .;\ - $(COQBIN)/coq_makefile -f Make -o Makefile.coq) -endef - clean: $(H)MAKEFLAGS=$(OLD_MAKEFLAGS) $(MAKE) --no-print-directory \ -f Makefile.coq clean -- cgit v1.2.3