-

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4391 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

12 files changed, 66 insertions, 30 deletions

diff --git a/camlp4/camlp4/.depend b/camlp4/camlp4/.depend
index 3f2d833e5..43e8e8b14 100644
--- a/camlp4/camlp4/.depend
+++ b/camlp4/camlp4/.depend
@@ -1,13 +1,22 @@
-ast2pt.cmi: mLast.cmi 
+ast2pt.cmi: $(OTOP)/parsing/location.cmi $(OTOP)/parsing/longident.cmi mLast.cmi \
+    $(OTOP)/parsing/parsetree.cmi 
 pcaml.cmi: mLast.cmi spretty.cmi 
 quotation.cmi: mLast.cmi 
 reloc.cmi: mLast.cmi 
-argl.cmo: ast2pt.cmi mLast.cmi pcaml.cmi 
-argl.cmx: ast2pt.cmx mLast.cmi pcaml.cmx 
-ast2pt.cmo: mLast.cmi ast2pt.cmi 
-ast2pt.cmx: mLast.cmi ast2pt.cmi 
-pcaml.cmo: ast2pt.cmi mLast.cmi quotation.cmi reloc.cmi spretty.cmi pcaml.cmi 
-pcaml.cmx: ast2pt.cmx mLast.cmi quotation.cmx reloc.cmx spretty.cmx pcaml.cmi 
+argl.cmo: ast2pt.cmi mLast.cmi ../odyl/odyl_main.cmi pcaml.cmi 
+argl.cmx: ast2pt.cmx mLast.cmi ../odyl/odyl_main.cmx pcaml.cmx 
+ast2pt.cmo: $(OTOP)/parsing/asttypes.cmi $(OTOP)/parsing/location.cmi \
+    $(OTOP)/parsing/longident.cmi mLast.cmi $(OTOP)/parsing/parsetree.cmi \
+    ast2pt.cmi 
+ast2pt.cmx: $(OTOP)/parsing/asttypes.cmi $(OTOP)/parsing/location.cmx \
+    $(OTOP)/parsing/longident.cmx mLast.cmi $(OTOP)/parsing/parsetree.cmi \
+    ast2pt.cmi 
+crc.cmo: $(OTOP)/otherlibs/dynlink/dynlink.cmi 
+crc.cmx: $(OTOP)/otherlibs/dynlink/dynlink.cmx 
+pcaml.cmo: ast2pt.cmi $(OTOP)/utils/config.cmi mLast.cmi quotation.cmi \
+    reloc.cmi spretty.cmi pcaml.cmi 
+pcaml.cmx: ast2pt.cmx $(OTOP)/utils/config.cmx mLast.cmi quotation.cmx \
+    reloc.cmx spretty.cmx pcaml.cmi 
 quotation.cmo: mLast.cmi quotation.cmi 
 quotation.cmx: mLast.cmi quotation.cmi 
 reloc.cmo: mLast.cmi reloc.cmi 
diff --git a/camlp4/camlp4/Makefile b/camlp4/camlp4/Makefile
index e2fa88577..ddfc3daee 100644
--- a/camlp4/camlp4/Makefile
+++ b/camlp4/camlp4/Makefile
@@ -49,7 +49,8 @@ depend:
 	cp .depend .depend.bak
 	> .depend
 	@for i in *.mli *.ml; do \
-	  ../tools/apply.sh pr_depend.cmo -- $$i >> .depend; \
+	  ../tools/apply.sh pr_depend.cmo -- $(INCLUDES) $$i | \
+	  sed -e 's| \.\./\.\.| $$(OTOP)|g' >> .depend; \
 	done
 
 promote:
diff --git a/camlp4/etc/.depend b/camlp4/etc/.depend
index d88555dc5..c9187e9c7 100644
--- a/camlp4/etc/.depend
+++ b/camlp4/etc/.depend
@@ -8,10 +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_ocamllex.cmo: $(OTOP)/lex/compact.cmi $(OTOP)/lex/lexgen.cmi \
+    ../camlp4/mLast.cmi ../camlp4/pcaml.cmi $(OTOP)/lex/syntax.cmi 
+pa_ocamllex.cmx: $(OTOP)/lex/compact.cmx $(OTOP)/lex/lexgen.cmx \
+    ../camlp4/mLast.cmi ../camlp4/pcaml.cmx $(OTOP)/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/Makefile b/camlp4/etc/Makefile
index cf4585859..30aa07fd1 100644
--- a/camlp4/etc/Makefile
+++ b/camlp4/etc/Makefile
@@ -45,7 +45,8 @@ depend:
 	cp .depend .depend.bak
 	> .depend
 	@for i in *.mli *.ml; do \
-	  ../tools/apply.sh pr_depend.cmo -- $(INCLUDES) $$i >> .depend; \
+	  ../tools/apply.sh pr_depend.cmo -- $(INCLUDES) $$i | \
+	  sed -e 's| \.\./\.\.| $$(OTOP)|g' >> .depend; \
 	done
 
 get_promote:
diff --git a/camlp4/ocaml_src/camlp4/.depend b/camlp4/ocaml_src/camlp4/.depend
index 3f2d833e5..43e8e8b14 100644
--- a/camlp4/ocaml_src/camlp4/.depend
+++ b/camlp4/ocaml_src/camlp4/.depend
@@ -1,13 +1,22 @@
-ast2pt.cmi: mLast.cmi 
+ast2pt.cmi: $(OTOP)/parsing/location.cmi $(OTOP)/parsing/longident.cmi mLast.cmi \
+    $(OTOP)/parsing/parsetree.cmi 
 pcaml.cmi: mLast.cmi spretty.cmi 
 quotation.cmi: mLast.cmi 
 reloc.cmi: mLast.cmi 
-argl.cmo: ast2pt.cmi mLast.cmi pcaml.cmi 
-argl.cmx: ast2pt.cmx mLast.cmi pcaml.cmx 
-ast2pt.cmo: mLast.cmi ast2pt.cmi 
-ast2pt.cmx: mLast.cmi ast2pt.cmi 
-pcaml.cmo: ast2pt.cmi mLast.cmi quotation.cmi reloc.cmi spretty.cmi pcaml.cmi 
-pcaml.cmx: ast2pt.cmx mLast.cmi quotation.cmx reloc.cmx spretty.cmx pcaml.cmi 
+argl.cmo: ast2pt.cmi mLast.cmi ../odyl/odyl_main.cmi pcaml.cmi 
+argl.cmx: ast2pt.cmx mLast.cmi ../odyl/odyl_main.cmx pcaml.cmx 
+ast2pt.cmo: $(OTOP)/parsing/asttypes.cmi $(OTOP)/parsing/location.cmi \
+    $(OTOP)/parsing/longident.cmi mLast.cmi $(OTOP)/parsing/parsetree.cmi \
+    ast2pt.cmi 
+ast2pt.cmx: $(OTOP)/parsing/asttypes.cmi $(OTOP)/parsing/location.cmx \
+    $(OTOP)/parsing/longident.cmx mLast.cmi $(OTOP)/parsing/parsetree.cmi \
+    ast2pt.cmi 
+crc.cmo: $(OTOP)/otherlibs/dynlink/dynlink.cmi 
+crc.cmx: $(OTOP)/otherlibs/dynlink/dynlink.cmx 
+pcaml.cmo: ast2pt.cmi $(OTOP)/utils/config.cmi mLast.cmi quotation.cmi \
+    reloc.cmi spretty.cmi pcaml.cmi 
+pcaml.cmx: ast2pt.cmx $(OTOP)/utils/config.cmx mLast.cmi quotation.cmx \
+    reloc.cmx spretty.cmx pcaml.cmi 
 quotation.cmo: mLast.cmi quotation.cmi 
 quotation.cmx: mLast.cmi quotation.cmi 
 reloc.cmo: mLast.cmi reloc.cmi 
diff --git a/camlp4/ocaml_src/camlp4/Makefile b/camlp4/ocaml_src/camlp4/Makefile
index d97780801..39d96b15f 100644
--- a/camlp4/ocaml_src/camlp4/Makefile
+++ b/camlp4/ocaml_src/camlp4/Makefile
@@ -49,7 +49,8 @@ depend:
 	cp .depend .depend.bak
 	> .depend
 	@for i in *.mli *.ml; do \
-	  ../tools/apply.sh pr_depend.cmo -- $$i >> .depend; \
+	  ../tools/apply.sh pr_depend.cmo -- $(INCLUDES) $$i | \
+	  sed -e 's| \.\./\.\.| $$(OTOP)|g' >> .depend; \
 	done
 
 promote:
diff --git a/camlp4/ocaml_src/odyl/.depend b/camlp4/ocaml_src/odyl/.depend
index c09099d3e..48e400b05 100644
--- a/camlp4/ocaml_src/odyl/.depend
+++ b/camlp4/ocaml_src/odyl/.depend
@@ -1,4 +1,6 @@
-odyl_main.cmo: odyl_config.cmo odyl_main.cmi 
-odyl_main.cmx: odyl_config.cmx odyl_main.cmi 
+odyl_main.cmo: $(OTOP)/otherlibs/dynlink/dynlink.cmi odyl_config.cmo \
+    odyl_main.cmi 
+odyl_main.cmx: $(OTOP)/otherlibs/dynlink/dynlink.cmx odyl_config.cmx \
+    odyl_main.cmi 
 odyl.cmo: odyl_config.cmo odyl_main.cmi 
 odyl.cmx: odyl_config.cmx odyl_main.cmx 
diff --git a/camlp4/ocaml_src/odyl/Makefile b/camlp4/ocaml_src/odyl/Makefile
index 999aa8666..66e75b7c3 100644
--- a/camlp4/ocaml_src/odyl/Makefile
+++ b/camlp4/ocaml_src/odyl/Makefile
@@ -41,7 +41,8 @@ depend:
 	cp .depend .depend.bak
 	> .depend
 	@for i in *.mli *.ml; do \
-	  ../tools/apply.sh pr_depend.cmo -- $$i >> .depend; \
+	  ../tools/apply.sh pr_depend.cmo -- $(INCLUDES) $$i | \
+	  sed -e 's| \.\./\.\.| $$(OTOP)|g' >> .depend; \
 	done
 
 promote:
diff --git a/camlp4/odyl/.depend b/camlp4/odyl/.depend
index c09099d3e..48e400b05 100644
--- a/camlp4/odyl/.depend
+++ b/camlp4/odyl/.depend
@@ -1,4 +1,6 @@
-odyl_main.cmo: odyl_config.cmo odyl_main.cmi 
-odyl_main.cmx: odyl_config.cmx odyl_main.cmi 
+odyl_main.cmo: $(OTOP)/otherlibs/dynlink/dynlink.cmi odyl_config.cmo \
+    odyl_main.cmi 
+odyl_main.cmx: $(OTOP)/otherlibs/dynlink/dynlink.cmx odyl_config.cmx \
+    odyl_main.cmi 
 odyl.cmo: odyl_config.cmo odyl_main.cmi 
 odyl.cmx: odyl_config.cmx odyl_main.cmx 
diff --git a/camlp4/odyl/Makefile b/camlp4/odyl/Makefile
index ed7997140..7b2c7d0b3 100644
--- a/camlp4/odyl/Makefile
+++ b/camlp4/odyl/Makefile
@@ -41,7 +41,8 @@ depend:
 	cp .depend .depend.bak
 	> .depend
 	@for i in *.mli *.ml; do \
-	  ../tools/apply.sh pr_depend.cmo -- $$i >> .depend; \
+	  ../tools/apply.sh pr_depend.cmo -- $(INCLUDES) $$i | \
+	  sed -e 's| \.\./\.\.| $$(OTOP)|g' >> .depend; \
 	done
 
 promote:
diff --git a/camlp4/top/.depend b/camlp4/top/.depend
index 53a9ac37a..b1dd416b1 100644
--- a/camlp4/top/.depend
+++ b/camlp4/top/.depend
@@ -1,2 +1,10 @@
-camlp4_top.cmo: ../camlp4/ast2pt.cmi ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-camlp4_top.cmx: ../camlp4/ast2pt.cmx ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
+camlp4_top.cmo: ../camlp4/ast2pt.cmi ../camlp4/mLast.cmi \
+    $(OTOP)/parsing/parsetree.cmi ../camlp4/pcaml.cmi \
+    $(OTOP)/toplevel/topdirs.cmi $(OTOP)/toplevel/toploop.cmi \
+    $(OTOP)/utils/warnings.cmi 
+camlp4_top.cmx: ../camlp4/ast2pt.cmx ../camlp4/mLast.cmi \
+    $(OTOP)/parsing/parsetree.cmi ../camlp4/pcaml.cmx \
+    $(OTOP)/toplevel/topdirs.cmx $(OTOP)/toplevel/toploop.cmx \
+    $(OTOP)/utils/warnings.cmx 
+rprint.cmo: $(OTOP)/typing/outcometree.cmi $(OTOP)/toplevel/toploop.cmi 
+rprint.cmx: $(OTOP)/typing/outcometree.cmi $(OTOP)/toplevel/toploop.cmx 
diff --git a/camlp4/top/Makefile b/camlp4/top/Makefile
index bbca92b2e..0c89efdb9 100644
--- a/camlp4/top/Makefile
+++ b/camlp4/top/Makefile
@@ -35,7 +35,8 @@ depend:
 	cp .depend .depend.bak
 	> .depend
 	@for i in *.mli *.ml; do \
-	  ../tools/apply.sh pr_depend.cmo -- -I ../camlp4 -I ../boot $$i >> .depend; \
+	  ../tools/apply.sh pr_depend.cmo -- $(INCLUDES) $$i | \
+	  sed -e 's| \.\./\.\.| $$(OTOP)|g' >> .depend; \
 	done
 
 get_promote: