]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix build on Ubuntu.
authorChris Lalancette <clalance@redhat.com>
Mon, 26 Apr 2010 13:41:07 +0000 (09:41 -0400)
committerChris Lalancette <clalance@redhat.com>
Thu, 29 Apr 2010 13:15:30 +0000 (09:15 -0400)
When building on Ubuntu with make -j3 (or more), it would always
fail when trying to build virt-aa-helper.  I'm not an expert in
automake by any means, but I think the entry for virt-aa-helper
is mis-using LDADD; it shouldn't be putting direct paths to
libvirt_conf.la and libvirt_util.la, but instead referencing those
names.  With this patch in place, I'm able to successfully build
on Ubuntu 9.04 with make -j3.

Signed-off-by: Chris Lalancette <clalance@redhat.com>
src/Makefile.am

index d8466f0b1da4cf43ce9686f187f1c23b13e6eb00..2531ac58ade0868dac1e1eb2ae10626c05274dbc 100644 (file)
@@ -1005,9 +1005,9 @@ virt_aa_helper_LDFLAGS = $(WARN_CFLAGS)
 virt_aa_helper_LDADD =                                         \
                $(WARN_CFLAGS)                                  \
                $(LIBXML_LIBS)                                  \
-               @top_srcdir@/src/libvirt_conf.la                \
-               @top_srcdir@/src/libvirt_util.la                \
-               @top_srcdir@/gnulib/lib/libgnu.la
+               libvirt_conf.la                                 \
+               libvirt_util.la                                 \
+               ../gnulib/lib/libgnu.la
 virt_aa_helper_CFLAGS =                                                \
                -I@top_srcdir@/src/conf                         \
                -I@top_srcdir@/src/security