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

--HG--
branch : HEAD

diff --git a/src/Makefile.am b/src/Makefile.am
index 35b238c45cffbc28815b41f8ee889b7691e44e4e..a4e52731afa71a7fc49e10802291bd69bd538719 100644 (file)
--- 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 815cda78fc637c76cbf6d8df0e1c6089f5831555..4a26f26a4c73cbec621d35a144578d2c47e56ab3 100644 (file)
--- 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 e33142a846fd427bf243d21842cc701623a0a179..41778895d0540e55e9efd322fe1d5b677c6cc489 100644 (file)
--- 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 5575f023aeacd73710b497bbfc987ae59a0e9506..23a8e37ae820f33206720d57ba5a566913f4a181 100644 (file)
--- 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