gnome-keyring r1412 - in trunk: . pkcs11

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Dec 28 03:23:07 2008
New Revision: 1412
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1412&view=rev

Log:


Modified:
   trunk/ChangeLog
   trunk/pkcs11/Makefile.am

Modified: trunk/pkcs11/Makefile.am
==============================================================================
--- trunk/pkcs11/Makefile.am	(original)
+++ trunk/pkcs11/Makefile.am	Sun Dec 28 03:23:07 2008
@@ -35,11 +35,17 @@
 	$(top_builddir)/common/libgkr-module-common.la 
 
 
+if WITH_ROOT_CERTS
+ROOTS_DIR = roots
+else
+ROOTS_DIR = 
+endif
+
 if WITH_TESTS
 TESTS_DIR = tests
 else
 TESTS_DIR = 
 endif
 
-SUBDIRS = . rpc gck ssh-keys roots $(TESTS_DIR)
+SUBDIRS = . rpc gck ssh-keys $(ROOTS_DIR) $(TESTS_DIR)