auth: Move auth-scram to lib-auth.

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index c3020d54adb4d4643657c60a28ba1b5223084029..9ffb01a62fcf48869c9cc06323efdda02eb50c32 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -37,6 +37,7 @@ pkglibexec_PROGRAMS = auth
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
+       -I$(top_srcdir)/src/lib-auth \
        -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-test \
        -I$(top_srcdir)/src/lib-dict \
@@ -63,7 +64,6 @@ auth_LDFLAGS = -export-dynamic
 libpassword_la_SOURCES = \
        crypt-blowfish.c \
        mycrypt.c \
-       auth-scram.c \
        auth-scram-server.c \
        password-scheme.c \
        password-scheme-crypt.c \
@@ -77,6 +77,7 @@ libpassword_la_CFLAGS = $(AM_CPPFLAGS) $(LIBSODIUM_CFLAGS)
 auth_libs = \
        libauth.la \
        libpassword.la \
+       ../lib-auth/libauth.la \
        ../lib-otp/libotp.la \
        $(AUTH_LUA_LIBS) \
        $(LIBDOVECOT_SQL)
@@ -183,7 +184,6 @@ headers = \
        passdb-blocking.h \
        passdb-cache.h \
        passdb-template.h \
-       auth-scram.h \
        auth-scram-server.h \
        password-scheme.h \
        userdb.h \
@@ -240,6 +240,7 @@ test_libs = \
 test_libpassword_SOURCES = test-libpassword.c
 test_libpassword_LDADD = \
        libpassword.la \
+       ../lib-auth/libauth.la \
         ../lib-otp/libotp.la \
        $(CRYPT_LIBS) \
        $(LIBDOVECOT_SQL) \

diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am
index b9b75bd52184cc950b717890a23318d66c670244..247cac488b50c1f97997fb8abbbbf8577c7e95db 100644 (file)
--- a/src/doveadm/Makefile.am
+++ b/src/doveadm/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-test \
        -I$(top_srcdir)/src/lib-settings \
+       -I$(top_srcdir)/src/lib-auth \
        -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-compression \
        -I$(top_srcdir)/src/lib-dict \
@@ -39,6 +40,7 @@ AM_CPPFLAGS = \
 
 cmd_pw_libs = \
        ../auth/libpassword.la \
+       ../lib-auth/libauth.la \
        ../lib-otp/libotp.la
 
 libs = \

diff --git a/src/lib-auth/Makefile.am b/src/lib-auth/Makefile.am
index cb391245743321aa01181a41cf25abbeec8cfe1d..d18c2dec4793cba638725c79cab38acafe1d7abb 100644 (file)
--- a/src/lib-auth/Makefile.am
+++ b/src/lib-auth/Makefile.am
@@ -1,12 +1,14 @@
-noinst_LTLIBRARIES = libauth-common.la
+noinst_LTLIBRARIES = libauth.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-test
 
-libauth_common_la_SOURCES =
+libauth_la_SOURCES = \
+       auth-scram.c
 
-headers =
+headers = \
+       auth-scram.h
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)

diff --git a/src/auth/auth-scram.c b/src/lib-auth/auth-scram.c
similarity index 100%
rename from src/auth/auth-scram.c
rename to src/lib-auth/auth-scram.c

diff --git a/src/auth/auth-scram.h b/src/lib-auth/auth-scram.h
similarity index 100%
rename from src/auth/auth-scram.h
rename to src/lib-auth/auth-scram.h