[gnome-keyring/gnome-3-0] Fix build with --no-add-needed

[Stefan Walter <stefw src gnome org>]

commit bf84b9234b49459160fdcbf2f008ac48379b1bf4
Author: Stef Walter <stefw collabora co uk>
Date:   Mon May 9 10:17:11 2011 +0200

    Fix build with --no-add-needed
    
    https://bugzilla.gnome.org/show_bug.cgi?id=649754

 gck/Makefile.am |    4 ++--
 gcr/Makefile.am |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gck/Makefile.am b/gck/Makefile.am
index fc92886..3aa3808 100644
--- a/gck/Makefile.am
+++ b/gck/Makefile.am
@@ -61,8 +61,8 @@ libgck_testable_la_SOURCES = \
 	gck-mock.h \
 	gck-test.c \
 	gck-test.h
-libgck_testable_la_LIBADD = \
-	$(libgck_la_OBJECTS)
+libgck_testable_la_LIBADD = $(libgck_la_OBJECTS) $(libgck_la_LIBADD)
+libgck_testable_la_DEPENDENCIES = $(libgck_la_OBJECTS)
 
 gck-marshal.h: gck-marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --header --prefix=_gck_marshal > $@
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index c33d2ee..46b58f1 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -111,7 +111,9 @@ libgcr GCR_VERSION_SUFFIX@_la_LIBADD = \
 
 noinst_LTLIBRARIES = $(TESTABLE_LIB)
 libgcr_testable_la_SOURCES =
-libgcr_testable_la_LIBADD = $(libgcr GCR_VERSION_SUFFIX@_la_OBJECTS)
+libgcr_testable_la_LIBADD = $(libgcr GCR_VERSION_SUFFIX@_la_OBJECTS) \
+	$(libgcr GCR_VERSION_SUFFIX@_la_LIBADD)
+libgcr_testable_la_DEPENDENCIES = $(libgcr GCR_VERSION_SUFFIX@_la_OBJECTS)
 
 gcr-marshal.h: gcr-marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --header --prefix=_gcr_marshal > $@