summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-05-09 10:17:11 +0200
committerStef Walter <stefw@collabora.co.uk>2011-05-09 10:17:11 +0200
commitbf84b9234b49459160fdcbf2f008ac48379b1bf4 (patch)
treef5f4450fb5f94daff6378be4228588151859e633
parent77423f80cce48a56520ce01e15c288154e4b4fcb (diff)
downloadgnome-keyring-bf84b9234b49459160fdcbf2f008ac48379b1bf4.tar.gz
Fix build with --no-add-needed
https://bugzilla.gnome.org/show_bug.cgi?id=649754
-rw-r--r--gck/Makefile.am4
-rw-r--r--gcr/Makefile.am4
2 files changed, 5 insertions, 3 deletions
diff --git a/gck/Makefile.am b/gck/Makefile.am
index fc928868..3aa38080 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 c33d2ee8..46b58f11 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 > $@