mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2v: test-harness: stop using the external ocaml-libvirt

Browse Source 
Use the embedded copy.
This commit is contained in:
Pino Toscano
2018-08-30 18:43:53 +02:00
parent 3e89a1d44f
commit 5c4bd181b6
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -174,10 +174,8 @@ SUBDIRS += sparsify
SUBDIRS += sysprep
if HAVE_LIBVIRT
SUBDIRS += v2v
if HAVE_OCAML_PKG_LIBVIRT
SUBDIRS += v2v/test-harness
endif
endif
if HAVE_FUSE
SUBDIRS += dib
endif

5
v2v/test-harness/Makefile.am
View File

@@ -31,13 +31,12 @@ SOURCES_ML = \
v2v_test_harness.ml
if HAVE_OCAML
if HAVE_OCAML_PKG_LIBVIRT
# -I $(top_builddir)/lib/.libs is a hack which forces corresponding -L
# option to be passed to gcc, so we don't try linking against an
# installed copy of libguestfs.
OCAMLPACKAGES = \
-package str,unix,libvirt \
-package str,unix \
-I $(top_builddir)/common/utils/.libs \
-I $(top_builddir)/lib/.libs \
-I $(top_builddir)/gnulib/lib/.libs \
@@ -45,6 +44,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)/v2v
OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
@@ -130,7 +130,6 @@ stamp-virt-v2v-test-harness.pod: virt-v2v-test-harness.pod
$(top_builddir)/ocaml-dep.sh -I .. $^
-include .depend
endif
endif
.PHONY: docs