summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2008-10-13 16:01:44 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-10-13 16:01:44 +0000
commitb89688efd19ab99e44f77046206956fc95fc0264 (patch)
tree0a586abd8a9d4eb27b7338fdb71603e4047ec7e0
parent5eca684b300847520938a1556cd53e98ddeee0c8 (diff)
downloadgdk-pixbuf-b89688efd19ab99e44f77046206956fc95fc0264.tar.gz
Bug 555953 – libferret missing link against libgtk-x11
2008-10-13 Matthias Clasen <mclasen@redhat.com> Bug 555953 – libferret missing link against libgtk-x11 * test/Makefile.am: Link libferret against gtk. svn path=/branches/gtk-2-14/; revision=21647
-rw-r--r--modules/other/gail/ChangeLog8
-rw-r--r--modules/other/gail/tests/Makefile.am6
2 files changed, 12 insertions, 2 deletions
diff --git a/modules/other/gail/ChangeLog b/modules/other/gail/ChangeLog
index 6655db4ac..b4102b4dd 100644
--- a/modules/other/gail/ChangeLog
+++ b/modules/other/gail/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-13 Matthias Clasen <mclasen@redhat.com>
+
+ Merged from trunk:
+
+ Bug 555953 – libferret missing link against libgtk-x11
+
+ * test/Makefile.am: Link libferret against gtk.
+
2008-10-07 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:
diff --git a/modules/other/gail/tests/Makefile.am b/modules/other/gail/tests/Makefile.am
index 51f537376..f383037bb 100644
--- a/modules/other/gail/tests/Makefile.am
+++ b/modules/other/gail/tests/Makefile.am
@@ -52,10 +52,12 @@ libferret_la_SOURCES = \
libferret_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version \
- $(GTK_DEP_LIBS) \
+ $(no_undefined) \
$(LDFLAGS)
-libferret_la_LIBADD = \
+libferret_la_LIBADD = \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(GTK_DEP_LIBS) \
$(GAIL_INET_LIBS)
endif