Mercurial > dovecot > core-2.2

changeset 22009:2d5018651d64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
auth: Refactor auth to use libauth.la This makes writing new unit tests easier, as you can link to libauth.la.
author Aki Tuomi <aki.tuomi@dovecot.fi>
date Fri, 28 Apr 2017 10:25:14 +0300
parents 700d5e6f041d
children 220da21b7f80
files src/auth/Makefile.am
diffstat 1 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/Makefile.am	Fri Apr 28 12:51:20 2017 +0300
+++ b/src/auth/Makefile.am	Fri Apr 28 10:25:14 2017 +0300
@@ -1,4 +1,5 @@
 noinst_LIBRARIES = libpassword.a
+noinst_LTLIBRARIES = libauth.la
 auth_moduledir = $(moduledir)/auth
 
 # automake seems to force making this unconditional..
@@ -35,6 +36,7 @@
 	-I$(top_srcdir)/src/lib-otp \
 	-I$(top_srcdir)/src/lib-master \
 	-I$(top_srcdir)/src/lib-oauth2 \
+	-I$(top_srcdir)/src/lib-ssl-iostream \
 	-DAUTH_MODULE_DIR=\""$(auth_moduledir)"\" \
 	-DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
 	-DPKG_RUNDIR=\""$(rundir)"\" \
@@ -53,6 +55,7 @@
 	password-scheme-pbkdf2.c
 
 auth_libs = \
+	libauth.la \
 	libstats_auth.la \
 	libpassword.a \
 	../lib-ntlm/libntlm.a \
@@ -63,10 +66,12 @@
 auth_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/src/lib-ssl-iostream
 auth_DEPENDENCIES = $(auth_libs) $(LIBDOVECOT_DEPS)
+auth_SOURCES = main.c
 
 ldap_sources = db-ldap.c passdb-ldap.c userdb-ldap.c
 
-auth_SOURCES = \
+libauth_la_DEPENDENCIES = $(LIBDOVECOT_DEPS)
+libauth_la_SOURCES = \
 	auth.c \
 	auth-cache.c \
 	auth-client-connection.c \
@@ -91,7 +96,6 @@
 	db-oauth2.c \
 	db-sql.c \
 	db-passwd-file.c \
-	main.c \
 	mech.c \
 	mech-anonymous.c \
 	mech-plain.c \
@@ -233,13 +237,15 @@
 test_auth_cache_SOURCES = auth-cache.c test-auth-cache.c
 test_auth_cache_LDADD = $(test_libs)
 test_auth_cache_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs)
+# this is needed to force auth-cache.c recompilation
+test_auth_cache_CPPFLAGS = $(AM_CPPFLAGS)
 
-test_auth_request_var_expand_SOURCES = auth-request-var-expand.c auth-fields.c test-auth-request-var-expand.c
-test_auth_request_var_expand_LDADD = $(test_libs)
+test_auth_request_var_expand_SOURCES = test-auth-request-var-expand.c
+test_auth_request_var_expand_LDADD = $(test_libs) libauth.la
 test_auth_request_var_expand_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs)
 
-test_db_dict_SOURCES = db-dict-cache-key.c test-db-dict.c
-test_db_dict_LDADD = $(test_libs)
+test_db_dict_SOURCES = test-db-dict.c
+test_db_dict_LDADD = $(test_libs) libauth.la
 test_db_dict_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs)
 
 check: check-am check-test