Commit f0653c9e authored by Guillaume Melquiond's avatar Guillaume Melquiond

Merge branch 'bugfix/v0.87'

parents d07584df aeed1092
......@@ -29,6 +29,7 @@ why3.conf
/autom4te.cache
/Makefile
/configure
/install-sh
/semantic.cache
/TAGS
/output_why3
......
This diff is collapsed.
This diff is collapsed.
......@@ -153,7 +153,9 @@ else
fi
fi
AC_PROG_CC()
AC_PROG_CC
AC_PROG_MKDIR_P
AC_PROG_INSTALL
# Check for Ocaml compilers
......
......@@ -65,19 +65,25 @@ test_makejob: $(TEST_MAKEJOB)
################
%.cmi: %.mli
$(if $(QUIET),@echo 'Ocamlc $<' &&) $(OCAMLC) -c $<
$(SHOW) 'Ocamlc $<'
$(HIDE)$(OCAMLC) -c $<
%.cmo: %.ml
$(if $(QUIET),@echo 'Ocamlc $<' &&) $(OCAMLC) -c $<
$(SHOW) 'Ocamlc $<'
$(HIDE)$(OCAMLC) -c $<
%.cmx: %.ml
$(if $(QUIET),@echo 'Ocamlopt $<' &&) $(OCAMLOPT) -c $<
$(SHOW) 'Ocamlopt $<'
$(HIDE)$(OCAMLOPT) -c $<
%.dep: %.ml
$(if $(QUIET),@echo 'Ocamldep $<' &&) $(OCAMLDEP) $(DEPFLAGS) $< $<i > $@
$(SHOW) 'Ocamldep $<'
$(HIDE)$(OCAMLDEP) $(DEPFLAGS) $< $<i $(TOTARGET)
%.opt:
$(if $(QUIET),@echo 'Ocamlopt $<' &&) $(OCAMLOPT) -linkpkg -o $@ $^
$(SHOW) 'Ocamlopt $<'
$(HIDE)$(OCAMLOPT) -linkpkg -o $@ $^
%.byte:
$(if $(QUIET),@echo 'Ocamlc $<' &&) $(OCAMLC) -linkpkg -o $@ $^
$(SHOW) 'Ocamlc $<'
$(HIDE)$(OCAMLC) -linkpkg -o $@ $^
......@@ -505,6 +505,7 @@ compile_time_support = true
exec = "coqtop -batch"
version_switch = "-v"
version_regexp = "The Coq Proof Assistant, version \\([^ \n]+\\)"
version_ok = "8.5pl1"
version_ok = "8.5"
command = "%e -R %l/coq-tactic Why3 -R %l/coq Why3 -l %f"
driver = "drivers/coq.drv"
......@@ -516,12 +517,7 @@ compile_time_support = true
exec = "coqtop -batch"
version_switch = "-v"
version_regexp = "The Coq Proof Assistant, version \\([^ \n]+\\)"
version_ok = "8.4pl6"
version_ok = "8.4pl5"
version_ok = "8.4pl4"
version_ok = "8.4pl3"
version_ok = "8.4pl2"
version_ok = "8.4pl1"
version_ok = "8.4pl[1-6]"
version_ok = "8.4"
command = "%e -R %l/coq-tactic Why3 -R %l/coq Why3 -l %f"
driver = "drivers/coq.drv"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment