|
 |
d0ea73 |
From b31fcaf9879b9f4fe36a19e439895a867a1fbc72 Mon Sep 17 00:00:00 2001
|
|
|
d0ea73 |
From: Pino Toscano <ptoscano@redhat.com>
|
|
|
d0ea73 |
Date: Tue, 22 May 2018 17:24:18 +0200
|
|
|
d0ea73 |
Subject: [PATCH] v2v: fix build rules for output_rhv_upload_*_source.ml files
|
|
|
d0ea73 |
|
|
|
d0ea73 |
Use the $(srcdir) variable where needed, to make sure it builds also
|
|
|
d0ea73 |
with srcdir != builddir.
|
|
|
d0ea73 |
|
|
|
d0ea73 |
Furthermore, make sure that the OCaml dependencies calculation depend on
|
|
|
d0ea73 |
the generated output_rhv_upload_*_source.ml files, otherwise there will
|
|
|
d0ea73 |
be incomplete OCaml rules for them in the generated .depend.
|
|
|
d0ea73 |
|
|
|
d0ea73 |
Fixes commit cc04573927cca97de60d544d37467e67c25867a7.
|
|
|
d0ea73 |
|
|
|
d0ea73 |
(cherry picked from commit a4e3b7c0598370d8d068b21909da95b6031eb688)
|
|
|
d0ea73 |
---
|
|
|
d0ea73 |
v2v/Makefile.am | 14 +++++++-------
|
|
|
d0ea73 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
d0ea73 |
|
|
|
d0ea73 |
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
|
|
|
d0ea73 |
index 3a0c80f44..7de050b06 100644
|
|
|
d0ea73 |
--- a/v2v/Makefile.am
|
|
|
d0ea73 |
+++ b/v2v/Makefile.am
|
|
|
d0ea73 |
@@ -143,12 +143,12 @@ SOURCES_C = \
|
|
|
d0ea73 |
|
|
|
d0ea73 |
# These files are generated and contain rhv-upload-*.py embedded as an
|
|
|
d0ea73 |
# OCaml string.
|
|
|
d0ea73 |
-output_rhv_upload_createvm_source.ml: rhv-upload-createvm.py
|
|
|
d0ea73 |
- ./embed.sh code $^ $@
|
|
|
d0ea73 |
-output_rhv_upload_plugin_source.ml: rhv-upload-plugin.py
|
|
|
d0ea73 |
- ./embed.sh code $^ $@
|
|
|
d0ea73 |
-output_rhv_upload_precheck_source.ml: rhv-upload-precheck.py
|
|
|
d0ea73 |
- ./embed.sh code $^ $@
|
|
|
d0ea73 |
+output_rhv_upload_createvm_source.ml: $(srcdir)/rhv-upload-createvm.py
|
|
|
d0ea73 |
+ $(srcdir)/embed.sh code $^ $@
|
|
|
d0ea73 |
+output_rhv_upload_plugin_source.ml: $(srcdir)/rhv-upload-plugin.py
|
|
|
d0ea73 |
+ $(srcdir)/embed.sh code $^ $@
|
|
|
d0ea73 |
+output_rhv_upload_precheck_source.ml: $(srcdir)/rhv-upload-precheck.py
|
|
|
d0ea73 |
+ $(srcdir)/embed.sh code $^ $@
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if HAVE_OCAML
|
|
|
d0ea73 |
|
|
|
d0ea73 |
@@ -575,7 +575,7 @@ v2v_unit_tests_LINK = \
|
|
|
d0ea73 |
$(v2v_unit_tests_THEOBJECTS) -o $@
|
|
|
d0ea73 |
|
|
|
d0ea73 |
# Dependencies.
|
|
|
d0ea73 |
-.depend: $(srcdir)/*.mli $(srcdir)/*.ml
|
|
|
d0ea73 |
+.depend: $(srcdir)/*.mli $(srcdir)/*.ml output_rhv_upload_createvm_source.ml output_rhv_upload_plugin_source.ml output_rhv_upload_precheck_source.ml
|
|
|
d0ea73 |
$(top_builddir)/ocaml-dep.sh $^
|
|
|
d0ea73 |
-include .depend
|
|
|
d0ea73 |
|
|
|
d0ea73 |
--
|
|
 |
6b9fda |
2.21.0
|
|
|
d0ea73 |
|