Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move more stuff into Makefile.shared in order to fix the build on Windows.

master
alainfrisch 2016-02-11 10:34:36 +01:00
parent bde2bdd206
commit 6661919762
3 changed files with 32 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile
View File

@ -12,6 +12,7 @@
# The main Makefile
MAKEREC=$(MAKE)
include Makefile.shared
SHELL=/bin/sh
@ -309,14 +310,6 @@ ocamlc: compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma $(BYTESTART)
$(CAMLC) $(LINKFLAGS) -compat-32 -o ocamlc \
compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma $(BYTESTART)
# The middle end (whose .cma library is currently only used for linking
# the "objinfo" program, since we cannot depend on the whole native code
# compiler for "make world" and the list of dependencies for
# asmcomp/export_info.cmo is long).
compilerlibs/ocamlmiddleend.cma: $(MIDDLE_END)
$(CAMLC) -a -o $@ $(MIDDLE_END)
# The native-code compiler
compilerlibs/ocamloptcomp.cma: $(MIDDLE_END) $(ASMCOMP)
@ -661,26 +654,6 @@ ocamlyacc:
clean::
cd yacc; $(MAKE) clean
# Tools
ocamltools: ocamlc ocamlyacc ocamllex asmcomp/cmx_format.cmi \
asmcomp/printclambda.cmo compilerlibs/ocamlmiddleend.cma \
asmcomp/export_info.cmo
cd tools; $(MAKE) all
ocamltoolsopt: ocamlopt
cd tools; $(MAKE) opt
ocamltoolsopt.opt: ocamlc.opt ocamlyacc ocamllex asmcomp/cmx_format.cmi \
asmcomp/printclambda.cmx
cd tools; $(MAKE) opt.opt
partialclean::
cd tools; $(MAKE) clean
alldepend::
cd tools; $(MAKE) depend
# OCamldoc
ocamldoc: ocamlc ocamlyacc ocamllex otherlibraries

18
Makefile.nt
View File

@ -603,24 +603,6 @@ ocamlyacc:
clean::
cd yacc ; $(MAKEREC) clean
# Tools
ocamltools: ocamlc ocamlyacc ocamllex asmcomp/cmx_format.cmi \
asmcomp/printclambda.cmo
cd tools ; $(MAKEREC) all
ocamltoolsopt:
cd tools ; $(MAKEREC) opt
ocamltoolsopt.opt: ocamlc.opt ocamlyacc ocamllex asmcomp/cmx_format.cmi \
asmcomp/printclambda.cmx
cd tools ; $(MAKEREC) opt.opt
partialclean::
cd tools ; $(MAKEREC) clean
alldepend::
cd tools ; $(MAKEREC) depend
# OCamldoc
ocamldoc:

31
Makefile.shared
View File

@ -204,3 +204,34 @@ TOPLEVELSTART=toplevel/topstart.cmo
OPTTOPLEVELSTART=toplevel/opttopstart.cmo
PERVASIVES=$(STDLIB_MODULES) outcometree topdirs toploop
# The middle end (whose .cma library is currently only used for linking
# the "objinfo" program, since we cannot depend on the whole native code
# compiler for "make world" and the list of dependencies for
# asmcomp/export_info.cmo is long).
compilerlibs/ocamlmiddleend.cma: $(MIDDLE_END)
$(CAMLC) -a -o $@ $(MIDDLE_END)
# Tools
ocamltools: ocamlc ocamlyacc ocamllex asmcomp/cmx_format.cmi \
asmcomp/printclambda.cmo compilerlibs/ocamlmiddleend.cma \
asmcomp/export_info.cmo
cd tools ; $(MAKEREC) all
ocamltoolsopt: ocamlopt
cd tools; $(MAKEREC) opt
ocamltoolsopt.opt: ocamlc.opt ocamlyacc ocamllex asmcomp/cmx_format.cmi \
asmcomp/printclambda.cmx
cd tools; $(MAKEREC) opt.opt
partialclean::
cd tools; $(MAKEREC) clean
alldepend::
cd tools; $(MAKEREC) depend