Use ocamldep wrapper provided by findlib when appropriate

Closes #219
foretspaisibles · Jan 5, 2017 · 4e9815b · 4e9815b
1 parent c654041
commit 4e9815b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ocaml/ocaml.depend.mk b/ocaml/ocaml.depend.mk
@@ -47,6 +47,9 @@
 # do-clean-depend
 
 # Variables:
+#
+#  OCAMLDEP [ocamldep]
+#   OCaml dependency generator
 
 
 ### IMPLEMENTATION
@@ -58,6 +61,8 @@
 .if !target(__<ocaml.depend.mk>__)
 __<ocaml.depend.mk>__:
 
+OCAMLDEP?=			ocamldep
+
 .for directory in ${DIRS}
 _OCAMLDEP_FILTER_SCRIPT+=	-e "s@${directory}/*@@g"
 .endfor
@@ -95,7 +100,7 @@ OCAMLDEPFLAGS+=		-native
 
 .if defined(_OCAML_DEPEND)
 .depend: ${_OCAML_DEPEND}
-	(cd ${.CURDIR} && ocamldep ${OCAMLDEPFLAGS} ${_OCAML_DEPEND})\
+	(cd ${.CURDIR} && ${OCAMLDEP} ${OCAMLDEPFLAGS} ${_OCAML_DEPEND})\
 	  | ${_OCAMLDEP_FILTER} \
 	  > ${.TARGET}
 .else

diff --git a/ocaml/ocaml.find.mk b/ocaml/ocaml.find.mk
@@ -120,6 +120,7 @@ OCAMLFIND?=ocamlfind
 .if ${USE_OCAMLFIND} == yes
 OCAMLWHERE?= ${OCAMLFIND} ocamlc -where
 OCAMLDOC?= ${OCAMLFIND} ocamldoc
+OCAMLDEP?= ${OCAMLFIND} ocamldep
 OCAMLMKTOP?= ${OCAMLFIND} ocamlmktop -linkpkg
 .if ${WITH_PROFILE} == yes
 # Profiling case
@@ -157,7 +158,7 @@ PKGS+= threads
 
 
 .for pseudo in OCAMLCB OCAMLCN OCAMLCS OCAMLCI OCAMLLB OCAMLLN\
-	  OCAMLDOC OCAMLMKTOP
+	  OCAMLDOC OCAMLMKTOP OCAMLDEP
 .if defined(PKGS)&&!empty(PKGS)
 ${pseudo}+= -package "${PKGS}"
 .endif