[Pkg-libvirt-commits] [libguestfs] 38/384: gobject: link against uninstalled libraries

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 1033847f0005470b5f2845fd548d81bc7a2f559b
Author: Pino Toscano <ptoscano at redhat.com>
Date:   Thu Dec 4 17:09:32 2014 +0100

    gobject: link against uninstalled libraries
    
    Make sure to link the gobject library and the gir using the in-tree
    built libguestfs, so a system library won't be used accidentally.
---
 gobject/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index f32ec07..b7e7f10 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -55,7 +55,7 @@ libguestfs_gobject_1_0_la_CFLAGS = -I$(top_srcdir)/src -I$(srcdir)/include \
                                    -DGUESTFS_PRIVATE=1 \
                                    $(GOBJECT_CFLAGS)
 libguestfs_gobject_1_0_la_LDFLAGS = $(LDFLAGS) -L$(top_builddir)/src
-libguestfs_gobject_1_0_la_LIBADD = -lguestfs $(GOBJECT_LIBS) $(GIO_LIBS)
+libguestfs_gobject_1_0_la_LIBADD = $(top_builddir)/src/libguestfs.la $(GOBJECT_LIBS) $(GIO_LIBS)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libguestfs-gobject-1.0.pc
@@ -80,7 +80,7 @@ introspection_sources = \
 Guestfs-1.0.gir: $(libname)
 Guestfs_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
 Guestfs_1_0_gir_CFLAGS = $(INCLUDES) -I$(srcdir)/include
-Guestfs_1_0_gir_LIBS = $(libname)
+Guestfs_1_0_gir_LIBS = $(libname) $(top_builddir)/src/libguestfs.la
 Guestfs_1_0_gir_FILES = $(patsubst %,$(srcdir)/%,$(introspection_sources))
 INTROSPECTION_GIRS += Guestfs-1.0.gir
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git