Commit 3e87d19e authored by Guillaume Melquiond's avatar Guillaume Melquiond

Move most build dependencies to "all" rather than "opt byte".

parent b2bc597b
...@@ -358,7 +358,7 @@ ifeq (@enable_emacs_compilation@,yes) ...@@ -358,7 +358,7 @@ ifeq (@enable_emacs_compilation@,yes)
endif endif
ifeq (@enable_emacs_compilation@,yes) ifeq (@enable_emacs_compilation@,yes)
opt byte: share/emacs/why3.elc all: share/emacs/why3.elc
endif endif
...@@ -994,9 +994,7 @@ COQVD = $(addsuffix .vd, $(COQLIBS_FILES)) ...@@ -994,9 +994,7 @@ COQVD = $(addsuffix .vd, $(COQLIBS_FILES))
$(SHOW) 'Coqdep $<' $(SHOW) 'Coqdep $<'
$(HIDE)$(COQDEP) -R lib/coq Why3 $< $(TOTARGET) $(HIDE)$(COQDEP) -R lib/coq Why3 $< $(TOTARGET)
opt byte: $(COQVO) all: $(COQVO) drivers/coq-realizations.aux
install_local:: $(COQVO) drivers/coq-realizations.aux
ifneq "$(MAKECMDGOALS:clean%=clean)" "clean" ifneq "$(MAKECMDGOALS:clean%=clean)" "clean"
ifneq "$(MAKECMDGOALS:update-coq%=update-coq)" "update-coq" ifneq "$(MAKECMDGOALS:update-coq%=update-coq)" "update-coq"
...@@ -1022,8 +1020,6 @@ endif ...@@ -1022,8 +1020,6 @@ endif
install_no_local:: install_no_local::
$(INSTALL_DATA) drivers/coq-realizations.aux $(DATADIR)/why3/drivers/ $(INSTALL_DATA) drivers/coq-realizations.aux $(DATADIR)/why3/drivers/
opt byte: drivers/coq-realizations.aux
clean:: clean::
rm -f drivers/coq-realizations.aux rm -f drivers/coq-realizations.aux
...@@ -1081,8 +1077,6 @@ install_no_local:: ...@@ -1081,8 +1077,6 @@ install_no_local::
$(INSTALL_DATA) $(addsuffix .pvs, $(PVSLIBS_FP)) $(LIBDIR)/why3/pvs/floating_point/ $(INSTALL_DATA) $(addsuffix .pvs, $(PVSLIBS_FP)) $(LIBDIR)/why3/pvs/floating_point/
$(INSTALL_DATA) drivers/pvs-realizations.aux $(DATADIR)/why3/drivers/ $(INSTALL_DATA) drivers/pvs-realizations.aux $(DATADIR)/why3/drivers/
install_local:: drivers/pvs-realizations.aux
update-pvs: bin/why3realize.@OCAMLBEST@ drivers/pvs-realizations.aux update-pvs: bin/why3realize.@OCAMLBEST@ drivers/pvs-realizations.aux
for f in $(PVSLIBS_INT_FILES); do WHY3CONFIG="" bin/why3realize.@OCAMLBEST@ -L theories -D drivers/pvs-realize.drv -T int.$$f -o lib/pvs/int/; done for f in $(PVSLIBS_INT_FILES); do WHY3CONFIG="" bin/why3realize.@OCAMLBEST@ -L theories -D drivers/pvs-realize.drv -T int.$$f -o lib/pvs/int/; done
for f in $(PVSLIBS_REAL_FILES); do WHY3CONFIG="" bin/why3realize.@OCAMLBEST@ -L theories -D drivers/pvs-realize.drv -T real.$$f -o lib/pvs/real/; done for f in $(PVSLIBS_REAL_FILES); do WHY3CONFIG="" bin/why3realize.@OCAMLBEST@ -L theories -D drivers/pvs-realize.drv -T real.$$f -o lib/pvs/real/; done
...@@ -1101,7 +1095,7 @@ install_no_local:: ...@@ -1101,7 +1095,7 @@ install_no_local::
endif endif
opt byte: drivers/pvs-realizations.aux all: drivers/pvs-realizations.aux
clean:: clean::
rm -f drivers/pvs-realizations.aux rm -f drivers/pvs-realizations.aux
...@@ -1250,7 +1244,7 @@ $(ISABELLELIBS_BV): bin/why3realize.@OCAMLBEST@ drivers/isabelle-realizations.au ...@@ -1250,7 +1244,7 @@ $(ISABELLELIBS_BV): bin/why3realize.@OCAMLBEST@ drivers/isabelle-realizations.au
WHY3CONFIG="" bin/why3realize.@OCAMLBEST@ -L theories -D $(ISABELLEREALIZEDRV) -T bv.$(notdir $(basename $@)) -o lib/isabelle/bv/ WHY3CONFIG="" bin/why3realize.@OCAMLBEST@ -L theories -D $(ISABELLEREALIZEDRV) -T bv.$(notdir $(basename $@)) -o lib/isabelle/bv/
# do not update isabelle realizations systematically # do not update isabelle realizations systematically
# opt byte: update-isabelle # all: update-isabelle
clean:: clean::
rm -f lib/isabelle/*/*.xml rm -f lib/isabelle/*/*.xml
...@@ -1266,7 +1260,7 @@ install_no_local:: ...@@ -1266,7 +1260,7 @@ install_no_local::
endif endif
opt byte: drivers/isabelle-realizations.aux all: drivers/isabelle-realizations.aux
clean:: clean::
rm -f drivers/isabelle-realizations.aux rm -f drivers/isabelle-realizations.aux
...@@ -1352,7 +1346,7 @@ endif ...@@ -1352,7 +1346,7 @@ endif
TOOLS = lib/why3-cpulimit$(EXE) TOOLS = lib/why3-cpulimit$(EXE)
byte opt: $(TOOLS) all: $(TOOLS)
lib/why3-cpulimit$(EXE): src/tools/@CPULIMIT@.c lib/why3-cpulimit$(EXE): src/tools/@CPULIMIT@.c
$(SHOW) 'Cc $^' $(SHOW) 'Cc $^'
...@@ -1983,7 +1977,7 @@ doc/version.tex: doc/version.tex.in config.status ...@@ -1983,7 +1977,7 @@ doc/version.tex: doc/version.tex.in config.status
config.status: configure config.status: configure
./config.status --recheck ./config.status --recheck
opt byte: lib/why3/META .merlin all: lib/why3/META .merlin
lib/why3/META: lib/why3/META.in config.status lib/why3/META: lib/why3/META.in config.status
./config.status chmod --file $@ ./config.status chmod --file $@
......
...@@ -27,7 +27,7 @@ available: [ ocaml-version >= "4.01.0" ] ...@@ -27,7 +27,7 @@ available: [ ocaml-version >= "4.01.0" ]
build: [ build: [
["./configure" "--prefix" prefix "--disable-frama-c" ["./configure" "--prefix" prefix "--disable-frama-c"
"--disable-ide" { !conf-gtksourceview:installed }] "--disable-ide" { !conf-gtksourceview:installed }]
[make "-j%{jobs}%" "opt" "byte"] [make "-j%{jobs}%" "all" "opt" "byte"]
] ]
install: [make "install" "install-lib"] install: [make "install" "install-lib"]
......
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