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