gnome-keyring r1278 - in trunk: . library library/reference reference

[nnielsen svn gnome org]

Author: nnielsen
Date: Thu Aug 28 02:58:22 2008
New Revision: 1278
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1278&view=rev

Log:
	* Makefile.am:
	* configure.in:
	* library/Makefile.am: 
	* library/reference/: (moved from library/)
	* reference/: (moved to library/reference/) Move the 
documentation
	for the gnome-keyring library into the 'library' subdirectory. 



Added:
   trunk/library/reference/
      - copied from r1272, /trunk/reference/
Removed:
   trunk/reference/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/library/Makefile.am
   trunk/library/reference/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Aug 28 02:58:22 2008
@@ -19,7 +19,6 @@
 	daemon \
 	tool \
 	po \
-	reference \
 	$(TESTS_DIR) \
 	$(PAM_DIR)
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Aug 28 02:58:22 2008
@@ -506,13 +506,13 @@
 gp11/Makefile
 gp11/tests/Makefile
 library/Makefile
+library/reference/Makefile
 library/tests/Makefile
 pam/Makefile
 pam/tests/Makefile
 pkcs11/Makefile
 pkcs11/tests/Makefile
 po/Makefile.in
-reference/Makefile
 tests/Makefile
 tool/Makefile
 library/gnome-keyring-1.pc

Modified: trunk/library/Makefile.am
==============================================================================
--- trunk/library/Makefile.am	(original)
+++ trunk/library/Makefile.am	Thu Aug 28 02:58:22 2008
@@ -58,4 +58,6 @@
 TESTS_DIR = 
 endif
 
-SUBDIRS = . $(TESTS_DIR)
+SUBDIRS = . \
+	reference \
+	$(TESTS_DIR)

Modified: trunk/library/reference/Makefile.am
==============================================================================
--- /trunk/reference/Makefile.am	(original)
+++ trunk/library/reference/Makefile.am	Thu Aug 28 02:58:22 2008
@@ -20,7 +20,7 @@
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../library
+DOC_SOURCE_DIR=../
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"