Reorganized file tree. All library and common files All daemon files

	* Reorganized file tree. 
	* library/*: All library and common files
	* daemon/*: All daemon files
	* doc/*: Random documentation
	* configure.in: Updated version number development version


svn path=/trunk/; revision=569

39 files changed, 152 insertions, 128 deletions

diff --git a/ChangeLog b/ChangeLog
index 76411fa4..1dafbfdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-03-31  Nate Nielsen  <nielsen@memberwebs.com> 
+	
+	* Reorganized file tree. 
+	* library/*: All library and common files
+	* daemon/*: All daemon files
+	* doc/*: Random documentation
+	* configure.in: Updated version number development version
+
+=== Branched for 2.18 work on gnome-2-18 branch ==
+
 2007-03-31  Nate Nielsen  <nielsen@memberwebs.com>
 
 	* gnome-keyring-daemon.c: Fix null pointer crashes. 
diff --git a/INSTALL b/INSTALL
index a4b34144..54caf7c1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
 Foundation, Inc.
 
    This file is free documentation; the Free Software Foundation gives
diff --git a/Makefile.am b/Makefile.am
index 8aa1579f..a8dda6cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,118 +1,12 @@
 SUBDIRS = \
 	. \
+	library \
+	daemon \
+	doc \
 	po \
 	reference
 
-libgnomekeyringincludedir = $(includedir)/gnome-keyring-1/
-
-bin_PROGRAMS= \
-	gnome-keyring-daemon
-
-libexec_PROGRAMS= \
-	gnome-keyring-ask
-
-noinst_PROGRAMS= \
-	list-keyrings \
-	test-keyring \
-	test-keyring-two
-
-lib_LTLIBRARIES=libgnome-keyring.la
-
-noinst_LTLIBRARIES=libgnome-keyring-common.la
-
-INCLUDES=	\
-	-DPREFIX=\""$(prefix)"\" 			\
-	-DBINDIR=\""$(bindir)"\" 			\
-	-DLIBEXECDIR=\""$(libexecdir)"\"		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-I$(top_srcdir) 				\
-	-I$(top_builddir) 				\
-	$(GTK_CFLAGS) 					\
-	$(GLIB_CFLAGS)
-
-libgnome_keyring_common_la_SOURCES = \
-	gnome-keyring-private.h \
-	gnome-keyring-proto.c \
-	gnome-keyring-proto.h \
-	gnome-keyring-utils.c
-
-libgnome_keyring_common_la_LIBADD = \
-	$(GLIB_LIBS)
-
-libgnome_keyring_la_SOURCES = \
-	gnome-keyring.c \
-	gnome-keyring.h
-
-libgnomekeyringinclude_HEADERS =		\
-	gnome-keyring.h
-
-
-libgnome_keyring_la_LIBADD = \
-	libgnome-keyring-common.la \
-	$(GLIB_LIBS)
-
-libgnome_keyring_la_LDFLAGS = \
-	-version-info $(LIB_GNOME_KEYRING_LT_VERSION) \
-	-no-undefined
-
-LIBADD_SOURCE = mkdtemp.c mkdtemp.h
-
-gnome_keyring_daemon_SOURCES = \
-	aes.c \
-	aes.h \
-	aes_be.h \
-	aes_le.h \
-	beecrypt_compat.h \
-	md5.c \
-	md5.h \
-	sha256.c \
-	sha256.h \
-	gnome-keyring-daemon.c \
-	gnome-keyring-daemon-file.c \
-	gnome-keyring-daemon.h \
-	gnome-keyring-daemon-io.c \
-	gnome-keyring-daemon-dbus.c
-
-gnome_keyring_daemon_LDADD = \
-	libgnome-keyring-common.la \
-	@LIBOBJS@ \
-	$(GLIB_LIBS)
-
-gnome_keyring_ask_SOURCES = \
-	gnome-keyring-ask.c
-
-gnome_keyring_ask_LDADD = \
-	$(GTK_LIBS)
-
-list_keyrings_SOURCES = \
-	list-keyrings.c
-
-list_keyrings_LDADD = \
-	libgnome-keyring.la \
-	$(GTK_LIBS)
-
-test_keyring_SOURCES = \
-	test.c
-
-test_keyring_LDADD = \
-	libgnome-keyring.la \
-	$(GTK_LIBS)
-
-test_keyring_two_SOURCES = \
-	test.c
-
-test_keyring_two_LDADD = \
-	libgnome-keyring.la \
-	$(GTK_LIBS)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnome-keyring-1.pc
-
 EXTRA_DIST = \
-	$(LIBADD_SOURCE) \
-	file-format.txt  \
-	keyring-intro.txt \
-	gnome-keyring-1-uninstalled.pc.in \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in
diff --git a/autogen.sh b/autogen.sh
index c00537e8..39df1408 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,8 +8,8 @@ PKG_NAME="gnome-keyring"
 REQUIRED_AUTOMAKE_VERSION=1.6
 
 (test -f $srcdir/configure.in \
-  && test -f $srcdir/gnome-keyring.h \
-  && test -f $srcdir/gnome-keyring.c) || {
+  && test -f $srcdir/library/gnome-keyring.h \
+  && test -f $srcdir/library/gnome-keyring.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
diff --git a/configure.in b/configure.in
index 65429be5..b2cf7098 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-AC_INIT(gnome-keyring.h)
+AC_INIT(library/gnome-keyring.h)
 
-AM_INIT_AUTOMAKE(gnome-keyring, 0.8)
+AM_INIT_AUTOMAKE(gnome-keyring, 0.9.1)
 AM_CONFIG_HEADER(config.h)
 	
 AM_SANITY_CHECK
@@ -191,8 +191,11 @@ fi
 			       
 AC_OUTPUT([
 Makefile
+daemon/Makefile
+doc/Makefile
+library/Makefile
 po/Makefile.in
 reference/Makefile
-gnome-keyring-1.pc
-gnome-keyring-1-uninstalled.pc
+library/gnome-keyring-1.pc
+library/gnome-keyring-1-uninstalled.pc
 ])
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
new file mode 100644
index 00000000..cfd15109
--- /dev/null
+++ b/daemon/Makefile.am
@@ -0,0 +1,49 @@
+bin_PROGRAMS= \
+	gnome-keyring-daemon
+
+libexec_PROGRAMS= \
+	gnome-keyring-ask
+
+INCLUDES=	\
+	-DPREFIX=\""$(prefix)"\" 			\
+	-DBINDIR=\""$(bindir)"\" 			\
+	-DLIBEXECDIR=\""$(libexecdir)"\"		\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	-I$(top_srcdir) 					\
+	-I$(top_srcdir)/library/			\
+	-I$(top_builddir) 				\
+	$(GTK_CFLAGS) 					\
+	$(GLIB_CFLAGS)
+
+LIBADD_SOURCE = mkdtemp.c mkdtemp.h
+
+gnome_keyring_daemon_SOURCES = \
+	aes.c \
+	aes.h \
+	aes_be.h \
+	aes_le.h \
+	beecrypt_compat.h \
+	md5.c \
+	md5.h \
+	sha256.c \
+	sha256.h \
+	gnome-keyring-daemon.c \
+	gnome-keyring-daemon-file.c \
+	gnome-keyring-daemon.h \
+	gnome-keyring-daemon-io.c \
+	gnome-keyring-daemon-dbus.c
+
+gnome_keyring_daemon_LDADD = \
+	$(top_builddir)/library/libgnome-keyring-common.la \
+	@LIBOBJS@ \
+	$(GLIB_LIBS)
+
+gnome_keyring_ask_SOURCES = \
+	gnome-keyring-ask.c
+
+gnome_keyring_ask_LDADD = \
+	$(GTK_LIBS)
+
+EXTRA_DIST = \
+	$(LIBADD_SOURCE) 
+
diff --git a/aes.c b/daemon/aes.c
index 77789b36..77789b36 100644
--- a/aes.c
+++ b/daemon/aes.c
diff --git a/aes.h b/daemon/aes.h
index 76b5f0dd..76b5f0dd 100644
--- a/aes.h
+++ b/daemon/aes.h
diff --git a/aes_be.h b/daemon/aes_be.h
index 6e0509b3..6e0509b3 100644
--- a/aes_be.h
+++ b/daemon/aes_be.h
diff --git a/aes_le.h b/daemon/aes_le.h
index d83a7ea5..d83a7ea5 100644
--- a/aes_le.h
+++ b/daemon/aes_le.h
diff --git a/beecrypt_compat.h b/daemon/beecrypt_compat.h
index b10f9677..b10f9677 100644
--- a/beecrypt_compat.h
+++ b/daemon/beecrypt_compat.h
diff --git a/gnome-keyring-ask.c b/daemon/gnome-keyring-ask.c
index 47b09212..47b09212 100644
--- a/gnome-keyring-ask.c
+++ b/daemon/gnome-keyring-ask.c
diff --git a/gnome-keyring-daemon-dbus.c b/daemon/gnome-keyring-daemon-dbus.c
index 74994984..74994984 100644
--- a/gnome-keyring-daemon-dbus.c
+++ b/daemon/gnome-keyring-daemon-dbus.c
diff --git a/gnome-keyring-daemon-file.c b/daemon/gnome-keyring-daemon-file.c
index 8d023e16..8d023e16 100644
--- a/gnome-keyring-daemon-file.c
+++ b/daemon/gnome-keyring-daemon-file.c
diff --git a/gnome-keyring-daemon-io.c b/daemon/gnome-keyring-daemon-io.c
index 6f921b80..6f921b80 100644
--- a/gnome-keyring-daemon-io.c
+++ b/daemon/gnome-keyring-daemon-io.c
diff --git a/gnome-keyring-daemon.c b/daemon/gnome-keyring-daemon.c
index ca05b306..ca05b306 100644
--- a/gnome-keyring-daemon.c
+++ b/daemon/gnome-keyring-daemon.c
diff --git a/gnome-keyring-daemon.h b/daemon/gnome-keyring-daemon.h
index 6aff596a..6aff596a 100644
--- a/gnome-keyring-daemon.h
+++ b/daemon/gnome-keyring-daemon.h
diff --git a/md5.c b/daemon/md5.c
index 40d197a6..40d197a6 100644
--- a/md5.c
+++ b/daemon/md5.c
diff --git a/md5.h b/daemon/md5.h
index e958c913..e958c913 100644
--- a/md5.h
+++ b/daemon/md5.h
diff --git a/mkdtemp.c b/daemon/mkdtemp.c
index 15081020..15081020 100644
--- a/mkdtemp.c
+++ b/daemon/mkdtemp.c
diff --git a/mkdtemp.h b/daemon/mkdtemp.h
index dbc47ac3..dbc47ac3 100644
--- a/mkdtemp.h
+++ b/daemon/mkdtemp.h
diff --git a/sha256.c b/daemon/sha256.c
index 3b6db905..3b6db905 100644
--- a/sha256.c
+++ b/daemon/sha256.c
diff --git a/sha256.h b/daemon/sha256.h
index 4a1d26ac..4a1d26ac 100644
--- a/sha256.h
+++ b/daemon/sha256.h
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 00000000..4e7e9f83
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = \
+	file-format.txt  \
+	keyring-intro.txt 
+
diff --git a/file-format.txt b/doc/file-format.txt
index e3c36a2b..e3c36a2b 100644
--- a/file-format.txt
+++ b/doc/file-format.txt
diff --git a/keyring-intro.txt b/doc/keyring-intro.txt
index 4d788c1f..4d788c1f 100644
--- a/keyring-intro.txt
+++ b/doc/keyring-intro.txt
diff --git a/library/Makefile.am b/library/Makefile.am
new file mode 100644
index 00000000..96eee60a
--- /dev/null
+++ b/library/Makefile.am
@@ -0,0 +1,73 @@
+libgnomekeyringincludedir = $(includedir)/gnome-keyring-1/
+
+noinst_PROGRAMS= \
+	list-keyrings \
+	test-keyring \
+	test-keyring-two
+
+lib_LTLIBRARIES=libgnome-keyring.la
+
+noinst_LTLIBRARIES=libgnome-keyring-common.la
+
+INCLUDES=	\
+	-DPREFIX=\""$(prefix)"\" 			\
+	-DBINDIR=\""$(bindir)"\" 			\
+	-DLIBEXECDIR=\""$(libexecdir)"\"		\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir) 				\
+	$(GTK_CFLAGS) 					\
+	$(GLIB_CFLAGS)
+
+libgnome_keyring_common_la_SOURCES = \
+	gnome-keyring-private.h \
+	gnome-keyring-proto.c \
+	gnome-keyring-proto.h \
+	gnome-keyring-utils.c
+
+libgnome_keyring_common_la_LIBADD = \
+	$(GLIB_LIBS)
+
+libgnome_keyring_la_SOURCES = \
+	gnome-keyring.c \
+	gnome-keyring.h
+
+libgnomekeyringinclude_HEADERS =		\
+	gnome-keyring.h
+
+
+libgnome_keyring_la_LIBADD = \
+	libgnome-keyring-common.la \
+	$(GLIB_LIBS)
+
+libgnome_keyring_la_LDFLAGS = \
+	-version-info $(LIB_GNOME_KEYRING_LT_VERSION) \
+	-no-undefined
+
+list_keyrings_SOURCES = \
+	list-keyrings.c
+
+list_keyrings_LDADD = \
+	libgnome-keyring.la \
+	$(GTK_LIBS)
+
+test_keyring_SOURCES = \
+	test.c
+
+test_keyring_LDADD = \
+	libgnome-keyring.la \
+	$(GTK_LIBS)
+
+test_keyring_two_SOURCES = \
+	test.c
+
+test_keyring_two_LDADD = \
+	libgnome-keyring.la \
+	$(GTK_LIBS)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gnome-keyring-1.pc
+
+EXTRA_DIST = \
+	gnome-keyring-1-uninstalled.pc.in 
+
diff --git a/gnome-keyring-1-uninstalled.pc.in b/library/gnome-keyring-1-uninstalled.pc.in
index d5293b03..d5293b03 100644
--- a/gnome-keyring-1-uninstalled.pc.in
+++ b/library/gnome-keyring-1-uninstalled.pc.in
diff --git a/gnome-keyring-1.pc.in b/library/gnome-keyring-1.pc.in
index cc053bec..cc053bec 100644
--- a/gnome-keyring-1.pc.in
+++ b/library/gnome-keyring-1.pc.in
diff --git a/gnome-keyring-private.h b/library/gnome-keyring-private.h
index f1c17a76..f1c17a76 100644
--- a/gnome-keyring-private.h
+++ b/library/gnome-keyring-private.h
diff --git a/gnome-keyring-proto.c b/library/gnome-keyring-proto.c
index aee7c39b..aee7c39b 100644
--- a/gnome-keyring-proto.c
+++ b/library/gnome-keyring-proto.c
diff --git a/gnome-keyring-proto.h b/library/gnome-keyring-proto.h
index 67d5880d..67d5880d 100644
--- a/gnome-keyring-proto.h
+++ b/library/gnome-keyring-proto.h
diff --git a/gnome-keyring-utils.c b/library/gnome-keyring-utils.c
index c802ca02..c802ca02 100644
--- a/gnome-keyring-utils.c
+++ b/library/gnome-keyring-utils.c
diff --git a/gnome-keyring.c b/library/gnome-keyring.c
index 000089c8..000089c8 100644
--- a/gnome-keyring.c
+++ b/library/gnome-keyring.c
diff --git a/gnome-keyring.h b/library/gnome-keyring.h
index 1739b8a0..1739b8a0 100644
--- a/gnome-keyring.h
+++ b/library/gnome-keyring.h
diff --git a/list-keyrings.c b/library/list-keyrings.c
index 8c6219c0..8c6219c0 100644
--- a/list-keyrings.c
+++ b/library/list-keyrings.c
diff --git a/test.c b/library/test.c
index ecdcb64d..ecdcb64d 100644
--- a/test.c
+++ b/library/test.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3f342b82..852335ab 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,3 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-gnome-keyring-ask.c
+daemon/gnome-keyring-ask.c
diff --git a/reference/Makefile.am b/reference/Makefile.am
index 99275216..f10afdda 100644
--- a/reference/Makefile.am
+++ b/reference/Makefile.am
@@ -44,23 +44,14 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/*.h
-CFILE_GLOB=$(top_srcdir)/*.c
+HFILE_GLOB=$(top_srcdir)/library/*.h
+CFILE_GLOB=$(top_srcdir)/library/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES=\
-	aes_be.h \
-	aes.h \
-	aes_le.h \
-	beecrypt_compat.h \
-	config.h \
-	gnome-keyring-daemon.h \
 	gnome-keyring-private.h \
 	gnome-keyring-proto.h \
-	md5.h \
-	mkdtemp.h \
-	sha256.h \
 	$(NULL)
 
 # Images to copy into HTML directory.