From: Ryan Lortie <desrt@desrt.ca>
Date: Wed, 10 Feb 2010 16:29:12 +0000 (-0500)
Subject: make tests not dynamic link against /lib/libglib
X-Git-Tag: 2.23.4~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e30e8a87e18952e9c26c0d05f5c336a110f2bed;p=platform%2Fupstream%2Fglib.git

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.
---

diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index 62395c027..9cfb33ba3 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					\