search for: 5dd2c9b

* Richard W.M. Jones: > On Fri, Feb 28, 2014 at 02:35:56PM +0100, Hilko Bengen wrote: >> diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am >> index 5dd2c9b..708b2e7 100644 >> --- a/ocaml/Makefile.am >> +++ b/ocaml/Makefile.am > [...] >> +# Tell version 3.79 and up of GNU make to not build goals in this >> +# directory in parallel. >> +.NOTPARALLEL: > > ^ This makes building the OCaml subdirectory very slow (I nor...

...-o $@ +else +common_utils_tests: common_gettext.cmo common_utils.cmo common_utils_tests.cmo + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \ + mlguestfs.cma -linkpkg $^ -cclib -lncurses -o $@ +endif TESTS_ENVIRONMENT = $(top_builddir)/run --test diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 5dd2c9b..708b2e7 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -40,7 +40,10 @@ if HAVE_OCAML OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX OCAMLOPTFLAGS = $(OCAMLCFLAGS) -noinst_DATA = mlguestfs.cma mlguestfs.cmxa META +noinst_DATA = mlguestfs.cma META +if HAVE_OCAMLOPT +noinst_DATA += mlgues...

I believe this patch has now been superseded by Hilko's commit here: https://github.com/libguestfs/libguestfs/commit/f75142c577255b30f2a8e1d27baa5fd185594197 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#)

...CAMLOPTFLAGS) \ mlguestfs.cmxa -linkpkg $^ \ -cclib '$(OCAMLCLIBS)' \ $(OCAML_GCOV_LDFLAGS) \ -o $@ +dummy: $(FINAL_BINARY) + cp -vf $< $@ + .mli.cmi: $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@ .ml.cmo: diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 5dd2c9b..43e0c59 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -37,10 +37,25 @@ CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so if HAVE_OCAML +DATA_HOOK_FILES = META *.so *.a *.cma \ + *.cmi $(srcdir)/*.mli +if HAVE_OCAMLOPT +DATA_HOOK_FILES += *.cmx *.cmxa +endif + OCAMLCFLAGS...