Re: [Libguestfs] [v2v PATCH 2/2] build: switch embedded copy of libvirt-ocaml

Use the newer copy shipped locally as 3rdparty, instead of the one in the common submodule, as the latter copy will go away soon. --- .gitignore | 2 ++ Makefile.am | 2 +- configure.ac | 2 +- test-harness/Makefile.am | 2 +- v2v/Makefile.am | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 846998b3..3e9a7c5b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,8 @@ dll*.so Makefile Makefile.in +/3rdparty/libvirt-ocaml/.depend +/3rdparty/libvirt-ocaml/libvirt_generated.c /aclocal.m4 /autom4te.cache/ /build-aux/ diff --git a/Makefile.am b/Makefile.am index 039921c2..72b78769 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,7 @@ SUBDIRS += common/mlxml SUBDIRS += common/mltools SUBDIRS += common/mlcustomize SUBDIRS += common/mlv2v -SUBDIRS += common/mllibvirt +SUBDIRS += 3rdparty/libvirt-ocaml

SUBDIRS += v2v SUBDIRS += test-harness diff --git a/configure.ac b/configure.ac index 065c6289..00246f29 100644 --- a/configure.ac +++ b/configure.ac @@ -100,11 +100,11 @@ AC_CONFIG_FILES([run], dnl NB: Remove common/mlstdutils/guestfs_config.ml in future XXX AC_CONFIG_FILES([Makefile + 3rdparty/libvirt-ocaml/Makefile bash/Makefile common/options/Makefile common/mlcustomize/Makefile common/mlgettext/Makefile - common/mllibvirt/Makefile common/mlpcre/Makefile common/mlstdutils/Makefile common/mlstdutils/guestfs_config.ml diff --git a/test-harness/Makefile.am b/test-harness/Makefile.am index 11de6dc4..87794b05 100644 --- a/test-harness/Makefile.am +++ b/test-harness/Makefile.am @@ -40,7 +40,7 @@ OCAMLPACKAGES = \ -I $(top_builddir)/common/mlstdutils \ -I $(top_builddir)/common/mlxml \ -I $(top_builddir)/common/mltools \ - -I $(top_builddir)/common/mllibvirt \ + -I $(top_builddir)/3rdparty/libvirt-ocaml \ -I $(top_builddir)/v2v OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)' diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 48d3f515..116a8d2f 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -212,7 +212,7 @@ OCAMLPACKAGES = \ -I $(top_builddir)/common/mlpcre \ -I $(top_builddir)/common/mlxml \ -I $(top_builddir)/common/mltools \ - -I $(top_builddir)/common/mllibvirt \ + -I $(top_builddir)/3rdparty/libvirt-ocaml \ -I $(top_builddir)/common/mlcustomize \ -I $(top_builddir)/common/mlv2v if HAVE_OCAML_PKG_GETTEXT @@ -289,7 +289,7 @@ virt_v2v_copy_to_local_DEPENDENCIES = \ ../common/mlpcre/mlpcre.$(MLARCHIVE) \ ../common/mlutils/mlcutils.$(MLARCHIVE) \ ../common/mltools/mltools.$(MLARCHIVE) \ - ../common/mllibvirt/mllibvirt.$(MLARCHIVE) \ + ../3rdparty/libvirt-ocaml/mllibvirt.$(MLARCHIVE) \ ../common/mlcustomize/mlcustomize.$(MLARCHIVE) \ ../common/mlv2v/mlv2v.$(MLARCHIVE) \ $(top_srcdir)/ocaml-link.sh -- 2.23.0 _______________________________________________ Libguestfs mailing list Libguestfs(a)redhat.com https://www.redhat.com/mailman/listinfo/libguestfs