[gnome-keyring/dbus-api] [secrets] Move secrets api to top level in source tree.

[Stefan Walter <stefw src gnome org>]

commit 9c09766eda22ab3143ed65abcdceeb798de1b588
Author: Stef Walter <stef memberwebs com>
Date:   Thu Jul 23 20:09:00 2009 +0000

    [secrets] Move secrets api to top level in source tree.

 Makefile.am                                        |    1 +
 configure.in                                       |    3 +--
 daemon/Makefile.am                                 |    3 +--
 daemon/secrets/Makefile.am                         |    2 --
 docs/reference/secrets/Makefile.am                 |    8 ++++----
 docs/reference/secrets/secrets-docs.sgml           |   14 +++++++-------
 {daemon/secrets/api => secrets}/.gitignore         |    0
 {daemon/secrets/api => secrets}/Makefile.am        |    0
 .../api => secrets}/org.freedesktop.Secrets.xml    |    0
 9 files changed, 14 insertions(+), 17 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8c4e10a..beb34c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,7 @@ SUBDIRS = \
 	gcr \
 	library \
 	pkcs11 \
+	secrets \
 	daemon \
 	tool \
 	$(TESTS_DIR) \
diff --git a/configure.in b/configure.in
index 3a85c0a..e05fa35 100644
--- a/configure.in
+++ b/configure.in
@@ -558,8 +558,6 @@ daemon/data/Makefile
 daemon/keyrings/Makefile
 daemon/keyrings/tests/Makefile
 daemon/pkcs11/Makefile
-daemon/secrets/Makefile
-daemon/secrets/api/Makefile
 daemon/ui/Makefile
 daemon/util/Makefile
 daemon/util/tests/Makefile
@@ -593,6 +591,7 @@ pkcs11/ssh-store/Makefile
 pkcs11/ssh-store/tests/Makefile
 pkcs11/user-store/Makefile
 po/Makefile.in
+secrets/Makefile
 tests/Makefile
 tool/Makefile
 library/gnome-keyring-1.pc
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 5937ffd..c8cb29e 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -3,8 +3,7 @@ SUBDIRS = \
 	ui \
 	keyrings \
 	pkcs11 \
-	data \
-	secrets
+	data
 
 bin_PROGRAMS= \
 	gnome-keyring-daemon
diff --git a/docs/reference/secrets/Makefile.am b/docs/reference/secrets/Makefile.am
index 5c047c1..fce3f0a 100644
--- a/docs/reference/secrets/Makefile.am
+++ b/docs/reference/secrets/Makefile.am
@@ -67,10 +67,10 @@ HTML_IMAGES=
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
 content_files =  			    								\
-	$(top_builddir)/daemon/secrets/api/docbook-interface-org.freedesktop.Secrets.Collection.xml	\
-	$(top_builddir)/daemon/secrets/api/docbook-interface-org.freedesktop.Secrets.Item.xml		\
-	$(top_builddir)/daemon/secrets/api/docbook-interface-org.freedesktop.Secrets.Service.xml	\
-	$(top_builddir)/daemon/secrets/api/docbook-interface-org.freedesktop.Secrets.Session.xml
+	$(top_builddir)/secrets/docbook-interface-org.freedesktop.Secrets.Collection.xml	\
+	$(top_builddir)/secrets/docbook-interface-org.freedesktop.Secrets.Item.xml		\
+	$(top_builddir)/secrets/docbook-interface-org.freedesktop.Secrets.Service.xml	\
+	$(top_builddir)/secrets/docbook-interface-org.freedesktop.Secrets.Session.xml
 
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
diff --git a/docs/reference/secrets/secrets-docs.sgml b/docs/reference/secrets/secrets-docs.sgml
index 0a903d1..451c68a 100644
--- a/docs/reference/secrets/secrets-docs.sgml
+++ b/docs/reference/secrets/secrets-docs.sgml
@@ -387,13 +387,13 @@
 				this object path in addition to its real object path (above).</para>
 			</refsect1>
 		</refentry>
-    
-		<xi:include href="../../../daemon/secrets/api/docbook-interface-org.freedesktop.Secrets.Collection.xml"/>
-		<xi:include href="../../../daemon/secrets/api/docbook-interface-org.freedesktop.Secrets.Item.xml"/>
-		<xi:include href="../../../daemon/secrets/api/docbook-interface-org.freedesktop.Secrets.Service.xml"/>
-		<xi:include href="../../../daemon/secrets/api/docbook-interface-org.freedesktop.Secrets.Session.xml"/>
-		<xi:include href="../../../daemon/secrets/api/docbook-struct-Secret.xml"/>
-		<xi:include href="../../../daemon/secrets/api/docbook-enum-Error.xml"/>
+
+		<xi:include href="../../../secrets/docbook-interface-org.freedesktop.Secrets.Collection.xml"/>
+		<xi:include href="../../../secrets/docbook-interface-org.freedesktop.Secrets.Item.xml"/>
+		<xi:include href="../../../secrets/docbook-interface-org.freedesktop.Secrets.Service.xml"/>
+		<xi:include href="../../../secrets/docbook-interface-org.freedesktop.Secrets.Session.xml"/>
+		<xi:include href="../../../secrets/docbook-struct-Secret.xml"/>
+		<xi:include href="../../../secrets/docbook-enum-Error.xml"/>
 	</part>
 
 <!--
diff --git a/daemon/secrets/api/.gitignore b/secrets/.gitignore
similarity index 100%
rename from daemon/secrets/api/.gitignore
rename to secrets/.gitignore
diff --git a/daemon/secrets/api/Makefile.am b/secrets/Makefile.am
similarity index 100%
rename from daemon/secrets/api/Makefile.am
rename to secrets/Makefile.am
diff --git a/daemon/secrets/api/org.freedesktop.Secrets.xml b/secrets/org.freedesktop.Secrets.xml
similarity index 100%
rename from daemon/secrets/api/org.freedesktop.Secrets.xml
rename to secrets/org.freedesktop.Secrets.xml