diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2016-04-06 19:26:25 +0100 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2016-04-06 19:30:56 +0100 |
| commit | cd729b2510a62697a6b461fff48aebbd5c13b868 (patch) | |
| tree | d440060a430844005593252aede2e3825dda1375 /lex | |
| parent | 275dcad6fac5b32e88b784b263259aa9b3336deb (diff) | |
| download | ocaml-cd729b2510a62697a6b461fff48aebbd5c13b868.tar.gz | |
Fix faults arising from merging Makefile{,.nt}
Bootstrapping FlexDLL broken for lex and tools.
Diffstat (limited to 'lex')
| -rw-r--r-- | lex/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lex/Makefile b/lex/Makefile index a8ac9a7ed2..ea6f2be2ab 100644 --- a/lex/Makefile +++ b/lex/Makefile @@ -18,6 +18,8 @@ include ../config/Makefile CAMLRUN ?= ../boot/ocamlrun CAMLYACC ?= ../boot/ocamlyacc +ROOTDIR=.. + ifeq "$(wildcard $(ROOTDIR)/flexdll/Makefile)" "" export OCAML_FLEXLINK:= else @@ -47,7 +49,7 @@ ocamllex.opt: $(OBJS:.cmo=.cmx) clean:: rm -f ocamllex ocamllex.opt - rm -f *.cmo *.cmi *.cmx *.cmt *.cmti *.o *~ + rm -f *.cmo *.cmi *.cmx *.cmt *.cmti *.$(O) *~ parser.ml parser.mli: parser.mly $(CAMLYACC) $(YACCFLAGS) parser.mly |