GNOME.org
 

gnome-keyring r1173 - in trunk: . daemon daemon/data daemon/keyrings daemon/keyrings/tests daemon/pk daemon/pk/tests daemon/pkcs11 daemon/pkix daemon/pkix/tests daemon/ssh daemon/ssh/tests daemon/ui data keyrings pk pkcs11 pkix po ssh tests ui

Author: nnielsen
Date: Wed Jul  9 21:39:34 2008
New Revision: 1173
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1173&view=rev

Log:
	Move all daemon code and sub-modules into daemon/ directory.



Added:
   trunk/daemon/data/
      - copied from r1171, /trunk/data/
   trunk/daemon/keyrings/
      - copied from r1171, /trunk/keyrings/
   trunk/daemon/pk/
      - copied from r1171, /trunk/pk/
   trunk/daemon/pk/Makefile.am
      - copied, changed from r1172, /trunk/pk/Makefile.am
   trunk/daemon/pk/gkr-pk-cert.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-cert.c
   trunk/daemon/pk/gkr-pk-cert.h
      - copied unchanged from r1172, /trunk/pk/gkr-pk-cert.h
   trunk/daemon/pk/gkr-pk-import.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-import.c
   trunk/daemon/pk/gkr-pk-import.h
      - copied unchanged from r1172, /trunk/pk/gkr-pk-import.h
   trunk/daemon/pk/gkr-pk-manager.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-manager.c
   trunk/daemon/pk/gkr-pk-manager.h
      - copied unchanged from r1172, /trunk/pk/gkr-pk-manager.h
   trunk/daemon/pk/gkr-pk-netscape-trust.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-netscape-trust.c
   trunk/daemon/pk/gkr-pk-netscape-trust.h
      - copied unchanged from r1172, /trunk/pk/gkr-pk-netscape-trust.h
   trunk/daemon/pk/gkr-pk-object-storage.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-object-storage.c
   trunk/daemon/pk/gkr-pk-object.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-object.c
   trunk/daemon/pk/gkr-pk-object.h
      - copied unchanged from r1172, /trunk/pk/gkr-pk-object.h
   trunk/daemon/pk/gkr-pk-privkey.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-privkey.c
   trunk/daemon/pk/gkr-pk-privkey.h
      - copied unchanged from r1172, /trunk/pk/gkr-pk-privkey.h
   trunk/daemon/pk/gkr-pk-pubkey.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-pubkey.c
   trunk/daemon/pk/gkr-pk-pubkey.h
      - copied unchanged from r1172, /trunk/pk/gkr-pk-pubkey.h
   trunk/daemon/pk/gkr-pk-root-storage.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-root-storage.c
   trunk/daemon/pk/gkr-pk-session-storage.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-session-storage.c
   trunk/daemon/pk/gkr-pk-session.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-session.c
   trunk/daemon/pk/gkr-pk-session.h
      - copied unchanged from r1172, /trunk/pk/gkr-pk-session.h
   trunk/daemon/pk/gkr-pk-storage.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-storage.c
   trunk/daemon/pk/gkr-pk-storage.h
      - copied unchanged from r1172, /trunk/pk/gkr-pk-storage.h
   trunk/daemon/pk/gkr-pk-util.c
      - copied unchanged from r1172, /trunk/pk/gkr-pk-util.c
   trunk/daemon/pk/gkr-pk-util.h
      - copied unchanged from r1172, /trunk/pk/gkr-pk-util.h
   trunk/daemon/pk/tests/
      - copied from r1172, /trunk/pk/tests/
   trunk/daemon/pkcs11/   (props changed)
   trunk/daemon/pkcs11/Makefile.am
      - copied, changed from r1171, /trunk/pkcs11/Makefile.am
   trunk/daemon/pkcs11/gkr-pkcs11-daemon-session.c
      - copied, changed from r1172, /trunk/pkcs11/gkr-pkcs11-daemon-session.c
   trunk/daemon/pkcs11/gkr-pkcs11-daemon.c
      - copied, changed from r1171, /trunk/pkcs11/gkr-pkcs11-daemon.c
   trunk/daemon/pkcs11/gkr-pkcs11-daemon.h
      - copied unchanged from r1171, /trunk/pkcs11/gkr-pkcs11-daemon.h
   trunk/daemon/pkcs11/gkr-pkcs11-dsa.c
      - copied unchanged from r1171, /trunk/pkcs11/gkr-pkcs11-dsa.c
   trunk/daemon/pkcs11/gkr-pkcs11-dsa.h
      - copied, changed from r1172, /trunk/pkcs11/gkr-pkcs11-dsa.h
   trunk/daemon/pkcs11/gkr-pkcs11-rsa.c
      - copied unchanged from r1171, /trunk/pkcs11/gkr-pkcs11-rsa.c
   trunk/daemon/pkcs11/gkr-pkcs11-rsa.h
      - copied, changed from r1171, /trunk/pkcs11/gkr-pkcs11-rsa.h
   trunk/daemon/pkix/
      - copied from r1171, /trunk/pkix/
   trunk/daemon/pkix/gkr-pkix-parser.c
      - copied unchanged from r1172, /trunk/pkix/gkr-pkix-parser.c
   trunk/daemon/ssh/
      - copied from r1171, /trunk/ssh/
   trunk/daemon/ssh/gkr-ssh-daemon-ops.c
      - copied unchanged from r1172, /trunk/ssh/gkr-ssh-daemon-ops.c
   trunk/daemon/ssh/gkr-ssh-storage.c
      - copied unchanged from r1172, /trunk/ssh/gkr-ssh-storage.c
   trunk/daemon/ui/
      - copied from r1171, /trunk/ui/
Removed:
   trunk/daemon/pk/gkr-pk-object-manager.c
   trunk/daemon/pk/gkr-pk-object-manager.h
   trunk/data/
   trunk/keyrings/
   trunk/pk/
   trunk/pkcs11/gkr-pkcs11-daemon-session.c
   trunk/pkcs11/gkr-pkcs11-daemon.c
   trunk/pkcs11/gkr-pkcs11-daemon.h
   trunk/pkcs11/gkr-pkcs11-dsa.c
   trunk/pkcs11/gkr-pkcs11-dsa.h
   trunk/pkcs11/gkr-pkcs11-rsa.c
   trunk/pkcs11/gkr-pkcs11-rsa.h
   trunk/pkix/
   trunk/ssh/
   trunk/ui/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/daemon/Makefile.am
   trunk/daemon/keyrings/Makefile.am
   trunk/daemon/keyrings/tests/Makefile.am
   trunk/daemon/pk/tests/Makefile.am
   trunk/daemon/pkix/Makefile.am
   trunk/daemon/pkix/tests/Makefile.am
   trunk/daemon/ssh/Makefile.am
   trunk/daemon/ssh/tests/Makefile.am
   trunk/daemon/ui/Makefile.am
   trunk/pkcs11/Makefile.am
   trunk/po/POTFILES.in
   trunk/tests/run-tests.sh
   trunk/tests/test.make

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -4,12 +4,6 @@
 PAM_DIR = 
 endif
 
-if WITH_SSH
-SSH_DIR = ssh
-else
-SSH_DIR =
-endif
-
 if WITH_TESTS
 TESTS_DIR = tests
 else
@@ -20,14 +14,8 @@
 	. \
 	common \
 	library \
-	ui \
-	keyrings \
-	pkix \
-	pk \
-	$(SSH_DIR) \
 	pkcs11 \
 	daemon \
-	data \
 	po \
 	reference \
 	$(TESTS_DIR) \

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jul  9 21:39:34 2008
@@ -310,7 +310,6 @@
 	    AC_HELP_STRING([--disable-acl-prompts],
 	    [Disable prompted for user to give access to passwords]))
 
-echo "!!!!!!$enable_acl_prompts!!!!!"
 if test "$enable_acl_prompts" != "no"; then
 	AC_DEFINE(ENABLE_ACL_PROMPTS, 1, [Whether to prompt before giving access to passwords])
 fi
@@ -464,24 +463,25 @@
 common/Makefile
 common/tests/Makefile
 daemon/Makefile
-data/Makefile
-keyrings/Makefile
-keyrings/tests/Makefile
+daemon/data/Makefile
+daemon/keyrings/Makefile
+daemon/keyrings/tests/Makefile
+daemon/pk/Makefile
+daemon/pk/tests/Makefile
+daemon/pkcs11/Makefile
+daemon/pkix/Makefile
+daemon/pkix/tests/Makefile
+daemon/ssh/Makefile
+daemon/ssh/tests/Makefile
+daemon/ui/Makefile
 library/Makefile
 library/tests/Makefile
 pam/Makefile
 pam/tests/Makefile
-pk/Makefile
-pk/tests/Makefile
 pkcs11/Makefile
-pkix/Makefile
-pkix/tests/Makefile
 po/Makefile.in
 reference/Makefile
-ssh/Makefile
-ssh/tests/Makefile
 tests/Makefile
-ui/Makefile
 library/gnome-keyring-1.pc
 library/gnome-keyring-1-uninstalled.pc
 ])

Modified: trunk/daemon/Makefile.am
==============================================================================
--- trunk/daemon/Makefile.am	(original)
+++ trunk/daemon/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -1,3 +1,18 @@
+if WITH_SSH
+SSH_DIR = ssh
+else
+SSH_DIR =
+endif
+
+SUBDIRS = \
+	ui \
+	keyrings \
+	pkix \
+	pk \
+	pkcs11 \
+	$(SSH_DIR) \
+	data 
+
 bin_PROGRAMS= \
 	gnome-keyring-daemon
 
@@ -7,6 +22,7 @@
 	-DLIBEXECDIR=\""$(libexecdir)"\"		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir) 				\
+	-I$(top_srcdir)/daemon 				\
 	-I$(top_builddir) 				\
 	$(DAEMON_CFLAGS)				\
 	$(GOBJECT_CFLAGS)				\
@@ -21,11 +37,11 @@
 	gkr-daemon-ops.c
 
 gnome_keyring_daemon_LDADD = \
-	$(top_builddir)/ssh/libgkr-ssh.la \
-	$(top_builddir)/pkcs11/libgkr-pkcs11.la \
-	$(top_builddir)/pk/libgkr-pk.la \
-	$(top_builddir)/keyrings/libgkr-keyrings.la \
-	$(top_builddir)/ui/libgkr-ui.la \
+	$(top_builddir)/daemon/ssh/libgkr-ssh.la \
+	$(top_builddir)/daemon/pkcs11/libgkr-pkcs11.la \
+	$(top_builddir)/daemon/pk/libgkr-pk.la \
+	$(top_builddir)/daemon/keyrings/libgkr-keyrings.la \
+	$(top_builddir)/daemon/ui/libgkr-ui.la \
 	$(top_builddir)/library/libgnome-keyring-common.la \
 	$(top_builddir)/common/libgkr-common.la \
 	$(DAEMON_LIBS) \

Modified: trunk/daemon/keyrings/Makefile.am
==============================================================================
--- /trunk/keyrings/Makefile.am	(original)
+++ trunk/daemon/keyrings/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -6,6 +6,7 @@
 	-DLIBEXECDIR=\""$(libexecdir)"\"		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir) 				\
+	-I$(top_srcdir)/daemon 				\
 	-I$(top_builddir) 				\
 	$(DAEMON_CFLAGS)				\
 	$(GOBJECT_CFLAGS) 				\
@@ -32,4 +33,4 @@
 endif
 
 SUBDIRS = . $(TESTS_DIR)
-	
\ No newline at end of file
+	

Modified: trunk/daemon/keyrings/tests/Makefile.am
==============================================================================
--- /trunk/keyrings/tests/Makefile.am	(original)
+++ trunk/daemon/keyrings/tests/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -7,9 +7,9 @@
 	unit-test-login-prompt.c 
 
 UNIT_LIBS =  \
-	$(top_builddir)/keyrings/libgkr-keyrings.la \
+	$(top_builddir)/daemon/keyrings/libgkr-keyrings.la \
+	$(top_builddir)/daemon/ui/libgkr-ui.la \
 	$(top_builddir)/library/libgnome-keyring-common.la \
-	$(top_builddir)/ui/libgkr-ui.la \
 	$(top_builddir)/common/libgkr-common.la
 
 EXTRA_DIST = test-data

Copied: trunk/daemon/pk/Makefile.am (from r1172, /trunk/pk/Makefile.am)
==============================================================================
--- /trunk/pk/Makefile.am	(original)
+++ trunk/daemon/pk/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -13,6 +13,7 @@
 	-DLIBEXECDIR=\""$(libexecdir)"\"		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir) 				\
+	-I$(top_srcdir)/daemon 				\
 	-I$(top_builddir) 				\
 	$(DAEMON_CFLAGS)				\
 	$(GOBJECT_CFLAGS) 				\
@@ -36,8 +37,8 @@
 	$(ROOT_SRCS)
 
 libgkr_pk_la_LIBADD = \
-	$(top_builddir)/ui/libgkr-ui.la \
-	$(top_builddir)/pkix/libgkr-pkix.la \
+	$(top_builddir)/daemon/ui/libgkr-ui.la \
+	$(top_builddir)/daemon/pkix/libgkr-pkix.la \
 	$(top_builddir)/common/libgkr-common.la \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \

Modified: trunk/daemon/pk/tests/Makefile.am
==============================================================================
--- /trunk/pk/tests/Makefile.am	(original)
+++ trunk/daemon/pk/tests/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -10,8 +10,8 @@
 UNIT_PROMPT = 
 
 UNIT_LIBS =  \
-	$(top_builddir)/pk/libgkr-pk.la \
-	$(top_builddir)/keyrings/libgkr-keyrings.la \
+	$(top_builddir)/daemon/pk/libgkr-pk.la \
+	$(top_builddir)/daemon/keyrings/libgkr-keyrings.la \
 	$(top_builddir)/library/libgnome-keyring-common.la \
 	$(top_builddir)/common/libgkr-common.la
 

Copied: trunk/daemon/pkcs11/Makefile.am (from r1171, /trunk/pkcs11/Makefile.am)
==============================================================================
--- /trunk/pkcs11/Makefile.am	(original)
+++ trunk/daemon/pkcs11/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -1,53 +1,17 @@
 
-EXTRA_DIST = \
-	pkcs11.h \
-	pkcs11g.h \
-	pkcs11n.h 
-
-# ------------------------------------------------------------------------------
-# The pkcs11 module 
-
-moduledir = $(libdir)/gnome-keyring/
-
-MODULE_SRCS = \
-	gkr-pkcs11-module.c \
-	gkr-pkcs11-message.c gkr-pkcs11-message.h \
-	gkr-pkcs11-mechanisms.h gkr-pkcs11-calls.h 
-
-module_LTLIBRARIES = gnome-keyring-pkcs11.la
-
-gnome_keyring_pkcs11_la_LDFLAGS = \
-	-module -avoid-version \
-	-no-undefined -export-symbols-regex 'C_GetFunctionList'
-
-gnome_keyring_pkcs11_la_CFLAGS = \
-	-I. \
-	-I$(top_srcdir)
-
-gnome_keyring_pkcs11_la_SOURCES = $(MODULE_SRCS)
-
-gnome_keyring_pkcs11_la_LIBADD = \
-	$(top_builddir)/common/libgkr-module-common.la 
-
-# ------------------------------------------------------------------------------
-# The pkcs11 parts in the daemon. Currently these are built into 
-# their own binary for testing purposes.
-# 
-
 INCLUDES = \
 	-I$(top_srcdir) 				\
+	-I$(top_srcdir)/daemon 				\
 	-I$(top_builddir) 				\
 	$(DAEMON_CFLAGS)				\
 	$(GOBJECT_CFLAGS) 				\
 	$(GLIB_CFLAGS)
 
 DAEMON_SRCS = \
-	gkr-pkcs11-calls.h \
 	gkr-pkcs11-daemon.c gkr-pkcs11-daemon.h \
 	gkr-pkcs11-daemon-session.c \
 	gkr-pkcs11-dsa.c gkr-pkcs11-dsa.h \
-	gkr-pkcs11-mechanisms.h \
-	gkr-pkcs11-message.c gkr-pkcs11-message.h \
+	$(top_srcdir)/pkcs11/gkr-pkcs11-message.c \
 	gkr-pkcs11-rsa.c gkr-pkcs11-rsa.h
 
 noinst_LTLIBRARIES = libgkr-pkcs11.la

Copied: trunk/daemon/pkcs11/gkr-pkcs11-daemon-session.c (from r1172, /trunk/pkcs11/gkr-pkcs11-daemon-session.c)
==============================================================================
--- /trunk/pkcs11/gkr-pkcs11-daemon-session.c	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-daemon-session.c	Wed Jul  9 21:39:34 2008
@@ -25,12 +25,9 @@
 
 #include <glib.h>
 
-#include "gkr-pkcs11-message.h"
-#include "gkr-pkcs11-calls.h"
 #include "gkr-pkcs11-daemon.h"
 #include "gkr-pkcs11-dsa.h"
 #include "gkr-pkcs11-rsa.h"
-#include "pkcs11.h"
 
 #include "common/gkr-async.h"
 #include "common/gkr-buffer.h"
@@ -45,6 +42,10 @@
 #include "pk/gkr-pk-storage.h"
 #include "pk/gkr-pk-util.h"
 
+#include "pkcs11/gkr-pkcs11-message.h"
+#include "pkcs11/gkr-pkcs11-calls.h"
+#include "pkcs11/pkcs11.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>

Copied: trunk/daemon/pkcs11/gkr-pkcs11-daemon.c (from r1171, /trunk/pkcs11/gkr-pkcs11-daemon.c)
==============================================================================
--- /trunk/pkcs11/gkr-pkcs11-daemon.c	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-daemon.c	Wed Jul  9 21:39:34 2008
@@ -23,8 +23,6 @@
 
 #include <glib.h>
 
-#include "gkr-pkcs11-calls.h"
-#include "gkr-pkcs11-message.h"
 #include "gkr-pkcs11-daemon.h"
 
 #include "common/gkr-async.h"
@@ -32,6 +30,9 @@
 #include "common/gkr-daemon-util.h"
 #include "common/gkr-secure-memory.h"
 
+#include "pkcs11/gkr-pkcs11-calls.h"
+#include "pkcs11/gkr-pkcs11-message.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>

Copied: trunk/daemon/pkcs11/gkr-pkcs11-dsa.h (from r1172, /trunk/pkcs11/gkr-pkcs11-dsa.h)
==============================================================================
--- /trunk/pkcs11/gkr-pkcs11-dsa.h	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-dsa.h	Wed Jul  9 21:39:34 2008
@@ -24,10 +24,10 @@
 #ifndef GKRPKCS11DSA_H_
 #define GKRPKCS11DSA_H_
 
-#include "pkcs11.h"
-
 #include "pk/gkr-pk-object.h"
 
+#include "pkcs11/pkcs11.h"
+
 CK_RV                 gkr_pkcs11_dsa_sign                   (GkrPkObject *key, 
                                                              const guchar *plain, gsize n_plain, 
                                                              guchar **signature, gsize *n_signature);

Copied: trunk/daemon/pkcs11/gkr-pkcs11-rsa.h (from r1171, /trunk/pkcs11/gkr-pkcs11-rsa.h)
==============================================================================
--- /trunk/pkcs11/gkr-pkcs11-rsa.h	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-rsa.h	Wed Jul  9 21:39:34 2008
@@ -24,10 +24,11 @@
 #ifndef GKRPKCS11RSA_H_
 #define GKRPKCS11RSA_H_
 
-#include "pkcs11.h"
+#include "common/gkr-crypto.h"
 
 #include "pk/gkr-pk-object.h"
-#include "common/gkr-crypto.h"
+
+#include "pkcs11/pkcs11.h"
 
 CK_RV                 gkr_pkcs11_rsa_encrypt                (GkrPkObject *key, GkrCryptoPadding padfunc,
                                                              const guchar *plain, gsize n_plain, 

Modified: trunk/daemon/pkix/Makefile.am
==============================================================================
--- /trunk/pkix/Makefile.am	(original)
+++ trunk/daemon/pkix/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -7,6 +7,7 @@
 	-DLIBEXECDIR=\""$(libexecdir)"\"		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir) 				\
+	-I$(top_srcdir)/daemon 				\
 	-I$(top_builddir) 				\
 	$(DAEMON_CFLAGS)				\
 	$(GOBJECT_CFLAGS) 				\

Modified: trunk/daemon/pkix/tests/Makefile.am
==============================================================================
--- /trunk/pkix/tests/Makefile.am	(original)
+++ trunk/daemon/pkix/tests/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -17,7 +17,7 @@
 UNIT_PROMPT = 
 
 UNIT_LIBS =  \
-	$(top_builddir)/pkix/libgkr-pkix.la \
+	$(top_builddir)/daemon/pkix/libgkr-pkix.la \
 	$(top_builddir)/common/libgkr-common.la
 
 EXTRA_DIST = \

Modified: trunk/daemon/ssh/Makefile.am
==============================================================================
--- /trunk/ssh/Makefile.am	(original)
+++ trunk/daemon/ssh/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -6,6 +6,7 @@
 	-DLIBEXECDIR=\""$(libexecdir)"\"		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir) 				\
+	-I$(top_srcdir)/daemon 				\
 	-I$(top_builddir) 				\
 	$(DAEMON_CFLAGS)				\
 	$(GOBJECT_CFLAGS) 				\

Modified: trunk/daemon/ssh/tests/Makefile.am
==============================================================================
--- /trunk/ssh/tests/Makefile.am	(original)
+++ trunk/daemon/ssh/tests/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -5,11 +5,11 @@
 UNIT_PROMPT = 
 
 UNIT_LIBS =  \
-	$(top_builddir)/ssh/libgkr-ssh.la \
-	$(top_builddir)/pk/libgkr-pk.la \
-	$(top_builddir)/keyrings/libgkr-keyrings.la \
+	$(top_builddir)/daemon/ssh/libgkr-ssh.la \
+	$(top_builddir)/daemon/pk/libgkr-pk.la \
+	$(top_builddir)/daemon/keyrings/libgkr-keyrings.la \
+	$(top_builddir)/daemon/pkix/libgkr-pkix.la \
 	$(top_builddir)/library/libgnome-keyring-common.la \
-	$(top_builddir)/pkix/libgkr-pkix.la \
 	$(top_builddir)/common/libgkr-common.la
 
 include $(top_srcdir)/tests/test.make

Modified: trunk/daemon/ui/Makefile.am
==============================================================================
--- /trunk/ui/Makefile.am	(original)
+++ trunk/daemon/ui/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -7,7 +7,7 @@
 	-DLIBEXECDIR=\""$(libexecdir)"\"		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/library/			\
+	-I$(top_srcdir)/daemon 				\
 	-I$(top_builddir) 				\
 	$(DAEMON_CFLAGS)				\
 	$(GOBJECT_CFLAGS) 				\

Modified: trunk/pkcs11/Makefile.am
==============================================================================
--- trunk/pkcs11/Makefile.am	(original)
+++ trunk/pkcs11/Makefile.am	Wed Jul  9 21:39:34 2008
@@ -29,32 +29,4 @@
 gnome_keyring_pkcs11_la_LIBADD = \
 	$(top_builddir)/common/libgkr-module-common.la 
 
-# ------------------------------------------------------------------------------
-# The pkcs11 parts in the daemon. Currently these are built into 
-# their own binary for testing purposes.
-# 
-
-INCLUDES = \
-	-I$(top_srcdir) 				\
-	-I$(top_builddir) 				\
-	$(DAEMON_CFLAGS)				\
-	$(GOBJECT_CFLAGS) 				\
-	$(GLIB_CFLAGS)
-
-DAEMON_SRCS = \
-	gkr-pkcs11-calls.h \
-	gkr-pkcs11-daemon.c gkr-pkcs11-daemon.h \
-	gkr-pkcs11-daemon-session.c \
-	gkr-pkcs11-dsa.c gkr-pkcs11-dsa.h \
-	gkr-pkcs11-mechanisms.h \
-	gkr-pkcs11-message.c gkr-pkcs11-message.h \
-	gkr-pkcs11-rsa.c gkr-pkcs11-rsa.h
-
-noinst_LTLIBRARIES = libgkr-pkcs11.la
-
-libgkr_pkcs11_la_SOURCES = $(DAEMON_SRCS)
-
-libgkr_pkcs11_la_LIBADD = \
-	$(GLIB_LIBS) \
-	$(GOBJECT_LIBS)
 

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Jul  9 21:39:34 2008
@@ -2,16 +2,17 @@
 # Please keep this file sorted alphabetically.
 common/gkr-location.c
 daemon/gkr-daemon-ops.c
-data/gnome-keyring.schemas.in
+daemon/data/gnome-keyring.schemas.in
+daemon/keyrings/gkr-keyring-login.c
+daemon/keyrings/gkr-keyring.c
+daemon/pk/gkr-pk-import.c
+daemon/pk/gkr-pk-index.c
+daemon/pk/gkr-pk-object.c
+daemon/pk/gkr-pk-object-storage.c
+daemon/pk/gkr-pk-storage.c
+daemon/pkix/gkr-pkix-parser.c
+daemon/pkix/gkr-pkix-serialize.c
+daemon/ssh/gkr-ssh-storage.c
+daemon/ui/gkr-ask-tool.c
 library/gnome-keyring-utils.c
-keyrings/gkr-keyring-login.c
-keyrings/gkr-keyring.c
-pk/gkr-pk-import.c
-pk/gkr-pk-index.c
-pk/gkr-pk-object.c
-pk/gkr-pk-object-storage.c
-pk/gkr-pk-storage.c
-pkix/gkr-pkix-parser.c
-pkix/gkr-pkix-serialize.c
-ssh/gkr-ssh-storage.c
-ui/gkr-ask-tool.c
+

Modified: trunk/tests/run-tests.sh
==============================================================================
--- trunk/tests/run-tests.sh	(original)
+++ trunk/tests/run-tests.sh	Wed Jul  9 21:39:34 2008
@@ -18,3 +18,10 @@
 	fi
 done
 
+for component in daemon/*; do
+	if [ -f "$component/tests/$PRG" ]; then
+		echo "<<<<< Running tests in '$component' >>>>>" 
+		$component/tests/$PRG
+	fi
+done
+

Modified: trunk/tests/test.make
==============================================================================
--- trunk/tests/test.make	(original)
+++ trunk/tests/test.make	Wed Jul  9 21:39:34 2008
@@ -8,6 +8,7 @@
 
 INCLUDES=				\
 	-I$(top_srcdir) 		\
+	-I$(top_srcdir)/daemon 		\
 	-I$(top_builddir) 		\
 	$(GTK_CFLAGS)			\
 	$(GLIB_CFLAGS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]