diff options
| author |  Stephane Glondu <steph@glondu.net> | 2010-12-24 12:51:11 +0100 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2010-12-24 12:51:11 +0100 |
| commit | 20d03a28285c430740d0b675583fe5c4d13ffecc (patch) | |
| tree | 36bd87c5c42d948291605fc35b4b7cf573fc8113 /Makefile.common | |
| parent | c0a92523eaa76afabcbaf06ac4a7e8f7930ee4a3 (diff) | |
| parent | 50dc9067e98ca001ad2e875011abab5da6fdb621 (diff) | |
Merge commit 'upstream/8.3.pl1+dfsg' into experimental/master
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.common b/Makefile.common index cc38980c..46bf2175 100644 --- a/Makefile.common +++ b/Makefile.common @@ -365,7 +365,7 @@ DATE=$(shell LANG=C date +"%B %Y") SOURCEDOCDIR=dev/source-doc -CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.cmi %.cma %.cmxa %.cmxs %.dep.ps %.dot +CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.o %.cmi %.cma %.cmxa %.a %.cmxs %.dep.ps %.dot ### Targets forwarded by Makefile to a specific stage: @@ -374,10 +374,12 @@ CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.cmi %.cma %.cmxa %.cmxs %.dep.ps %.dot STAGE1_TARGETS:= $(STAGE1) $(COQDEPBOOT) \ $(GENFILES) \ source-doc revision toplevel/mltop.byteml toplevel/mltop.optml \ - $(STAGE1_ML4:.ml4=.ml4-preprocessed) %.o + $(STAGE1_ML4:.ml4=.ml4-preprocessed) + +STAGE1_IMPLICITS:= ifdef CM_STAGE1 - STAGE1_TARGETS+=$(CAML_OBJECT_PATTERNS) + STAGE1_IMPLICITS+=$(CAML_OBJECT_PATTERNS) endif ## Enumeration of targets that require being done at stage2 @@ -402,12 +404,13 @@ STAGE2_TARGETS:=$(COQBINARIES) lib kernel byterun library proofs tactics \ printers debug initplugins plugins \ world install coqide coqide-files coq coqlib \ coqlight states check init theories theories-light \ - $(DOC_TARGETS) $(VO_TARGETS) validate \ - %.vo %.glob states/% install-% %.ml4-preprocessed \ + $(DOC_TARGETS) $(VO_TARGETS) validate + +STAGE2_IMPLICITS:= %.vo %.glob states/% install-% %.ml4-preprocessed \ $(DOC_TARGET_PATTERNS) ifndef CM_STAGE1 - STAGE2_TARGETS+=$(CAML_OBJECT_PATTERNS) + STAGE2_IMPLICITS+=$(CAML_OBJECT_PATTERNS) endif |