diff options
| -rw-r--r-- | camlp4/camlp4/.depend | 1 | ||||
| -rw-r--r-- | camlp4/etc/.depend | 10 | ||||
| -rw-r--r-- | camlp4/etc/pr_depend.ml | 1 | ||||
| -rw-r--r-- | camlp4/lib/Makefile | 4 | ||||
| -rw-r--r-- | camlp4/meta/pa_ifdef.ml | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/camlp4/camlp4/.depend b/camlp4/camlp4/.depend index aa6eb1b8e..3f2d833e5 100644 --- a/camlp4/camlp4/.depend +++ b/camlp4/camlp4/.depend @@ -1,3 +1,4 @@ +ast2pt.cmi: mLast.cmi pcaml.cmi: mLast.cmi spretty.cmi quotation.cmi: mLast.cmi reloc.cmi: mLast.cmi diff --git a/camlp4/etc/.depend b/camlp4/etc/.depend index 8d4c5cb5f..d88555dc5 100644 --- a/camlp4/etc/.depend +++ b/camlp4/etc/.depend @@ -1,9 +1,3 @@ -ingram.cmo: ../camlp4/mLast.cmi -ingram.cmx: ../camlp4/mLast.cmi -outgram.cmo: ../camlp4/pcaml.cmi -outgram.cmx: ../camlp4/pcaml.cmx -pa_cl.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi -pa_cl.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx pa_extfun.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pa_extfun.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx pa_format.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi @@ -14,6 +8,10 @@ pa_lisp.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pa_lisp.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx pa_lispr.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pa_lispr.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx +pa_ocamllex.cmo: ../../lex/compact.cmi ../../lex/lexgen.cmi \ + ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../../lex/syntax.cmi +pa_ocamllex.cmx: ../../lex/compact.cmx ../../lex/lexgen.cmx \ + ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../../lex/syntax.cmx pa_olabl.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pa_olabl.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx pa_o.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi diff --git a/camlp4/etc/pr_depend.ml b/camlp4/etc/pr_depend.ml index 1796ed9bb..5f9ff9b98 100644 --- a/camlp4/etc/pr_depend.ml +++ b/camlp4/etc/pr_depend.ml @@ -110,6 +110,7 @@ value rec expr = | ExInt _ _ -> () | ExFlo _ _ -> () | ExLab _ _ e -> expr e + | ExLaz _ e -> expr e | ExLet _ _ pel e -> do { list let_binding pel; expr e; } | ExLid _ _ -> () | ExLmd _ _ me e -> do { module_expr me; expr e; } diff --git a/camlp4/lib/Makefile b/camlp4/lib/Makefile index 46591ddce..e66920af8 100644 --- a/camlp4/lib/Makefile +++ b/camlp4/lib/Makefile @@ -44,9 +44,9 @@ install: installopt: cp $(TARGET:.cma=.cmxa) *.cmx $(LIBDIR)/camlp4/. if test -f $(TARGET:.cma=.lib); then \ - cp $(TARGET:.cma=.lib) $(LIBDIR)/camlp4/.; \ + cp $(TARGET:.cma=.lib) $(LIBDIR)/camlp4/.; \ else \ - tar cf - $(TARGET:.cma=.a) | (cd $(LIBDIR)/camlp4/.; tar xf -); \ + tar cf - $(TARGET:.cma=.a) | (cd $(LIBDIR)/camlp4/.; tar xf -); \ fi include .depend diff --git a/camlp4/meta/pa_ifdef.ml b/camlp4/meta/pa_ifdef.ml index e36658049..5154ef809 100644 --- a/camlp4/meta/pa_ifdef.ml +++ b/camlp4/meta/pa_ifdef.ml @@ -9,7 +9,7 @@ value list_remove x l = List.fold_right (fun e l -> if e = x then l else [e :: l]) l [] ; -value defined = ref ["CAMLP4_300"; "NEWSEQ"]; +value defined = ref ["OCAML_305"; "NEWSEQ"]; value define x = defined.val := [x :: defined.val]; value undef x = defined.val := list_remove x defined.val; |