lmtp: Rename main.h to lmtp-common.h.

This better matches other services.

diff --git a/src/lmtp/Makefile.am b/src/lmtp/Makefile.am
index 74b536937f97d2119bd0fb48cefa475e73c6b920..a478269304a365352b5034b1bf77e0e528616266 100644 (file)
--- a/src/lmtp/Makefile.am
+++ b/src/lmtp/Makefile.am
@@ -40,7 +40,7 @@ lmtp_SOURCES = \
        lmtp-settings.c
 
 noinst_HEADERS = \
-       main.h \
+       lmtp-common.h \
        client.h \
        commands.h \
        lmtp-recipient.h \

diff --git a/src/lmtp/client.c b/src/lmtp/client.c
index c3e1f1be52f1517cf0663473f2faa1bc486420f0..76d67f27c2be3a17416e691c03bfb2df9b6835e7 100644 (file)
--- a/src/lmtp/client.c
+++ b/src/lmtp/client.c
@@ -21,7 +21,7 @@
 #include "mail-storage.h"
 #include "mail-storage-service.h"
 #include "raw-storage.h"
-#include "main.h"
+#include "lmtp-common.h"
 #include "lda-settings.h"
 #include "lmtp-settings.h"
 #include "lmtp-local.h"

diff --git a/src/lmtp/commands.c b/src/lmtp/commands.c
index 299e94002f3c3c8c461c157cd978b9598f9ac416..cbcafdcef1035beede34f449fea8399fb8733ce7 100644 (file)
--- a/src/lmtp/commands.c
+++ b/src/lmtp/commands.c
@@ -18,7 +18,7 @@
 #include "lmtp-local.h"
 #include "mail-deliver.h"
 #include "mail-error.h"
-#include "main.h"
+#include "lmtp-common.h"
 #include "client.h"
 #include "commands.h"
 

diff --git a/src/lmtp/main.h b/src/lmtp/lmtp-common.h
similarity index 85%
rename from src/lmtp/main.h
rename to src/lmtp/lmtp-common.h
index f15b5b00f866aafc9338ddd40696636fa7cdc098..90a7ed3dfe717682100e778f874fefd0004b32b5 100644 (file)
--- a/src/lmtp/main.h
+++ b/src/lmtp/lmtp-common.h
@@ -1,5 +1,5 @@
-#ifndef MAIN_H
-#define MAIN_H
+#ifndef LMTP_COMMON_H
+#define LMTP_COMMON_H
 
 extern char *dns_client_socket_path, *base_dir;
 extern struct mail_storage_service_ctx *storage_service;

diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index 09ac1494592f80afcd3b22ddf6fca091ec0e3373..87464bb6cde2f1a26b1ebe63e15b14a0c05f40ac 100644 (file)
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -27,7 +27,7 @@
 #include "lda-settings.h"
 #include "lmtp-settings.h"
 #include "client.h"
-#include "main.h"
+#include "lmtp-common.h"
 #include "lmtp-settings.h"
 #include "lmtp-recipient.h"
 #include "lmtp-local.h"

diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c
index 386fadaa6831997391551fe12a0c6e2b7dab9ace..d2b12657cd6f614ab4e710fd27741f56b1f9b97f 100644 (file)
--- a/src/lmtp/lmtp-proxy.c
+++ b/src/lmtp/lmtp-proxy.c
@@ -23,7 +23,7 @@
 #include "mail-storage-service.h"
 #include "lda-settings.h"
 #include "client.h"
-#include "main.h"
+#include "lmtp-common.h"
 #include "lmtp-settings.h"
 #include "lmtp-recipient.h"
 #include "lmtp-proxy.h"

diff --git a/src/lmtp/main.c b/src/lmtp/main.c
index b6fac2902d5c6fa494fd96016bbe86c3d0170dfe..50666707c8f9040ff00d70c0fdd755a068cf3123 100644 (file)
--- a/src/lmtp/main.c
+++ b/src/lmtp/main.c
@@ -16,7 +16,7 @@
 #include "lda-settings.h"
 #include "lmtp-settings.h"
 #include "client.h"
-#include "main.h"
+#include "lmtp-common.h"
 
 #include <unistd.h>