From: Timo Sirainen Date: Wed, 4 Oct 2017 17:46:10 +0000 (+0300) Subject: lib-dict: Move libdict_backend to lib-dict-backend X-Git-Tag: 2.3.0.rc1~892 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5224c0589916fb22f95f959326cf4b6221715b0;p=thirdparty%2Fdovecot%2Fcore.git lib-dict: Move libdict_backend to lib-dict-backend --- diff --git a/.gitignore b/.gitignore index 82133b9562..20e5310941 100644 --- 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 89996f15d1..3247f5247b 100644 --- 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 c5a5fcc94a..e4d602fbd8 100644 --- 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 b959cb878c..b08988d539 100644 --- 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 index 0000000000..5f7278d7d1 --- /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 db10b22fdc..5bf74d4e80 100644 --- 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 dedda65a2c..3a737fbe3a 100644 --- 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;