tools/Makefile{,.nt,.shared}: merge.

master
whitequark 2016-03-13 05:11:10 +00:00 committed by alainfrisch
parent b08a1a2ed8
commit f1adf551d4
3 changed files with 15 additions and 34 deletions

View File

@ -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

View File

@ -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

View File

@ -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