search for: 48d3f515

Make sure to directly address them by name, as the wildcard will not work for non-existing files. --- v2v/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 23256d3b..48d3f515 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -389,7 +389,7 @@ var_expander_tests_LINK = \ .depend: \ $(srcdir)/*.mli \ $(srcdir)/*.ml \ - config.ml \ - output_rhv_upload_*_source.ml + $(CONFIGURE_GENERATED_ML) \ + $(filter %.ml,$(BUILT_SOURCES)) $(top_builddir)/ocaml-dep.sh $^ -inc...

...dir)/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 \ -...

...ddir)/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 $(to...

Just like the similar series that already went in for libguestfs [1], do similar fixes also for virt-v2v, with additional fixes for the builddir!=srcdir case. This will also need the fix to subdir-rules.mk. [1] https://www.redhat.com/archives/libguestfs/2019-December/msg00062.html Pino Toscano (7): Update common to latest build: stop shipping files generated by configure build: use the

libvirt-ocaml is used only by virt-v2v, so move it to this repository, instead of having it around in the common submodule. The removal from common will happen later. Pino Toscano (2): common: Bundle the libvirt-ocaml library for use by virt-v2v build: switch embedded copy of libvirt-ocaml .gitignore | 2 + 3rdparty/libvirt-ocaml/Makefile.am |