From: Timo Sirainen <tss@iki.fi>
Date: Mon, 6 Apr 2009 17:09:02 +0000 (-0400)
Subject: lib-index belongs to libdovecot-storage, not to libdovecot.
X-Git-Tag: 2.0.alpha1~1034
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e0e5842b5841cf3065ed18e8ba093b11517c51d;p=thirdparty%2Fdovecot%2Fcore.git

lib-index belongs to libdovecot-storage, not to libdovecot.

--HG--
branch : HEAD
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 35b238c45c..a4e52731af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,20 +6,23 @@ if BUILD_DELIVER
 DELIVER = deliver
 endif
 
-SUBDIRS = \
+LIBDOVECOT_SUBDIRS = \
 	lib \
 	lib-auth \
-	lib-dict \
-	lib-sql \
-	lib-ntlm \
-	lib-otp \
-	lib-settings \
 	lib-charset \
 	lib-mail \
 	lib-imap \
-	lib-index \
+	lib-dict \
+	lib-settings
+
+SUBDIRS = \
+	$(LIBDOVECOT_SUBDIRS) \
 	lib-dovecot \
+	lib-index \
 	lib-storage \
+	lib-sql \
+	lib-ntlm \
+	lib-otp \
 	auth \
 	config \
 	dict \
diff --git a/src/lib-dovecot/Makefile.am b/src/lib-dovecot/Makefile.am
index 815cda78fc..4a26f26a4c 100644
--- a/src/lib-dovecot/Makefile.am
+++ b/src/lib-dovecot/Makefile.am
@@ -5,7 +5,6 @@ libdovecot_la_SOURCES =
 libs = \
 	../lib-settings/libsettings.la \
 	../lib-dict/libdict.la \
-	../lib-index/libindex.la \
 	../lib-imap/libimap.la \
 	../lib-mail/libmail.la \
 	../lib-auth/libauth.la \
diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am
index e33142a846..41778895d0 100644
--- a/src/lib-storage/Makefile.am
+++ b/src/lib-storage/Makefile.am
@@ -27,6 +27,7 @@ libdovecot_storage_la_SOURCES = \
 	mailbox-uidvalidity.c
 
 libs = \
+	../lib-index/libindex.la \
 	list/libstorage_list.la \
 	index/libstorage_index.la \
 	register/libstorage_register.la	
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 5575f023ae..23a8e37ae8 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -31,7 +31,8 @@ gdbhelper_SOURCES = \
 	gdbhelper.c
 
 idxview_LDADD = \
-	../lib-dovecot/libdovecot.la
+	../lib-dovecot/libdovecot.la \
+	../lib-storage/libdovecot-storage.la
 idxview_SOURCES = \
 	idxview.c