[PATCH libguestfs] build: don't use automake-internal variable
Hi Rich, I realized a day or two late that my suggestion was not quite right. Here's the fix:
From 5294c21cf07c4ec2f094182ba9f32696f3de2751 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering@redhat.com> Date: Mon, 23 Jan 2012 10:01:40 +0100 Subject: [PATCH libguestfs] build: don't use automake-internal variable
* ocaml/Makefile.am (mlguestfs.cma): Use the documented variable form, $(libguestfsocaml_a_OBJECTS), not the $(am_libguestfsocaml_a_OBJECTS) that I suggested for commit 1.15.16-17-g8b9eaec. --- ocaml/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index fbeefc9..eac9b84 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -49,12 +49,12 @@ noinst_LIBRARIES = libguestfsocaml.a mlguestfs.cma: libguestfsocaml.a guestfs.cmo $(OCAMLMKLIB) -o mlguestfs \ - $(am_libguestfsocaml_a_OBJECTS) guestfs.cmo \ + $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ -L$(top_builddir)/src/.libs -lguestfs mlguestfs.cmxa: libguestfsocaml.a guestfs.cmx $(OCAMLMKLIB) -o mlguestfs \ - $(am_libguestfsocaml_a_OBJECTS) guestfs.cmx \ + $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ -L$(top_builddir)/src/.libs -lguestfs libguestfsocaml_a_CFLAGS = \ -- 1.7.9.rc2.2.g183d6
Additional info, here's an excerpt from Makefile.in regenerated after applying that change: am__libguestfsocaml_a_SOURCES_DIST = guestfs_c.c guestfs_c_actions.c @HAVE_OCAML_TRUE@am_libguestfsocaml_a_OBJECTS = \ @HAVE_OCAML_TRUE@ libguestfsocaml_a-guestfs_c.$(OBJEXT) \ @HAVE_OCAML_TRUE@ libguestfsocaml_a-guestfs_c_actions.$(OBJEXT) libguestfsocaml_a_OBJECTS = $(am_libguestfsocaml_a_OBJECTS)
On Mon, Jan 23, 2012 at 10:03:14AM +0100, Jim Meyering wrote:
Hi Rich,
I realized a day or two late that my suggestion was not quite right. Here's the fix:
Thanks, I have applied this and I'm testing it. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/
participants (2)
-
Jim Meyering -
Richard W.M. Jones