[glib] make tests not dynamic link against /lib/libglib



commit 3e30e8a87e18952e9c26c0d05f5c336a110f2bed
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Feb 10 11:29:12 2010 -0500

    make tests not dynamic link against /lib/libglib
    
    For some reason, even though the tests are linked against libgobject.la
    and libgobject.la mentions libglib.la as a dependency, the tests are
    running against the system glib instead of the in-tree one.
    
    Adding the libglib.la file as an explicit LDFLAG fixes it.

 tests/gobject/Makefile.am |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index 62395c0..9cfb33b 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -11,6 +11,12 @@ libgthread = $(top_builddir)/gthread/libgthread-2.0.la
 libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
 libgobject = $(top_builddir)/gobject/libgobject-2.0.la
 
+
+# libtool dependency tracking seems broken.  this is currently
+# required to get the tests to dynamic link against the in-tree
+# libglib instead of the system one
+libgobject += $(libglib)
+
 ########################################################################
 
 noinst_LTLIBRARIES = libtestgobject.la
@@ -45,7 +51,7 @@ CLEANFILES = stamp-testmarshal.h
 
 ########################################################################
 
-LDADD = libtestgobject.la $(libgobject) 
+LDADD = libtestgobject.la $(libgobject)
 
 test_programs =					\
 	deftype					\



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