From e6879dca0328a6f8b3cfacdb541f9a52584853f2 Mon Sep 17 00:00:00 2001
From: Stefan Walter <stefw@src.gnome.org>
Date: Wed, 28 Nov 2007 17:09:24 +0000
Subject: Move cryptoki stuff into pkcs11/ directory and rename the namespace

	* cryptoki/*: (moved to pkcs11/, renamed to *pkcs11*)
	* doc/file-format.txt: (moved to keyrings/)
	* doc/keyring-intro.txt: (moved to /)
	* HACKING:
	* Makefile.am: Move cryptoki stuff into pkcs11/ directory and
rename
	the namespace prefixes. Move the doc/ files into other
locations.


svn path=/trunk/; revision=890
---
 Makefile.am | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 99d34b1d..5cadc946 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,15 +14,13 @@ SUBDIRS = \
 	. \
 	common \
 	library \
-	pkcs11 \
 	keyrings \
 	ui \
 	pkix \
 	pk \
 	ssh \
 	daemon \
-	cryptoki \
-	doc \
+	pkcs11 \
 	po \
 	reference \
 	$(TESTS_DIR) \
@@ -32,6 +30,7 @@ EXTRA_DIST = \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
+	keyring-intro.txt \
 	HACKING
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-tests
-- 
cgit v1.2.1