[Libguestfs] [PATCH 2/3] build: run ocaml-link.sh from build directory

Tomáš Golembiovský tgolembi at redhat.com
Mon Jan 27 09:39:33 UTC 2020


ocaml-link.sh is generated file. It means that for out-of-tree builds it
is located in a build directory which is different from source tree dir.

Signed-off-by: Tomáš Golembiovský <tgolembi at redhat.com>
---
 v2v/Makefile.am | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/v2v/Makefile.am b/v2v/Makefile.am
index 64703c36..1c10d07b 100644
--- a/v2v/Makefile.am
+++ b/v2v/Makefile.am
@@ -248,9 +248,9 @@ OCAMLLINKFLAGS = \
 	mlv2v.$(MLARCHIVE) \
 	$(LINK_CUSTOM_OCAMLC_ONLY)
 
-virt_v2v_DEPENDENCIES = $(OBJECTS) $(top_srcdir)/ocaml-link.sh
+virt_v2v_DEPENDENCIES = $(OBJECTS) $(top_builddir)/ocaml-link.sh
 virt_v2v_LINK = \
-	$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+	$(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
 	  $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
 	  $(OBJECTS) -o $@
 
@@ -293,9 +293,9 @@ virt_v2v_copy_to_local_DEPENDENCIES = \
 	../bundled/libvirt-ocaml/mllibvirt.$(MLARCHIVE) \
 	../common/mlcustomize/mlcustomize.$(MLARCHIVE) \
 	../common/mlv2v/mlv2v.$(MLARCHIVE) \
-	$(top_srcdir)/ocaml-link.sh
+	$(top_builddir)/ocaml-link.sh
 virt_v2v_copy_to_local_LINK = \
-	$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+	$(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
 	  $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \
 	  $(COPY_TO_LOCAL_OBJECTS) -o $@
 
@@ -367,9 +367,9 @@ v2v_unit_tests_DEPENDENCIES = \
 	../common/mltools/mltools.$(MLARCHIVE) \
 	../common/mlcustomize/mlcustomize.$(MLARCHIVE) \
 	../common/mlv2v/mlv2v.$(MLARCHIVE) \
-	$(top_srcdir)/ocaml-link.sh
+	$(top_builddir)/ocaml-link.sh
 v2v_unit_tests_LINK = \
-	$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+	$(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
 	  $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) \
 	  $(OCAMLPACKAGES) -package oUnit \
 	  $(OCAMLLINKFLAGS) \
@@ -378,9 +378,9 @@ v2v_unit_tests_LINK = \
 var_expander_tests_DEPENDENCIES = \
 	$(var_expander_tests_THEOBJECTS) \
 	../common/mlpcre/mlpcre.$(MLARCHIVE) \
-	$(top_srcdir)/ocaml-link.sh
+	$(top_builddir)/ocaml-link.sh
 var_expander_tests_LINK = \
-	$(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
+	$(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
 	  $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) \
 	  $(OCAMLPACKAGES) -package oUnit \
 	  $(OCAMLLINKFLAGS) \
-- 
2.25.0





More information about the Libguestfs mailing list