lib-dict: Move libdict_backend to lib-dict-backend

diff --git a/.gitignore b/.gitignore
index 82133b9562586c284c1cd4936ebe6a708ff99df5..20e5310941f20ec79c1dc40a5c5615f1cd35cff8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -125,7 +125,7 @@ src/lib-fts/PropList.txt
 src/lib-fts/WordBreakProperty.txt
 src/lib-fts/word-boundary-data.c
 src/lib-fts/word-break-data.c
-src/lib-dict/dict-drivers-register.c
+src/lib-dict-backend/dict-drivers-register.c
 src/lib-sql/sql-drivers-register.c
 src/log/log
 src/lmtp/lmtp

diff --git a/configure.ac b/configure.ac
index 89996f15d130e07518ad357fb19a4e76475a4930..3247f5247b3782eb9395924d797e7be57c702ba5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -809,6 +809,7 @@ src/lib-charset/Makefile
 src/lib-compression/Makefile
 src/lib-dcrypt/Makefile
 src/lib-dict/Makefile
+src/lib-dict-backend/Makefile
 src/lib-dict-extra/Makefile
 src/lib-dns/Makefile
 src/lib-fs/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index c5a5fcc94a295ef4f4d79c6a7351ba7a167af0a4..e4d602fbd86bd89b4f59a1a092d29e60cc07bbfa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,6 +39,7 @@ SUBDIRS = \
        lib-ntlm \
        lib-otp \
        lib-lda \
+       lib-dict-backend \
        anvil \
        auth \
        dict \

diff --git a/src/dict/Makefile.am b/src/dict/Makefile.am
index b959cb878cb6268c3e66b8507d16481d1d13e33b..b08988d53973e17c959658dba658ec36a14cf4f3 100644 (file)
--- a/src/dict/Makefile.am
+++ b/src/dict/Makefile.am
@@ -16,7 +16,7 @@ dict_LDFLAGS = -export-dynamic \
        $(BINARY_LDFLAGS)
 
 libs = \
-       ../lib-dict/libdict_backend.la \
+       ../lib-dict-backend/libdict_backend.la \
        $(LIBDOVECOT_SQL)
 
 dict_LDADD = \

diff --git a/src/lib-dict-backend/Makefile.am b/src/lib-dict-backend/Makefile.am
new file mode 100644 (file)
index 0000000..5f7278d
--- /dev/null
+++ b/src/lib-dict-backend/Makefile.am
@@ -0,0 +1,94 @@
+noinst_LTLIBRARIES = libdict_backend.la
+
+dict_drivers = @dict_drivers@
+
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/lib \
+       -I$(top_srcdir)/src/lib-test \
+       -I$(top_srcdir)/src/lib-dict \
+       -I$(top_srcdir)/src/lib-sql \
+       -I$(top_srcdir)/src/lib-settings \
+       $(SQL_CFLAGS)
+
+NOPLUGIN_LDFLAGS =
+
+libdict_backend_la_SOURCES = \
+       dict-db.c \
+       dict-cdb.c \
+       dict-sql.c \
+       dict-sql-settings.c
+
+nodist_libdict_backend_la_SOURCES = \
+       dict-drivers-register.c
+
+noinst_HEADERS = \
+       dict-sql.h \
+       dict-sql-private.h \
+       dict-sql-settings.h
+
+EXTRA_DIST = dict.conf
+
+dict-drivers-register.c: Makefile $(top_builddir)/config.h
+       rm -f $@
+       echo '/* this file automatically generated by Makefile */' >$@
+       echo '#include "lib.h"' >>$@
+       echo '#include "dict.h"' >>$@
+       echo '#include "dict-sql.h"' >>$@
+       for i in $(dict_drivers) null; do \
+         if [ "$${i}" != "null" ]; then \
+               echo "extern struct dict dict_driver_$${i};" >>$@ ; \
+         fi; \
+       done
+       echo 'void dict_drivers_register_all(void) {' >>$@
+       echo 'dict_drivers_register_builtin();' >>$@
+       echo 'dict_sql_register();' >>$@
+       for i in $(dict_drivers) null; do \
+         if [ "$${i}" != "null" ]; then \
+               echo "dict_driver_register(&dict_driver_$${i});" >>$@ ; \
+         fi; \
+       done
+       echo '}' >>$@
+       echo 'void dict_drivers_unregister_all(void) {' >>$@
+       echo 'dict_drivers_unregister_builtin();' >>$@
+       echo 'dict_sql_unregister();' >>$@
+       for i in $(dict_drivers) null; do \
+         if [ "$${i}" != "null" ]; then \
+               echo "dict_driver_unregister(&dict_driver_$${i});" >>$@ ; \
+         fi; \
+       done
+       echo '}' >>$@
+
+distclean-generic:
+       rm -f Makefile dict-drivers-register.c
+
+# test-dict-sql must be compiled after the whole core
+# has been compiled, because it depends on things that
+# are build after lib-dict.
+check_PROGRAMS = test-dict-sql
+
+test_libs = \
+       ../lib-dict/libdict.la \
+       ../lib-test/libtest.la \
+       ../lib/liblib.la
+
+test_dict_sql_CFLAGS = $(AM_CPPFLAGS) -DDICT_SRC_DIR=\"$(top_srcdir)/src/lib-dict-backend\"
+test_dict_sql_SOURCES = \
+       test-dict-sql.c
+test_dict_sql_LDADD = \
+       $(noinst_LTLIBRARIES) \
+       ../lib-sql/libdriver_test.la \
+       ../lib-sql/libsql.la \
+       ../lib-settings/libsettings.la \
+       $(test_libs)
+test_dict_sql_DEPENDENCIES = \
+       $(noinst_LTLIBRARIES) \
+       ../lib-sql/libdriver_test.la \
+       ../lib-sql/libsql.la \
+       ../lib-settings/libsettings.la \
+       $(test_libs)
+
+check: check-am check-test
+check-test: all-am
+       for bin in $(test_programs) $(check_PROGRAMS); do \
+         if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
+       done

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

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

diff --git a/src/lib-dict/dict-sql-private.h b/src/lib-dict-backend/dict-sql-private.h
similarity index 100%
rename from src/lib-dict/dict-sql-private.h
rename to src/lib-dict-backend/dict-sql-private.h

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

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

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

diff --git a/src/lib-dict/dict-sql.h b/src/lib-dict-backend/dict-sql.h
similarity index 100%
rename from src/lib-dict/dict-sql.h
rename to src/lib-dict-backend/dict-sql.h

diff --git a/src/lib-dict/dict.conf b/src/lib-dict-backend/dict.conf
similarity index 100%
rename from src/lib-dict/dict.conf
rename to src/lib-dict-backend/dict.conf

diff --git a/src/lib-dict/test-dict-sql.c b/src/lib-dict-backend/test-dict-sql.c
similarity index 100%
rename from src/lib-dict/test-dict-sql.c
rename to src/lib-dict-backend/test-dict-sql.c

diff --git a/src/lib-dict/Makefile.am b/src/lib-dict/Makefile.am
index db10b22fdc994d69bf75caa5914099f805c66b95..5bf74d4e806eaac85841572934b5e3373730cc3f 100644 (file)
--- a/src/lib-dict/Makefile.am
+++ b/src/lib-dict/Makefile.am
@@ -1,11 +1,9 @@
-noinst_LTLIBRARIES = libdict.la libdict_backend.la
+noinst_LTLIBRARIES = libdict.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-test \
-       -I$(top_srcdir)/src/lib-sql \
-       -I$(top_srcdir)/src/lib-settings \
-       $(SQL_CFLAGS)
+       -I$(top_srcdir)/src/lib-settings
 
 base_sources = \
        dict.c \
@@ -20,74 +18,20 @@ base_sources = \
 libdict_la_SOURCES = \
        $(base_sources)
 
-libdict_backend_la_SOURCES = \
-       dict-db.c \
-       dict-cdb.c \
-       dict-sql.c \
-       dict-sql-settings.c
-
-nodist_libdict_backend_la_SOURCES = \
-       dict-drivers-register.c
-
 headers = \
        dict.h \
        dict-client.h \
        dict-private.h \
-       dict-sql.h \
-       dict-sql-settings.h \
        dict-transaction-memory.h
 
-noinst_HEADERS = \
-       dict-sql-private.h
-
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
 
-EXTRA_DIST = dict.conf
-
-dict-drivers-register.c: Makefile $(top_builddir)/config.h
-       rm -f $@
-       echo '/* this file automatically generated by Makefile */' >$@
-       echo '#include "lib.h"' >>$@
-       echo '#include "dict.h"' >>$@
-       echo '#include "dict-sql.h"' >>$@
-       for i in $(dict_drivers) null; do \
-         if [ "$${i}" != "null" ]; then \
-               echo "extern struct dict dict_driver_$${i};" >>$@ ; \
-         fi; \
-       done
-       echo 'void dict_drivers_register_all(void) {' >>$@
-       echo 'dict_drivers_register_builtin();' >>$@
-       echo 'dict_sql_register();' >>$@
-       for i in $(dict_drivers) null; do \
-         if [ "$${i}" != "null" ]; then \
-               echo "dict_driver_register(&dict_driver_$${i});" >>$@ ; \
-         fi; \
-       done
-       echo '}' >>$@
-       echo 'void dict_drivers_unregister_all(void) {' >>$@
-       echo 'dict_drivers_unregister_builtin();' >>$@
-       echo 'dict_sql_unregister();' >>$@
-       for i in $(dict_drivers) null; do \
-         if [ "$${i}" != "null" ]; then \
-               echo "dict_driver_unregister(&dict_driver_$${i});" >>$@ ; \
-         fi; \
-       done
-       echo '}' >>$@
-
-distclean-generic:
-       rm -f Makefile dict-drivers-register.c
-
 test_programs = \
        test-dict
 
 noinst_PROGRAMS = $(test_programs) test-dict-client
 
-# test-dict-sql must be compiled after the whole core
-# has been compiled, because it depends on things that
-# are build after lib-dict.
-check_PROGRAMS = test-dict-sql
-
 test_libs = \
        ../lib-test/libtest.la \
        ../lib/liblib.la
@@ -100,24 +44,8 @@ test_dict_client_SOURCES = test-dict-client.c
 test_dict_client_LDADD = $(noinst_LTLIBRARIES) ../lib/liblib.la
 test_dict_client_DEPENDENCIES = $(noinst_LTLIBRARIES) $(test_libs)
 
-test_dict_sql_CFLAGS = $(AM_CPPFLAGS) -DDICT_SRC_DIR=\"$(top_srcdir)/src/lib-dict\"
-test_dict_sql_SOURCES = \
-       test-dict-sql.c
-test_dict_sql_LDADD = \
-       $(noinst_LTLIBRARIES) \
-       ../lib-sql/libdriver_test.la \
-       ../lib-sql/libsql.la \
-       ../lib-settings/libsettings.la \
-       $(test_libs)
-test_dict_sql_DEPENDENCIES = \
-       $(noinst_LTLIBRARIES) \
-       ../lib-sql/libdriver_test.la \
-       ../lib-sql/libsql.la \
-       ../lib-settings/libsettings.la \
-       $(test_libs)
-
 check: check-am check-test
 check-test: all-am
-       for bin in $(test_programs) $(check_PROGRAMS); do \
+       for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-dict/dict.c b/src/lib-dict/dict.c
index dedda65a2c2dd604ea3ca25fa1ac1456f5e02ce8..3a737fbe3a1cd2b9f7013bbe42c546fbfb5651f8 100644 (file)
--- a/src/lib-dict/dict.c
+++ b/src/lib-dict/dict.c
@@ -4,7 +4,6 @@
 #include "array.h"
 #include "llist.h"
 #include "str.h"
-#include "dict-sql.h"
 #include "dict-private.h"
 
 static ARRAY(struct dict *) dict_drivers;