summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 4 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 0a8b05373..a4bf9269a 100644
--- a/Makefile
+++ b/Makefile
@@ -30,11 +30,6 @@ CAMLRUN=byterun/ocamlrun
SHELL=/bin/sh
MKDIR=mkdir -p
-OCAMLBUILDBYTE=$(WITH_OCAMLBUILD:=.byte)
-OCAMLBUILDNATIVE=$(WITH_OCAMLBUILD:=.native)
-
-OCAMLDOC_OPT=$(WITH_OCAMLDOC:=.opt)
-
INCLUDES=-I utils -I parsing -I typing -I bytecomp -I asmcomp -I driver \
-I toplevel
@@ -145,8 +140,7 @@ all:
$(MAKE) runtime
$(MAKE) coreall
$(MAKE) ocaml
- $(MAKE) otherlibraries $(OCAMLBUILDBYTE) $(WITH_DEBUGGER) \
- $(WITH_OCAMLDOC)
+ $(MAKE) otherlibraries
# Compile everything the first time
world:
@@ -287,12 +281,10 @@ opt.opt:
$(MAKE) ocaml
$(MAKE) opt-core
$(MAKE) ocamlc.opt
- $(MAKE) otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC) \
- $(OCAMLBUILDBYTE)
+ $(MAKE) otherlibraries
$(MAKE) ocamlopt.opt
$(MAKE) otherlibrariesopt
- $(MAKE) ocamllex.opt ocamltoolsopt ocamltoolsopt.opt $(OCAMLDOC_OPT) \
- $(OCAMLBUILDNATIVE)
+ $(MAKE) ocamllex.opt ocamltoolsopt ocamltoolsopt.opt
base.opt:
$(MAKE) checkstack
@@ -301,8 +293,7 @@ base.opt:
$(MAKE) ocaml
$(MAKE) opt-core
$(MAKE) ocamlc.opt
- $(MAKE) otherlibraries $(OCAMLBUILDBYTE) $(WITH_DEBUGGER) \
- $(WITH_OCAMLDOC)
+ $(MAKE) otherlibraries
$(MAKE) ocamlopt.opt
$(MAKE) otherlibrariesopt