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