imap-urlauth: Move imap-urlauth-login to its own directory

diff --git a/configure.ac b/configure.ac
index 5ec4c1fab669723b184407d6bf8bfd67fd16970b..6b2bd469b191473a0f968478f67fb1dc2a96e282 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -797,6 +797,7 @@ src/imap/Makefile
 src/imap-hibernate/Makefile
 src/imap-login/Makefile
 src/imap-urlauth/Makefile
+src/imap-urlauth-login/Makefile
 src/login-common/Makefile
 src/master/Makefile
 src/pop3/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index e262511f4bd20093a464014fc6b98f05f1bd8ef7..5f464f50b4ed1bdbfba352e44baf5657ed328e3a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,6 +57,7 @@ SUBDIRS = \
        imap-login \
        imap \
        imap-urlauth \
+       imap-urlauth-login \
        pop3-login \
        pop3 \
        submission-login \

diff --git a/src/imap-urlauth-login/Makefile.am b/src/imap-urlauth-login/Makefile.am
new file mode 100644 (file)
index 0000000..28b1723
--- /dev/null
+++ b/src/imap-urlauth-login/Makefile.am
@@ -0,0 +1,33 @@
+pkglibexecdir = $(libexecdir)/dovecot
+
+# Refer to comment in imap-urlauth.c for info on what these binaries are for.
+pkglibexec_PROGRAMS = imap-urlauth-login
+
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/lib \
+       -I$(top_srcdir)/src/lib-settings \
+       -I$(top_srcdir)/src/lib-auth-client \
+       -I$(top_srcdir)/src/lib-master \
+       -I$(top_srcdir)/src/lib-login \
+       $(BINARY_CFLAGS)
+
+imap_urlauth_login_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I$(top_srcdir)/src/login-common
+
+imap_urlauth_login_LDADD = \
+       $(LIBDOVECOT_LOGIN) \
+       $(LIBDOVECOT) \
+       $(SSL_LIBS) \
+       $(BINARY_LDFLAGS)
+
+imap_urlauth_login_DEPENDENCIES = \
+       $(LIBDOVECOT_LOGIN_DEPS) \
+       $(LIBDOVECOT_DEPS)
+
+imap_urlauth_login_SOURCES = \
+       imap-urlauth-login.c \
+       imap-urlauth-login-settings.c
+
+noinst_HEADERS = \
+       imap-urlauth-login-settings.h

diff --git a/src/imap-urlauth/imap-urlauth-login-settings.c b/src/imap-urlauth-login/imap-urlauth-login-settings.c
similarity index 100%
rename from src/imap-urlauth/imap-urlauth-login-settings.c
rename to src/imap-urlauth-login/imap-urlauth-login-settings.c

diff --git a/src/imap-urlauth/imap-urlauth-login-settings.h b/src/imap-urlauth-login/imap-urlauth-login-settings.h
similarity index 100%
rename from src/imap-urlauth/imap-urlauth-login-settings.h
rename to src/imap-urlauth-login/imap-urlauth-login-settings.h

diff --git a/src/imap-urlauth/imap-urlauth-login.c b/src/imap-urlauth-login/imap-urlauth-login.c
similarity index 100%
rename from src/imap-urlauth/imap-urlauth-login.c
rename to src/imap-urlauth-login/imap-urlauth-login.c

diff --git a/src/imap-urlauth/Makefile.am b/src/imap-urlauth/Makefile.am
index 4615c6019b9248bb5d5665127ba0465b96689e9e..168eba679e534f0ec596205a2439fe417e364c7d 100644 (file)
--- a/src/imap-urlauth/Makefile.am
+++ b/src/imap-urlauth/Makefile.am
@@ -1,7 +1,7 @@
 pkglibexecdir = $(libexecdir)/dovecot
 
 # Refer to comment in imap-urlauth.c for info on what these binaries are for.
-pkglibexec_PROGRAMS = imap-urlauth-login imap-urlauth imap-urlauth-worker
+pkglibexec_PROGRAMS = imap-urlauth imap-urlauth-worker
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
@@ -11,26 +11,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-login \
        $(BINARY_CFLAGS)
 
-# imap-urlauth-login
-
-imap_urlauth_login_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -I$(top_srcdir)/src/login-common
-
-imap_urlauth_login_LDADD = \
-       $(LIBDOVECOT_LOGIN) \
-       $(LIBDOVECOT) \
-       $(SSL_LIBS) \
-       $(BINARY_LDFLAGS)
-
-imap_urlauth_login_DEPENDENCIES = \
-       $(LIBDOVECOT_LOGIN_DEPS) \
-       $(LIBDOVECOT_DEPS)
-
-imap_urlauth_login_SOURCES = \
-       imap-urlauth-login.c \
-       imap-urlauth-login-settings.c
-
 # imap-urlauth
 
 imap_urlauth_CPPFLAGS = \
@@ -82,7 +62,6 @@ noinst_HEADERS = \
        imap-urlauth-client.h \
        imap-urlauth-common.h \
        imap-urlauth-settings.h \
-       imap-urlauth-login-settings.h \
        imap-urlauth-worker-common.h \
        imap-urlauth-worker-client.h \
        imap-urlauth-worker-settings.h