[Libguestfs] [guestfs-tools PATCH 3/3] Makefile.am: use $(LIBGUESTFS_LIBS) for linking OCaml programs
Otherwise the command
$ ../libguestfs/run make
produces errors like
GEN virt-customize
/usr/bin/ld: cannot find -lguestfs
/usr/bin/ld: cannot find -lguestfs
collect2: error: ld returned 1 exit status
File "caml_startup", line 1:
Error: Error during linking (exit code 1)
in the "builder", "customize", "dib",
"get-kernel", "resize", "sparsify"
and "sysprep" modules.
Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
---
builder/Makefile.am | 1 +
customize/Makefile.am | 1 +
dib/Makefile.am | 1 +
get-kernel/Makefile.am | 1 +
resize/Makefile.am | 1 +
sparsify/Makefile.am | 1 +
sysprep/Makefile.am | 1 +
7 files changed, 7 insertions(+)
diff --git a/builder/Makefile.am b/builder/Makefile.am
index 9c155c7f29ef..78274426aec5 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -200,8 +200,9 @@ OCAMLCLIBS = \
-pthread -lpthread \
-lutils \
$(LIBTINFO_LIBS) \
$(LIBCRYPT_LIBS) \
+ $(LIBGUESTFS_LIBS) \
$(LIBLZMA_LIBS) \
$(LIBXML2_LIBS) \
$(JANSSON_LIBS) \
$(LIBINTL) \
diff --git a/customize/Makefile.am b/customize/Makefile.am
index 7bf6af444b67..6bdd5fae91e6 100644
--- a/customize/Makefile.am
+++ b/customize/Makefile.am
@@ -168,8 +168,9 @@ OCAMLLINKFLAGS = \
OCAMLCLIBS = \
-pthread -lpthread \
-lutils \
$(LIBTINFO_LIBS) \
+ $(LIBGUESTFS_LIBS) \
$(LIBCRYPT_LIBS) \
$(LIBVIRT_LIBS) \
$(LIBXML2_LIBS) \
$(LIBINTL) \
diff --git a/dib/Makefile.am b/dib/Makefile.am
index f607449f249a..7581feb787ec 100644
--- a/dib/Makefile.am
+++ b/dib/Makefile.am
@@ -91,8 +91,9 @@ endif
OCAMLCLIBS = \
-pthread -lpthread \
-lutils \
$(LIBXML2_LIBS) \
+ $(LIBGUESTFS_LIBS) \
$(LIBINTL) \
-lgnu
OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
diff --git a/get-kernel/Makefile.am b/get-kernel/Makefile.am
index e0df00ec06a7..c81cb8ba8cb4 100644
--- a/get-kernel/Makefile.am
+++ b/get-kernel/Makefile.am
@@ -73,8 +73,9 @@ endif
OCAMLCLIBS = \
-pthread -lpthread \
-lutils \
$(LIBXML2_LIBS) \
+ $(LIBGUESTFS_LIBS) \
$(LIBINTL) \
-lgnu
OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
diff --git a/resize/Makefile.am b/resize/Makefile.am
index 606fcecb6ebc..f8aa4c46bfcf 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -73,8 +73,9 @@ OCAMLCLIBS = \
-lprogress \
-lutils \
$(LIBTINFO_LIBS) \
$(LIBXML2_LIBS) \
+ $(LIBGUESTFS_LIBS) \
$(LIBINTL) \
-lgnu
OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
index d5c8cd3367ae..0eca849da46b 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -80,8 +80,9 @@ OCAMLCLIBS = \
-lprogress \
-lutils \
$(LIBTINFO_LIBS) \
$(LIBXML2_LIBS) \
+ $(LIBGUESTFS_LIBS) \
$(LIBINTL) \
-lgnu
OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
index d32ab20e57e9..e213244bc17a 100644
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -131,8 +131,9 @@ OCAMLCLIBS = \
-lutils \
$(LIBTINFO_LIBS) \
$(LIBCRYPT_LIBS) \
$(LIBXML2_LIBS) \
+ $(LIBGUESTFS_LIBS) \
$(LIBINTL) \
-lgnu
OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
--
2.19.1.3.g30247aa5d201