summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2005-09-24 16:13:29 +0000
committerXavier Leroy <xavier.leroy@inria.fr>2005-09-24 16:13:29 +0000
commit8b355c5cca9fd9ae788b53dc2ec04b343239b99a (patch)
tree88019a4680ec9e2d9dcdb0932c85e56a35fca663 /Makefile
parent3577dd71d1b8baea8b2457fcd10a678290060940 (diff)
downloadocaml-8b355c5cca9fd9ae788b53dc2ec04b343239b99a.tar.gz
Retour en arriere sur le changement de la version 1.196: il utilise des traits de GNU make
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7075 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile28
1 files changed, 11 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index de1b8ac605..8345d4180f 100644
--- a/Makefile
+++ b/Makefile
@@ -122,21 +122,17 @@ defaultentry:
@echo "should work. But see the file INSTALL for more details."
# Recompile the system using the bootstrap compiler
-all: runtime ocamlc
- $(MAKE) ocamllex ocamlyacc ocamltools
- $(MAKE) library ocaml otherlibraries
- $(MAKE) camlp4out $(DEBUGGER) ocamldoc
+all: runtime ocamlc ocamllex ocamlyacc ocamltools library ocaml \
+ otherlibraries camlp4out $(DEBUGGER) ocamldoc
# The compilation of ocaml will fail if the runtime has changed.
# Never mind, just do make bootstrap to reach fixpoint again.
# Compile everything the first time
-world: coldstart
- $(MAKE) all
+world: coldstart all
# Compile also native code compiler and libraries, fast
-world.opt: coldstart
- $(MAKE) opt.opt
+world.opt: coldstart opt.opt
# Core bootstrapping cycle
coreboot:
@@ -181,8 +177,7 @@ coldstart:
ln -s ../byterun stdlib/caml; fi
# Build the core system: the minimum needed to make depend and bootstrap
-core : coldstart
- $(MAKE) ocamlc ocamllex ocamlyacc ocamltools library
+core : coldstart ocamlc ocamllex ocamlyacc ocamltools library
# Save the current bootstrap compiler
MAXSAVED=boot/Saved/Saved.prev/Saved.prev/Saved.prev/Saved.prev/Saved.prev
@@ -228,13 +223,12 @@ cleanboot:
# Compile the native-code compiler
opt-core:runtimeopt ocamlopt libraryopt
-opt: runtimeopt ocamlopt
- $(MAKE) libraryopt otherlibrariesopt camlp4opt
+opt: runtimeopt ocamlopt libraryopt otherlibrariesopt camlp4opt
# Native-code versions of the tools
opt.opt: checkstack core ocaml opt-core ocamlc.opt otherlibraries camlp4out \
- $(DEBUGGER) ocamldoc ocamlopt.opt otherlibrariesopt \
- camlp4opt ocamllex.opt ocamltoolsopt.opt camlp4optopt ocamldoc.opt
+ $(DEBUGGER) ocamldoc ocamlopt.opt otherlibrariesopt \
+ camlp4opt ocamllex.opt ocamltoolsopt.opt camlp4optopt ocamldoc.opt
# Installation
install: FORCE
@@ -610,11 +604,11 @@ alldepend::
# Camlp4
camlp4out: ocamlc
- cd camlp4; $(MAKE) -j1 all
+ cd camlp4; $(MAKE) all
camlp4opt: ocamlopt
- cd camlp4; $(MAKE) -j1 opt
+ cd camlp4; $(MAKE) opt
camlp4optopt: ocamlopt
- cd camlp4; $(MAKE) -j1 opt.opt
+ cd camlp4; $(MAKE) opt.opt
partialclean::
cd camlp4; $(MAKE) clean
alldepend::