From d332931de1e874ee398bb88c88bd3d7850cba91f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 3 Jun 2016 14:21:59 +0100 Subject: [PATCH] mllib: Fix other places where Dev_t module must be linked to Common_utils. Fixes commit df7a33768eab2381b958ede2c8a40bc9cbc87928. (cherry picked from commit c97ca67a5c000dac24fdd3f3f749e77501eecd3f) --- mllib/Makefile.am | 9 ++++++++- v2v/test-harness/Makefile.am | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mllib/Makefile.am b/mllib/Makefile.am index e44abed..e0f1987 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -136,10 +136,17 @@ libdir.ml: Makefile # Tests. -common_utils_tests_SOURCES = dummy.c +common_utils_tests_SOURCES = \ + dev_t-c.c \ + dummy.c +common_utils_tests_CPPFLAGS = \ + -I. \ + -I$(top_builddir) \ + -I$(shell $(OCAMLC) -where) common_utils_tests_BOBJECTS = \ guestfs_config.cmo \ common_gettext.cmo \ + dev_t.cmo \ common_utils.cmo \ common_utils_tests.cmo common_utils_tests_XOBJECTS = $(common_utils_tests_BOBJECTS:.cmo=.cmx) diff --git a/v2v/test-harness/Makefile.am b/v2v/test-harness/Makefile.am index a3c980a..cba5b41 100644 --- a/v2v/test-harness/Makefile.am +++ b/v2v/test-harness/Makefile.am @@ -60,6 +60,7 @@ OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) BOBJECTS = \ $(top_builddir)/mllib/guestfs_config.cmo \ $(top_builddir)/mllib/common_gettext.cmo \ + $(top_builddir)/mllib/dev_t.cmo \ $(top_builddir)/mllib/common_utils.cmo \ $(top_builddir)/v2v/xml.cmo \ $(SOURCES_ML:.ml=.cmo) \ @@ -94,6 +95,7 @@ libv2vth_a_CFLAGS = \ -fPIC libv2vth_a_SOURCES = \ + ../../mllib/dev_t-c.c \ ../xml-c.c v2v_test_harness.cmi: $(top_builddir)/ocaml/guestfs.cmi -- 2.7.4