diff options
| author | Alain Frisch <alain@frisch.fr> | 2013-08-29 12:51:03 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2013-08-29 12:51:03 +0000 |
| commit | f6e4122b855b0b4267fd5b46dac8bc1cd8a1f8bb (patch) | |
| tree | dbfac41419a5fd1f27bd2e8a118dd848e782837e | |
| parent | 76d35efd0aff69c82daa7d6ca2335f25cbaf5ceb (diff) | |
Do not compile or install by default ocamlast.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14045 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | tools/Makefile.shared | 7 |
2 files changed, 3 insertions, 11 deletions
@@ -132,7 +132,7 @@ all: $(MAKE) library $(MAKE) ocaml $(MAKE) otherlibraries $(OCAMLBUILDBYTE) $(CAMLP4OUT) $(WITH_DEBUGGER) \ - $(WITH_OCAMLDOC) moretools + $(WITH_OCAMLDOC) # Compile everything the first time world: @@ -706,9 +706,6 @@ clean:: ocamltools: ocamlc ocamlyacc ocamllex asmcomp/cmx_format.cmi cd tools; $(MAKE) all -moretools: ocamlc compilerlibs/ocamltoplevel.cma - cd tools; $(MAKE) moretools - ocamltoolsopt: ocamlopt cd tools; $(MAKE) opt @@ -858,7 +855,7 @@ distclean: .PHONY: coreboot defaultentry depend distclean install installopt .PHONY: library library-cross libraryopt .PHONY: ocamlbuild.byte ocamlbuild.native ocamldebugger ocamldoc -.PHONY: ocamldoc.opt ocamllex ocamllex.opt ocamltools ocamltoolsopt moretools +.PHONY: ocamldoc.opt ocamllex ocamllex.opt ocamltools ocamltoolsopt .PHONY: ocamltoolsopt.opt ocamlyacc opt-core opt opt.opt otherlibraries .PHONY: otherlibrariesopt package-macosx promote promote-cross .PHONY: restore runtime runtimeopt makeruntimeopt world world.opt diff --git a/tools/Makefile.shared b/tools/Makefile.shared index 9dea8448c..c6262b2e5 100644 --- a/tools/Makefile.shared +++ b/tools/Makefile.shared @@ -24,13 +24,11 @@ LINKFLAGS=$(INCLUDES) all: ocamldep ocamlprof ocamlcp ocamloptp ocamlmktop ocamlmklib dumpobj \ objinfo read_cmt -moretools: ocamlast - all: tast_iter.cmo # scrapelabels addlabels -.PHONY: all moretools +.PHONY: all opt.opt: ocamldep.opt read_cmt.opt .PHONY: opt.opt @@ -320,9 +318,6 @@ ocamlast: $(OCAMLAST) clean:: rm -rf ocamlast -install:: - cp ocamlast $(BINDIR)/ocamlast$(EXE) - # Common stuff .SUFFIXES: |