diff options
author | 2011-09-17 20:26:28 +0000 | |
---|---|---|
committer | 2011-09-17 20:26:28 +0000 | |
commit | 9dc9bd9468cd7bf72715dab4b0a074664667a3ad (patch) | |
tree | a75982bd9e5628b3f264a6788c55f88ef3b9c91c /Makefile.common | |
parent | ffd8e4e70a4404453f6ab05d0e8f23ef5a3256a2 (diff) |
Various fixes in the Makefiles
After a successful build, re-doing make world should almost do nothing.
For that:
- Many targets added to .PHONY, especially "tools" since a "tools"
directory exists. And anyway this is said to speed-up make a bit.
- Concerning fake_ide, mentionning the .cm* instead of the .ml*
avoid rebuilding these .cm*, and hence possibly many other things.
- in Makefile.doc: fix the rule building index_url.txt
- coqtop.* is now built by $(BESTCOQMKTOP) instead of $(COQMKTOP)
(which is the symlink). This avoids a situation where a first
"make" could redo just a few files while a second "make" will
rebuild many more. Typical scenario : touch the Makefile,
1st make was re-doing tolink.ml and then coqmktop, but no more,
a 2nd make was then detecting that coqtop and the stdlib was to
be redone
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14476 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'Makefile.common')
-rw-r--r-- | Makefile.common | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common index cd8f2063b..b7ff5da4f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -16,18 +16,22 @@ COQMKTOPBYTE:=bin/coqmktop.byte$(EXE) COQMKTOPOPT:=bin/coqmktop.opt$(EXE) BESTCOQMKTOP:=bin/coqmktop.$(BEST)$(EXE) COQMKTOP:=bin/coqmktop$(EXE) + COQCBYTE:=bin/coqc.byte$(EXE) COQCOPT:=bin/coqc.opt$(EXE) BESTCOQC:=bin/coqc.$(BEST)$(EXE) COQC:=bin/coqc$(EXE) + COQTOPBYTE:=bin/coqtop.byte$(EXE) COQTOPOPT:=bin/coqtop.opt$(EXE) BESTCOQTOP:=bin/coqtop.$(BEST)$(EXE) COQTOPEXE:=bin/coqtop$(EXE) + CHICKENBYTE:=bin/coqchk.byte$(EXE) CHICKENOPT:=bin/coqchk.opt$(EXE) BESTCHICKEN:=bin/coqchk.$(BEST)$(EXE) CHICKEN:=bin/coqchk$(EXE) + FAKEIDE:=bin/fake_ide$(EXE) ifeq ($(CAMLP4),camlp4) @@ -66,7 +70,6 @@ BESTOBJ:=$(if $(OPT),.cmx,.cmo) COQBINARIES:= $(COQMKTOP) $(COQC) \ $(COQTOPBYTE) $(if $(OPT),$(COQTOPOPT)) $(COQTOPEXE) \ $(CHICKENBYTE) $(if $(OPT),$(CHICKENOPT)) $(CHICKEN) -OTHERBINARIES:=$(COQMKTOPBYTE) $(COQCBYTE) CSDPCERT:=plugins/micromega/csdpcert$(EXE) |