diff options
Diffstat (limited to 'ocamlbuild/Makefile')
| -rw-r--r-- | ocamlbuild/Makefile | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/ocamlbuild/Makefile b/ocamlbuild/Makefile index b40d0eada..7ca7d52cb 100644 --- a/ocamlbuild/Makefile +++ b/ocamlbuild/Makefile @@ -10,17 +10,10 @@ # # ######################################################################### -include ../config/Makefile - -ROOTDIR = .. -OCAMLRUN = $(ROOTDIR)/boot/ocamlrun -OCAMLC = $(OCAMLRUN) $(ROOTDIR)/ocamlc -nostdlib -I $(ROOTDIR)/stdlib -OCAMLOPT = $(OCAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib -OCAMLDEP = $(OCAMLRUN) $(ROOTDIR)/tools/ocamldep -OCAMLLEX = $(OCAMLRUN) $(ROOTDIR)/boot/ocamllex +include Makefile.local + CP = cp -COMPFLAGS= -warn-error A -w L -w R -w Z -I ../otherlibs/$(UNIXLIB) -safe-string -LINKFLAGS= -I ../otherlibs/$(UNIXLIB) +COMPFLAGS= -warn-error A -w L -w R -w Z -safe-string PACK_CMO=\ const.cmo \ @@ -98,15 +91,15 @@ allopt: ocamlbuild.native ocamlbuildlib.cmxa # The executables ocamlbuild.byte: ocamlbuild_pack.cmo $(EXTRA_CMO) ocamlbuild.cmo - $(OCAMLC) $(LINKFLAGS) -o ocamlbuild.byte \ + $(OCAMLC) -o ocamlbuild.byte \ unix.cma ocamlbuild_pack.cmo $(EXTRA_CMO) ocamlbuild.cmo ocamlbuildlight.byte: ocamlbuild_pack.cmo ocamlbuildlight.cmo - $(OCAMLC) $(LINKFLAGS) -o ocamlbuildlight.byte \ + $(OCAMLC) -o ocamlbuildlight.byte \ ocamlbuild_pack.cmo ocamlbuildlight.cmo ocamlbuild.native: ocamlbuild_pack.cmx $(EXTRA_CMX) ocamlbuild.cmx - $(OCAMLOPT) $(LINKFLAGS) -o ocamlbuild.native \ + $(OCAMLOPT) -o ocamlbuild.native \ unix.cmxa ocamlbuild_pack.cmx $(EXTRA_CMX) ocamlbuild.cmx # The libraries @@ -133,7 +126,7 @@ ocamlbuild_pack.cmx: $(PACK_CMX) # The config file -ocamlbuild_config.ml: ../config/Makefile +ocamlbuild_config.ml: (echo 'let bindir = "$(BINDIR)"'; \ echo 'let libdir = "$(LIBDIR)"'; \ echo 'let supports_shared_libraries = $(SUPPORTS_SHARED_LIBRARIES)';\ |