diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-05-12 12:25:21 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-05-12 12:31:40 +0100 |
| commit | 2cf6eef8ff7b7ab642943e67183f0d7491c69f9d (patch) | |
| tree | 48c09c57702286810566e3406c2560f8e35f4131 | |
| parent | 4d58fba74c716ccbe85bf46bf89bebe76a79be0b (diff) | |
| download | hivex-2cf6eef8ff7b7ab642943e67183f0d7491c69f9d.tar.gz hivex-2cf6eef8ff7b7ab642943e67183f0d7491c69f9d.tar.xz hivex-2cf6eef8ff7b7ab642943e67183f0d7491c69f9d.zip | |
ocaml: Use libtool to get correct library to build OCaml tests.
See this thread:
https://www.redhat.com/archives/libguestfs/2011-May/thread.html#00015
Thanks to Hilko Bengen and Török Edwin for coming up with this fix.
| -rw-r--r-- | ocaml/Makefile.am | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index fee3b88..e61b5db 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -63,38 +63,11 @@ TESTS = \ t/hivex_300_fold noinst_DATA += $(TESTS) -t/hivex_005_load: t/hivex_005_load.cmo mlhivex.cma - mkdir -p t - $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ - -t/hivex_010_open: t/hivex_010_open.cmo mlhivex.cma - mkdir -p t - $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ - -t/hivex_020_root: t/hivex_020_root.cmo mlhivex.cma - mkdir -p t - $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ - -t/hivex_100_errors: t/hivex_100_errors.cmo mlhivex.cma - mkdir -p t - $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ - -t/hivex_110_gc_handle: t/hivex_110_gc_handle.cmo mlhivex.cma - mkdir -p t - $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ - -t/hivex_200_write: t/hivex_200_write.cmo mlhivex.cma - mkdir -p t - $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ - -t/hivex_300_fold: t/hivex_300_fold.cmo mlhivex.cma - mkdir -p t - $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ - -# Need to rebuild the tests from source if the main library has -# changed at all, otherwise we get inconsistent assumptions. -t/%.cmx: t/%.ml mlhivex.cmxa - $(OCAMLFIND) ocamlopt -package unix -linkpkg -c $< -o $@ +# https://www.redhat.com/archives/libguestfs/2011-May/thread.html#00015 +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 $@ .mli.cmi: $(OCAMLFIND) ocamlc -package unix -c $< -o $@ |