lib-dict: Moved dict-ldap to lib-dict-extra

This also allows moving lib-ldap away from LIBDOVECOT_SUBDIRS in
src/Makefile.am, which was wrong because it's not really part of
libdovecot.la.

diff --git a/src/Makefile.am b/src/Makefile.am
index 87501de279339fc887225fe46394ed9be6ea9d91..39c62d213a74b73cc97a2d39cd8b19acac973d6e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,6 @@ LIBDOVECOT_SUBDIRS = \
        lib-master \
        lib-charset \
        lib-dns \
-       $(LIB_LDAP) \
        lib-dict \
        lib-sasl \
        lib-ssl-iostream \
@@ -23,6 +22,7 @@ LIBDOVECOT_SUBDIRS = \
 
 SUBDIRS = \
        $(LIBDOVECOT_SUBDIRS) \
+       $(LIB_LDAP) \
        lib-dict-extra \
        lib-dovecot \
        lib-fts \

diff --git a/src/lib-dict-extra/Makefile.am b/src/lib-dict-extra/Makefile.am
index c292ba23361d556a4afb951785e7aaea3d3c528a..7cf50114a06bb550b9429350452625afb90dfb1c 100644 (file)
--- a/src/lib-dict-extra/Makefile.am
+++ b/src/lib-dict-extra/Makefile.am
@@ -6,9 +6,27 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-dict \
        -I$(top_srcdir)/src/lib-fs \
-       -I$(top_srcdir)/src/lib-settings \
-       $(SQL_CFLAGS)
+       -I$(top_srcdir)/src/lib-ldap \
+       -I$(top_srcdir)/src/lib-settings
 
 libdict_extra_la_SOURCES = \
        dict-fs.c \
        dict-register.c
+
+NOPLUGIN_LDFLAGS =
+
+if HAVE_LDAP
+LIBDICT_LDAP = libdict_ldap.la
+endif
+libdict_ldap_la_LDFLAGS = -module -avoid-version $(LIBDOVECOT_LDAP)
+
+module_dictdir = $(moduledir)/dict
+module_dict_LTLIBRARIES = \
+       $(LIBDICT_LDAP)
+
+libdict_ldap_la_SOURCES = \
+       dict-ldap.c \
+       dict-ldap-settings.c
+
+noinst_HEADERS = \
+       dict-ldap-settings.h

diff --git a/src/lib-dict/dict-ldap-settings.c b/src/lib-dict-extra/dict-ldap-settings.c
similarity index 100%
rename from src/lib-dict/dict-ldap-settings.c
rename to src/lib-dict-extra/dict-ldap-settings.c

diff --git a/src/lib-dict/dict-ldap-settings.h b/src/lib-dict-extra/dict-ldap-settings.h
similarity index 100%
rename from src/lib-dict/dict-ldap-settings.h
rename to src/lib-dict-extra/dict-ldap-settings.h

diff --git a/src/lib-dict/dict-ldap.c b/src/lib-dict-extra/dict-ldap.c
similarity index 100%
rename from src/lib-dict/dict-ldap.c
rename to src/lib-dict-extra/dict-ldap.c

diff --git a/src/lib-dict/Makefile.am b/src/lib-dict/Makefile.am
index 07fbda079e451ea5d929b4f514ba705b612453b8..805ecc6a7cbfb11ea6c847c2addd451e7fc7a146 100644 (file)
--- a/src/lib-dict/Makefile.am
+++ b/src/lib-dict/Makefile.am
@@ -4,7 +4,6 @@ noinst_LIBRARIES = libdict_backend.a
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-test \
-       -I$(top_srcdir)/src/lib-ldap \
        -I$(top_srcdir)/src/lib-sql \
        -I$(top_srcdir)/src/lib-settings \
        $(SQL_CFLAGS)
@@ -30,25 +29,9 @@ libdict_backend_a_SOURCES = \
 nodist_libdict_backend_a_SOURCES = \
        dict-drivers-register.c
 
-NOPLUGIN_LDFLAGS =
-
-if HAVE_LDAP
-LIBDICT_LDAP = libdict_ldap.la
-endif
-libdict_ldap_la_LDFLAGS = -module -avoid-version $(LIBDOVECOT_LDAP)
-
-module_dictdir = $(moduledir)/dict
-module_dict_LTLIBRARIES = \
-       $(LIBDICT_LDAP)
-
-libdict_ldap_la_SOURCES = \
-       dict-ldap.c \
-       dict-ldap-settings.c
-
 headers = \
        dict.h \
        dict-client.h \
-       dict-ldap-settings.h \
        dict-private.h \
        dict-sql.h \
        dict-sql-settings.h \