summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile20
1 files changed, 13 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index c316aaa6e6..2c1545e531 100644
--- a/Makefile
+++ b/Makefile
@@ -252,6 +252,10 @@ installopt:
cd asmrun; $(MAKE) install
cp ocamlopt $(INSTALL_BINDIR)/ocamlopt$(EXE)
cd stdlib; $(MAKE) installopt
+ cp middle_end/*.cmi middle_end/*.cmt middle_end/*.cmti \
+ $(INSTALL_COMPLIBDIR)
+ cp middle_end/base_types/*.cmi middle_end/base_types/*.cmt \
+ middle_end/base_types/*.cmti $(INSTALL_COMPLIBDIR)
cp asmcomp/*.cmi asmcomp/*.cmt asmcomp/*.cmti $(INSTALL_COMPLIBDIR)
cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(INSTALL_COMPLIBDIR)
if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKE) installopt); \
@@ -314,8 +318,9 @@ ocamlc: compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma $(BYTESTART)
# The native-code compiler
-compilerlibs/ocamloptcomp.cma: $(ASMCOMP)
- $(CAMLC) -a -o $@ $(ASMCOMP)
+compilerlibs/ocamloptcomp.cma: $(MIDDLE_END) $(ASMCOMP)
+ $(CAMLC) -a -o $@ $(MIDDLE_END) $(ASMCOMP)
+
partialclean::
rm -f compilerlibs/ocamloptcomp.cma
@@ -467,8 +472,8 @@ partialclean::
# The native-code compiler compiled with itself
-compilerlibs/ocamloptcomp.cmxa: $(ASMCOMP:.cmo=.cmx)
- $(CAMLOPT) -a -o $@ $(ASMCOMP:.cmo=.cmx)
+compilerlibs/ocamloptcomp.cmxa: $(MIDDLE_END:.cmo=.cmx) $(ASMCOMP:.cmo=.cmx)
+ $(CAMLOPT) -a -o $@ $(MIDDLE_END:.cmo=.cmx) $(ASMCOMP:.cmo=.cmx)
partialclean::
rm -f compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamloptcomp.a
@@ -481,7 +486,7 @@ ocamlopt.opt: compilerlibs/ocamlcommon.cmxa compilerlibs/ocamloptcomp.cmxa \
partialclean::
rm -f ocamlopt.opt
-$(COMMON:.cmo=.cmx) $(BYTECOMP:.cmo=.cmx) $(ASMCOMP:.cmo=.cmx): ocamlopt
+$(COMMON:.cmo=.cmx) $(BYTECOMP:.cmo=.cmx) $(MIDDLE_END:.cmo=.cmx) $(ASMCOMP:.cmo=.cmx): ocamlopt
# The numeric opcodes
@@ -781,12 +786,13 @@ clean::
$(CAMLOPT) $(COMPFLAGS) -c $<
partialclean::
- for d in utils parsing typing bytecomp asmcomp driver toplevel tools; \
+ for d in utils parsing typing bytecomp asmcomp middle_end middle_end/base_types driver toplevel tools; \
do rm -f $$d/*.cm[ioxt] $$d/*.cmti $$d/*.annot $$d/*.[so] $$d/*~; done
rm -f *~
depend: beforedepend
- (for d in utils parsing typing bytecomp asmcomp driver toplevel; \
+ (for d in utils parsing typing bytecomp asmcomp middle_end \
+ middle_end/base_types driver toplevel; \
do $(CAMLDEP) $(DEPFLAGS) $$d/*.mli $$d/*.ml; \
done) > .depend