diff options
| author | Hilko Bengen <bengen@hilluzination.de> | 2011-08-12 01:33:39 +0200 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-08-12 09:53:34 +0100 |
| commit | af01fd9c4a385745795b5d946e41575c8b03a45c (patch) | |
| tree | a90699540777b9298d34160f1cee9768e378eb5a | |
| parent | aee8772d8c711615cec7e68666cf91a90f3e5a3c (diff) | |
| download | hivex-af01fd9c4a385745795b5d946e41575c8b03a45c.tar.gz hivex-af01fd9c4a385745795b5d946e41575c8b03a45c.tar.xz hivex-af01fd9c4a385745795b5d946e41575c8b03a45c.zip | |
More changes needed separate builddir
This patch hopefully fixes building and installing the OCaml bindings
both in-tree and out-of-tree.
-Hilko
| -rw-r--r-- | ocaml/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 89a59cd..ca4c111 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -64,8 +64,7 @@ TESTS = \ noinst_DATA += $(TESTS) # https://www.redhat.com/archives/libguestfs/2011-May/thread.html#00015 -t/%: $(srcdir)/t/%.cmo mlhivex.cma - mkdir -p t +t/%: t/%.cmo mlhivex.cma $(LIBTOOL) --mode=execute -dlopen $(top_builddir)/lib/libhivex.la \ $(OCAMLFIND) ocamlc -dllpath $(abs_builddir) -package unix \ -linkpkg mlhivex.cma $< -o $@ @@ -73,6 +72,7 @@ t/%: $(srcdir)/t/%.cmo mlhivex.cma .mli.cmi: $(OCAMLFIND) ocamlc -package unix -c $< -o $@ .ml.cmo: + mkdir -p `dirname $@` $(OCAMLFIND) ocamlc -package unix -c $< -o $@ .ml.cmx: $(OCAMLFIND) ocamlopt -package unix -c $< -o $@ @@ -89,7 +89,7 @@ include .depend SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly # Do the installation by hand, because we want to run ocamlfind. -install_files = META *.so *.a *.cma *.cmi *.mli +install_files = META *.so *.a *.cma *.cmi $(srcdir)/*.mli if HAVE_OCAMLOPT install_files += *.cmx *.cmxa |