diff --git a/tools/Makefile b/tools/Makefile index c7da95d99..7ab2f11f7 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -14,18 +14,3 @@ #************************************************************************** include Makefile.shared - -# To make custom toplevels - -OCAMLMKTOP=ocamlmktop.cmo -OCAMLMKTOP_IMPORTS=misc.cmo identifiable.cmo numbers.cmo config.cmo \ - arg_helper.cmo clflags.cmo ccomp.cmo - -ocamlmktop: $(OCAMLMKTOP) - $(CAMLC) $(LINKFLAGS) -o ocamlmktop $(OCAMLMKTOP_IMPORTS) $(OCAMLMKTOP) - -install:: - cp ocamlmktop "$(INSTALL_BINDIR)/ocamlmktop$(EXE)" - -clean:: - rm -f ocamlmktop diff --git a/tools/Makefile.nt b/tools/Makefile.nt index 3a16f967f..7ab2f11f7 100644 --- a/tools/Makefile.nt +++ b/tools/Makefile.nt @@ -14,22 +14,3 @@ #************************************************************************** include Makefile.shared - -ifneq "$(wildcard ../flexdll/Makefile)" "" - CAMLOPT:=OCAML_FLEXLINK="../boot/ocamlrun ../flexdll/flexlink.exe" $(CAMLOPT) -endif - -# To make custom toplevels - -OCAMLMKTOP=ocamlmktop.cmo -OCAMLMKTOP_IMPORTS=misc.cmo identifiable.cmo numbers.cmo config.cmo \ - arg_helper.cmo clflags.cmo ccomp.cmo - -ocamlmktop: $(OCAMLMKTOP) - $(CAMLC) $(LINKFLAGS) -o ocamlmktop $(OCAMLMKTOP_IMPORTS) $(OCAMLMKTOP) - -install:: - cp ocamlmktop "$(INSTALL_BINDIR)/ocamlmktop$(EXE)" - -clean:: - rm -f ocamlmktop objinfo_helper$(EXE).manifest diff --git a/tools/Makefile.shared b/tools/Makefile.shared index 2d0611841..90096cb33 100644 --- a/tools/Makefile.shared +++ b/tools/Makefile.shared @@ -134,6 +134,21 @@ beforedepend:: ocamlmklibconfig.ml clean:: rm -f ocamlmklibconfig.ml +# To make custom toplevels + +OCAMLMKTOP=ocamlmktop.cmo +OCAMLMKTOP_IMPORTS=misc.cmo identifiable.cmo numbers.cmo config.cmo \ + arg_helper.cmo clflags.cmo ccomp.cmo + +ocamlmktop: $(OCAMLMKTOP) + $(CAMLC) $(LINKFLAGS) -o ocamlmktop $(OCAMLMKTOP_IMPORTS) $(OCAMLMKTOP) + +install:: + cp ocamlmktop "$(INSTALL_BINDIR)/ocamlmktop$(EXE)" + +clean:: + rm -f ocamlmktop + # Converter olabl/ocaml 2.99 to ocaml 3 OCAML299TO3= lexer299.cmo ocaml299to3.cmo