From e3acf93ce9e87ce308cf50a4f41408b25dd910e9 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Mon, 8 Nov 2010 22:35:13 +0000 Subject: [PATCH] Revert "Remove ocaml/.depend from git." This reverts commit 064569bcbf854a9cf588ce31851d987d5f114ec8. This commit does the wrong thing: creating an empty ocaml/.depend file is wrong because building the OCaml bindings will fail. Not having this file will prevent automake from running. Therefore this file has to exist with the correct content in git. --- .gitignore | 1 - bootstrap | 4 ---- ocaml/.depend | 5 +++++ 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 ocaml/.depend diff --git a/.gitignore b/.gitignore index ad44a7a..d42898a 100644 --- a/.gitignore +++ b/.gitignore @@ -170,7 +170,6 @@ Makefile Makefile.in missing *.o -ocaml/.depend ocaml/bindtests ocaml/bindtests.ml ocaml/dllmlguestfs.so diff --git a/bootstrap b/bootstrap index 5ceac31..c2507fc 100755 --- a/bootstrap +++ b/bootstrap @@ -85,9 +85,5 @@ $gnulib_tool \ --tests-base=gnulib/tests \ --import $modules -# ocaml/.depend is updated automatically. However, as it's included by -# ocaml/Makefile.am we need to bootstrap it here. -touch ocaml/.depend - # Disable autopoint and libtoolize, since they were already done above. AUTOPOINT=true LIBTOOLIZE=true autoreconf --verbose --install diff --git a/ocaml/.depend b/ocaml/.depend new file mode 100644 index 0000000..cc3febf --- /dev/null +++ b/ocaml/.depend @@ -0,0 +1,5 @@ +bindtests.cmo: guestfs.cmi +bindtests.cmx: guestfs.cmx +guestfs.cmi: +guestfs.cmo: guestfs.cmi +guestfs.cmx: guestfs.cmi -- 1.8.3.1