[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [v2v PATCH 5/7] build: drop HAVE_OCAML conditionals



OCaml is mandatory for virt-v2v.
---
 test-harness/Makefile.am | 4 ----
 v2v/Makefile.am          | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/test-harness/Makefile.am b/test-harness/Makefile.am
index 157cee4f..11de6dc4 100644
--- a/test-harness/Makefile.am
+++ b/test-harness/Makefile.am
@@ -30,8 +30,6 @@ SOURCES_MLI = \
 SOURCES_ML = \
 	v2v_test_harness.ml
 
-if HAVE_OCAML
-
 # -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.
@@ -125,6 +123,4 @@ stamp-virt-v2v-test-harness.pod: virt-v2v-test-harness.pod
 	$(top_builddir)/ocaml-dep.sh -I .. $^
 -include .depend
 
-endif
-
 .PHONY: docs
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
index b1ff8b2f..23256d3b 100644
--- a/v2v/Makefile.am
+++ b/v2v/Makefile.am
@@ -177,8 +177,6 @@ output_rhv_upload_precheck_source.ml: $(srcdir)/rhv-upload-precheck.py
 output_rhv_upload_vmcheck_source.ml: $(srcdir)/rhv-upload-vmcheck.py
 	$(srcdir)/embed.sh code $^ $@
 
-if HAVE_OCAML
-
 bin_PROGRAMS = virt-v2v virt-v2v-copy-to-local
 
 virt_v2v_SOURCES = $(SOURCES_C)
@@ -395,5 +393,3 @@ var_expander_tests_LINK = \
 	output_rhv_upload_*_source.ml
 	$(top_builddir)/ocaml-dep.sh $^
 -include .depend
-
-endif
-- 
2.23.0


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]