gnome-keyring r1510 - in trunk: . pkcs11/gck pkcs11/roots-store pkcs11/ssh-store pkcs11/user-store

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Feb  7 18:43:16 2009
New Revision: 1510
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1510&view=rev

Log:
Link libegg into gck where it's actually used.

See bug #568406

Modified:
   trunk/ChangeLog
   trunk/pkcs11/gck/Makefile.am
   trunk/pkcs11/roots-store/Makefile.am
   trunk/pkcs11/ssh-store/Makefile.am
   trunk/pkcs11/user-store/Makefile.am

Modified: trunk/pkcs11/gck/Makefile.am
==============================================================================
--- trunk/pkcs11/gck/Makefile.am	(original)
+++ trunk/pkcs11/gck/Makefile.am	Sat Feb  7 18:43:16 2009
@@ -51,6 +51,7 @@
 	$(GLIB_CFLAGS) 
 	
 libgck_la_LIBADD = \
+	$(top_builddir)/egg/libegg.la \
 	$(GOBJECT_LIBS) \
     	$(LIBGCRYPT_LIBS) \
 	$(GLIB_LIBS) 

Modified: trunk/pkcs11/roots-store/Makefile.am
==============================================================================
--- trunk/pkcs11/roots-store/Makefile.am	(original)
+++ trunk/pkcs11/roots-store/Makefile.am	Sat Feb  7 18:43:16 2009
@@ -37,8 +37,6 @@
 gck_roots_store_standalone_la_LIBADD = \
 	libgck-roots-store.la \
 	$(top_builddir)/pkcs11/gck/libgck.la \
-	$(top_builddir)/egg/libegg-buffer.la \
-	$(top_builddir)/egg/libegg-secure.la \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GLIB_LIBS) \

Modified: trunk/pkcs11/ssh-store/Makefile.am
==============================================================================
--- trunk/pkcs11/ssh-store/Makefile.am	(original)
+++ trunk/pkcs11/ssh-store/Makefile.am	Sat Feb  7 18:43:16 2009
@@ -39,7 +39,6 @@
 gck_ssh_store_standalone_la_LIBADD = \
 	libgck-ssh-store.la \
 	$(top_builddir)/pkcs11/gck/libgck.la \
-	$(top_builddir)/egg/libegg.la \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GLIB_LIBS) \

Modified: trunk/pkcs11/user-store/Makefile.am
==============================================================================
--- trunk/pkcs11/user-store/Makefile.am	(original)
+++ trunk/pkcs11/user-store/Makefile.am	Sat Feb  7 18:43:16 2009
@@ -39,7 +39,6 @@
 gck_user_store_standalone_la_LIBADD = \
 	libgck-user-store.la \
 	$(top_builddir)/pkcs11/gck/libgck.la \
-	$(top_builddir)/egg/libegg.la \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GLIB_LIBS) \