summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFlorian Angeletti <florian.angeletti@inria.fr>2022-07-07 10:28:54 +0200
committerFlorian Angeletti <florian.angeletti@inria.fr>2022-07-07 11:00:35 +0200
commit3e0dc3b995f42cd8ea36871d105d669b8f531e7f (patch)
tree1c5f03b65b911a1221f0d045ab25e0afbb1fa0d6 /Makefile
parentff1df71bafb95494ef3d37fe12bacb94b8f8516f (diff)
downloadocaml-3e0dc3b995f42cd8ea36871d105d669b8f531e7f.tar.gz
tools makefile: new target for secondary tools
Few tools depend on the toplevel and/or the unix and str libraries. Before this commit, those tools were using the opt.opt target as a proxy target for "after the toplevel and otherlibs". This worked fine as long as those tools are not installed in bytecode-only mode. However, this is no longer since we want to install the ocamlmktop runtime files even in bytecode-only mode. This commit therefore introduces a proper Makefile target "othertools" for those tools. Currently, this concerns caml-tex (which is not installed) and the ocamlmktop runtime library.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 19dea3d86f..6daba8eafb 100644
--- a/Makefile
+++ b/Makefile
@@ -270,7 +270,7 @@ endif
$(MAKE) ocamlopt.opt
$(MAKE) otherlibrariesopt
$(MAKE) ocamllex.opt ocamltoolsopt ocamltoolsopt.opt $(OCAMLDOC_OPT) \
- $(OCAMLTEST_OPT) ocamlnat
+ $(OCAMLTEST_OPT) othertools ocamlnat
ifeq "$(WITH_OCAMLDOC)-$(STDLIB_MANPAGES)" "ocamldoc-true"
$(MAKE) manpages
endif
@@ -310,6 +310,7 @@ all: coreall
$(MAKE) ocaml
$(MAKE) otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC) \
$(WITH_OCAMLTEST)
+ $(MAKE) othertools
ifeq "$(WITH_OCAMLDOC)-$(STDLIB_MANPAGES)" "ocamldoc-true"
$(MAKE) manpages
endif
@@ -1268,6 +1269,11 @@ ocamltoolsopt: ocamlopt
ocamltoolsopt.opt: ocamlc.opt ocamllex.opt compilerlibs/ocamlmiddleend.cmxa
$(MAKE) -C tools opt.opt
+# tools that require a full ocaml distribution: otherlibs and toplevel
+.PHONY:othertools
+othertools:
+ $(MAKE) -C tools othertools
+
partialclean::
$(MAKE) -C tools clean