Skip to content

Commit

Permalink
auth: Refactor auth to use libauth.la
Browse files Browse the repository at this point in the history
This makes writing new unit tests easier, as you can link
to libauth.la.
  • Loading branch information
cmouse committed May 11, 2017
1 parent 6b29257 commit 05090e8
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions src/auth/Makefile.am
@@ -1,4 +1,5 @@
noinst_LIBRARIES = libpassword.a
noinst_LTLIBRARIES = libauth.la
auth_moduledir = $(moduledir)/auth

# automake seems to force making this unconditional..
Expand Down Expand Up @@ -35,6 +36,7 @@ AM_CPPFLAGS = \
-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)"\" \
Expand All @@ -53,6 +55,7 @@ libpassword_a_SOURCES = \
password-scheme-pbkdf2.c

auth_libs = \
libauth.la \
libstats_auth.la \
libpassword.a \
../lib-ntlm/libntlm.a \
Expand All @@ -63,10 +66,12 @@ auth_LDADD = $(auth_libs) $(LIBDOVECOT) $(AUTH_LIBS)
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 \
Expand All @@ -91,7 +96,6 @@ auth_SOURCES = \
db-oauth2.c \
db-sql.c \
db-passwd-file.c \
main.c \
mech.c \
mech-anonymous.c \
mech-plain.c \
Expand Down Expand Up @@ -233,13 +237,15 @@ test_libs = \
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
Expand Down

0 comments on commit 05090e8

Please sign in to comment.