[Libguestfs] [v2v PATCH 3/7] build: use the mlv2v library

[Pino Toscano]

Instead of copying the sources of mlv2v into the v2v build directory,
use the mlv2v convenience library instead.
---
 .gitignore      |  2 --
 ocaml-dep.sh.in |  1 +
 po/POTFILES-ml  |  1 -
 v2v/Makefile.am | 24 ++++++------------------
 4 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 19ee3335..ee7e3cf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,8 +135,6 @@ Makefile.in
 /v2v/real-*.d/
 /v2v/real-*.img
 /v2v/real-*.xml
-/v2v/uefi.ml
-/v2v/uefi.mli
 /v2v/v2v_unit_tests
 /v2v/var_expander_tests
 /v2v/virt-v2v
diff --git a/ocaml-dep.sh.in b/ocaml-dep.sh.in
index 9de8497f..340e7cc6 100755
--- a/ocaml-dep.sh.in
+++ b/ocaml-dep.sh.in
@@ -40,6 +40,7 @@ common/mlprogress
 common/mlstdutils
 common/mltools
 common/mlutils
+common/mlv2v
 common/mlvisit
 common/mlxml
 customize
diff --git a/po/POTFILES-ml b/po/POTFILES-ml
index eef7c5f3..85ded8be 100644
--- a/po/POTFILES-ml
+++ b/po/POTFILES-ml
@@ -86,7 +86,6 @@ v2v/python_script.ml
 v2v/qemuopts.ml
 v2v/target_bus_assignment.ml
 v2v/types.ml
-v2v/uefi.ml
 v2v/utils.ml
 v2v/v2v.ml
 v2v/v2v_unit_tests.ml
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
index 2cb3480c..63473515 100644
--- a/v2v/Makefile.am
+++ b/v2v/Makefile.am
@@ -22,9 +22,7 @@ BUILT_SOURCES = \
 	output_rhv_upload_deletedisks_source.ml \
 	output_rhv_upload_plugin_source.ml \
 	output_rhv_upload_precheck_source.ml \
-	output_rhv_upload_vmcheck_source.ml \
-	uefi.ml \
-	uefi.mli
+	output_rhv_upload_vmcheck_source.ml
 
 CONFIGURE_GENERATED_ML = \
 	config.ml
@@ -98,8 +96,6 @@ SOURCES_MLI = \
 	qemuopts.mli \
 	target_bus_assignment.mli \
 	types.mli \
-	uefi.mli \
-	utils.mli \
 	v2v.mli \
 	vCenter.mli \
 	var_expander.mli \
@@ -109,7 +105,6 @@ SOURCES_MLI = \
 SOURCES_ML = \
 	$(CONFIGURE_GENERATED_ML) \
 	types.ml \
-	uefi.ml \
 	utils.ml \
 	var_expander.ml \
 	python_script.ml \
@@ -182,15 +177,6 @@ output_rhv_upload_precheck_source.ml: $(srcdir)/rhv-upload-precheck.py
 output_rhv_upload_vmcheck_source.ml: $(srcdir)/rhv-upload-vmcheck.py
 	$(srcdir)/embed.sh code $^ $@
 
-# These are created by the generator in common/mlv2v and
-# need to be copied here.
-uefi.mli: $(top_srcdir)/common/mlv2v/uefi.mli
-	rm -f $@
-	cp $< $@
-uefi.ml: $(top_srcdir)/common/mlv2v/uefi.ml
-	rm -f $@
-	cp $< $@
-
 if HAVE_OCAML
 
 bin_PROGRAMS = virt-v2v virt-v2v-copy-to-local
@@ -229,7 +215,8 @@ OCAMLPACKAGES = \
 	-I $(top_builddir)/common/mlxml \
 	-I $(top_builddir)/common/mltools \
 	-I $(top_builddir)/common/mllibvirt \
-	-I $(top_builddir)/common/mlcustomize
+	-I $(top_builddir)/common/mlcustomize \
+	-I $(top_builddir)/common/mlv2v
 if HAVE_OCAML_PKG_GETTEXT
 OCAMLPACKAGES += -package gettext-stub
 endif
@@ -259,6 +246,7 @@ OCAMLLINKFLAGS = \
 	mltools.$(MLARCHIVE) \
 	mllibvirt.$(MLARCHIVE) \
 	mlcustomize.$(MLARCHIVE) \
+	mlv2v.$(MLARCHIVE) \
 	$(LINK_CUSTOM_OCAMLC_ONLY)
 
 virt_v2v_DEPENDENCIES = $(OBJECTS) $(top_srcdir)/ocaml-link.sh
@@ -282,7 +270,6 @@ virt_v2v_copy_to_local_CFLAGS = \
 COPY_TO_LOCAL_BOBJECTS = \
 	config.cmo \
 	types.cmo \
-	uefi.cmo \
 	utils.cmo \
 	libvirt_utils.cmo \
 	nbdkit.cmo \
@@ -306,6 +293,7 @@ virt_v2v_copy_to_local_DEPENDENCIES = \
 	../common/mltools/mltools.$(MLARCHIVE) \
 	../common/mllibvirt/mllibvirt.$(MLARCHIVE) \
 	../common/mlcustomize/mlcustomize.$(MLARCHIVE) \
+	../common/mlv2v/mlv2v.$(MLARCHIVE) \
 	$(top_srcdir)/ocaml-link.sh
 virt_v2v_copy_to_local_LINK = \
 	$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
@@ -332,7 +320,6 @@ endif
 v2v_unit_tests_BOBJECTS = \
 	config.cmo \
 	types.cmo \
-	uefi.cmo \
 	utils.cmo \
 	DOM.cmo \
 	create_ovf.cmo \
@@ -380,6 +367,7 @@ v2v_unit_tests_DEPENDENCIES = \
 	../common/mlutils/mlcutils.$(MLARCHIVE) \
 	../common/mltools/mltools.$(MLARCHIVE) \
 	../common/mlcustomize/mlcustomize.$(MLARCHIVE) \
+	../common/mlv2v/mlv2v.$(MLARCHIVE) \
 	$(top_srcdir)/ocaml-link.sh
 v2v_unit_tests_LINK = \
 	$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
-- 
2.23.0