diff options
| author | Hilko Bengen <bengen@hilluzination.de> | 2011-05-09 09:08:17 +0200 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-05-09 14:24:38 +0100 |
| commit | 46bdd955670a5a6b29a6e4ec7d3c63d37f853a92 (patch) | |
| tree | 52e8729ff318fc2374ab576e2a79e880cbc2c3cd | |
| parent | b84194b377ed3cf42b45c30a388dcda7af3bfae3 (diff) | |
| download | hivex-46bdd955670a5a6b29a6e4ec7d3c63d37f853a92.tar.gz hivex-46bdd955670a5a6b29a6e4ec7d3c63d37f853a92.tar.xz hivex-46bdd955670a5a6b29a6e4ec7d3c63d37f853a92.zip | |
Don't rely on OCaml native compiler for tests
This should make it possible to build useful OCaml bindings on
architectures other than i386 and amd64 (Debian bug #589809).
| -rw-r--r-- | ocaml/Makefile.am | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index b3f5e14..b9451e3 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -46,7 +46,7 @@ hivex_c.o: hivex_c.c $(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $< TESTS_ENVIRONMENT = \ - LD_LIBRARY_PATH=$(top_builddir)/lib/.libs \ + LD_LIBRARY_PATH=$(top_builddir)/lib/.libs:$(top_builddir)/ocaml \ $(VG) TESTS = \ @@ -59,33 +59,33 @@ TESTS = \ t/hivex_300_fold noinst_DATA += $(TESTS) -t/hivex_005_load: t/hivex_005_load.cmx mlhivex.cmxa +t/hivex_005_load: t/hivex_005_load.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ -t/hivex_010_open: t/hivex_010_open.cmx mlhivex.cmxa +t/hivex_010_open: t/hivex_010_open.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ -t/hivex_020_root: t/hivex_020_root.cmx mlhivex.cmxa +t/hivex_020_root: t/hivex_020_root.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ -t/hivex_100_errors: t/hivex_100_errors.cmx mlhivex.cmxa +t/hivex_100_errors: t/hivex_100_errors.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(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.cmx mlhivex.cmxa +t/hivex_110_gc_handle: t/hivex_110_gc_handle.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ -t/hivex_200_write: t/hivex_200_write.cmx mlhivex.cmxa +t/hivex_200_write: t/hivex_200_write.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ -t/hivex_300_fold: t/hivex_300_fold.cmx mlhivex.cmxa +t/hivex_300_fold: t/hivex_300_fold.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(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. |