split Address into a separate library

Closes: #1619

diff --git a/Makefile.autosetup b/Makefile.autosetup
index 2027cdfc5ad44fac8d6aeb164543807d8663ffc8..2ba78677af4f70bdb9eb142802485ce87fc9f133 100644 (file)
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -236,15 +236,24 @@ ALLOBJS+= $(LIBCONFIGOBJS)
 ###############################################################################
 # libemail
 LIBEMAIL=      libemail.a
-LIBEMAILOBJS=  email/address.o email/attach.o email/body.o \
-               email/email_globals.o email/envelope.o email/from.o email/group.o \
-               email/email.o email/idna.o email/mime.o email/parameter.o \
+LIBEMAILOBJS=  email/attach.o email/body.o \
+               email/email_globals.o email/envelope.o email/from.o \
+               email/email.o email/mime.o email/parameter.o \
                email/parse.o email/rfc2047.o email/rfc2231.o email/tags.o \
                email/thread.o email/url.o
 CLEANFILES+=   $(LIBEMAIL) $(LIBEMAILOBJS)
 MUTTLIBS+=     $(LIBEMAIL)
 ALLOBJS+=      $(LIBEMAILOBJS)
 
+###############################################################################
+# libaddress
+LIBADDRESS=    libaddress.a
+LIBADDRESSOBJS=        address/address.o address/group.o address/idna.o 
+
+CLEANFILES+=   $(LIBADDRESS) $(LIBADDRESSOBJS)
+MUTTLIBS+=     $(LIBADDRESS)
+ALLOBJS+=      $(LIBADDRESSOBJS)
+
 ###############################################################################
 # libmutt
 LIBMUTT=       libmutt.a
@@ -284,6 +293,13 @@ $(LIBMUTT): $(PWD)/mutt $(LIBMUTTOBJS)
 $(PWD)/mutt:
        $(MKDIR_P) $(PWD)/mutt
 
+# libaddress
+$(LIBADDRESS): $(PWD)/address $(LIBADDRESSOBJS)
+       $(AR) cr $@ $(LIBADDRESSOBJS)
+       $(RANLIB) $@
+$(PWD)/address:
+       $(MKDIR_P) $(PWD)/address
+
 # libemail
 $(LIBEMAIL): $(PWD)/email $(LIBEMAILOBJS)
        $(AR) cr $@ $(LIBEMAILOBJS)
@@ -374,7 +390,7 @@ git_ver.c: $(ALL_FILES)
        cmp -s $@.tmp $@ || mv $@.tmp $@; \
        rm -f $@.tmp
 
-hcache/hcversion.h:    $(SRCDIR)/email/address.h \
+hcache/hcversion.h:    $(SRCDIR)/address/address.h \
                        $(SRCDIR)/email/body.h \
                        $(SRCDIR)/email/email.h \
                        $(SRCDIR)/email/envelope.h \
@@ -384,7 +400,7 @@ hcache/hcversion.h: $(SRCDIR)/email/address.h \
                        $(SRCDIR)/hcache/hcachever.sh
        $(MKDIR_P) $(PWD)/hcache
        ( echo '#include "config.h"'; \
-       echo '#include "email/address.h"'; \
+       echo '#include "address/address.h"'; \
        echo '#include "email/body.h"'; \
        echo '#include "email/email.h"'; \
        echo '#include "email/envelope.h"'; \
@@ -435,7 +451,7 @@ coverage: all test
        genhtml -o lcov lcov.info
 
 # Tests for the config code
-config-test: libmutt.a libemail.a libconfig.a
+config-test: libmutt.a libemail.a libconfig.a libaddress.a
 
 ##############################################################################
 # include generated dependency files

diff --git a/addrbook.c b/addrbook.c
index a14476683a59ece2d379927d84635f53696f9ae7..af941d7672a1ca763711d48ec9c21dbf59c6b22b 100644 (file)
--- a/addrbook.c
+++ b/addrbook.c
@@ -34,6 +34,7 @@
 #include "config/lib.h"
 #include "email/lib.h"
 #include "mutt.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "curs_lib.h"
 #include "format_flags.h"

diff --git a/email/address.c b/address/address.c
similarity index 99%
rename from email/address.c
rename to address/address.c
index 1318fb51b1a7541a51b8c7406dac81f55dd753e3..98679f2abab7bae44bba8b09861bfb8b5ca432f6 100644 (file)
--- a/email/address.c
+++ b/address/address.c
@@ -22,7 +22,7 @@
  */
 
 /**
- * @page email_address Representation of an email address
+ * @page addr_address Representation of an email address
  *
  * Representation of an email address
  */

diff --git a/email/address.h b/address/address.h
similarity index 100%
rename from email/address.h
rename to address/address.h

diff --git a/email/group.c b/address/group.c
similarity index 98%
rename from email/group.c
rename to address/group.c
index 380b6e852102038f85d3d2834ee020846f9e0c80..9603eaa9c89c9664c7c4b1f5b0c6a364a7219c3c 100644 (file)
--- a/email/group.c
+++ b/address/group.c
@@ -22,7 +22,7 @@
  */
 
 /**
- * @page email_group Handling for email address groups
+ * @page addr_group Handling for email address groups
  *
  * Handling for email address groups
  */
@@ -30,8 +30,8 @@
 #include "config.h"
 #include <stdbool.h>
 #include <stdlib.h>
-#include "email/address.h"
 #include "group.h"
+#include "address/lib.h"
 
 static struct Hash *Groups = NULL;
 

diff --git a/email/group.h b/address/group.h
similarity index 100%
rename from email/group.h
rename to address/group.h

diff --git a/email/idna.c b/address/idna.c
similarity index 99%
rename from email/idna.c
rename to address/idna.c
index 83ef8011111d14adcc3a9e3e04e5bb1d299867d6..539b35aafe4d5363477f025e85e45a4e74dcd46a 100644 (file)
--- a/email/idna.c
+++ b/address/idna.c
@@ -21,7 +21,7 @@
  */
 
 /**
- * @page email_idna Handling of international domain names
+ * @page addr_idna Handling of international domain names
  *
  * Handling of international domain names
  */

diff --git a/email/idna2.h b/address/idna2.h
similarity index 100%
rename from email/idna2.h
rename to address/idna2.h

diff --git a/address/lib.h b/address/lib.h
new file mode 100644 (file)
index 0000000..cbd1530
--- /dev/null
+++ b/address/lib.h
@@ -0,0 +1,42 @@
+/**
+ * @file
+ * Email Address Handling
+ *
+ * @authors
+ * Copyright (C) 2019 Richard Russon <rich@flatcap.org>
+ *
+ * @copyright
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @page address ADDRESS: Email Address Handling
+ *
+ * Email Address Handling
+ *
+ * | File                   | Description              |
+ * | :--------------------- | :----------------------- |
+ * | address/address.c      | @subpage addr_address    |
+ * | address/group.c        | @subpage addr_group      |
+ * | address/idna.c         | @subpage addr_idna       |
+ */
+
+#ifndef MUTT_ADDRESS_LIB_H
+#define MUTT_ADDRESS_LIB_H
+
+#include "address.h"
+#include "group.h"
+#include "idna2.h"
+
+#endif /* MUTT_ADDRESS_LIB_H */

diff --git a/alias.c b/alias.c
index 162978d8e5aeba74797dc0eb062e7ffb2bab16b8..cea935b1cadfe8e24f16e03461dc9f7af58e7702 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -42,6 +42,7 @@
 #include "mutt.h"
 #include "alias.h"
 #include "addrbook.h"
+#include "address/lib.h"
 #include "curs_lib.h"
 #include "globals.h"
 #include "hdrline.h"

diff --git a/commands.c b/commands.c
index 85fa0e3ba284ae49c6f9b132d7a00eae474ae4ca..d93eeb247f6c53de825e994d61b478c1228f31b1 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -40,6 +40,7 @@
 #include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "copy.h"

diff --git a/compose.c b/compose.c
index cd512b196713525066128f3148216f5ccac421f7..959ec6625c5de62c5958086c0d95fa0bdba27769 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -41,6 +41,7 @@
 #include "conn/conn.h"
 #include "mutt.h"
 #include "compose.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "browser.h"
 #include "commands.h"

diff --git a/config/address.c b/config/address.c
index ef90b042e9c64cbd2f07702d776c8812f62b9cec..5e0796fa3356b91c4590cce31bc5a5a8f08e9a14 100644 (file)
--- a/config/address.c
+++ b/config/address.c
@@ -34,6 +34,7 @@
 #include "mutt/mutt.h"
 #include "email/lib.h"
 #include "address.h"
+#include "address/lib.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/conn/conn_raw.c b/conn/conn_raw.c
index e85b13068fe58206a320d5eff564da73c7161865..47bc5d605c230fbe4e6993fd770fe60a096521ff 100644 (file)
--- a/conn/conn_raw.c
+++ b/conn/conn_raw.c
@@ -46,6 +46,7 @@
 #include "mutt/mutt.h"
 #include "email/lib.h"
 #include "conn/connaccount.h"
+#include "address/lib.h"
 #include "conn_globals.h"
 #include "connection.h"
 #include "curs_lib.h"

diff --git a/conn/ssl.c b/conn/ssl.c
index 36b11873bd86184d288facb0be6242637ab23467..f59b0edad729f9d6ef5b63f9d6639f8d180774b8 100644 (file)
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -52,6 +52,7 @@
 #include "email/lib.h"
 #include "mutt.h"
 #include "ssl.h"
+#include "address/lib.h"
 #include "conn_globals.h"
 #include "connaccount.h"
 #include "connection.h"

diff --git a/copy.c b/copy.c
index 9beab96fcfe4b03d6bfcd3d6a0f1fcf24ccdc540..1850cbdad6e4b983695cf6c87f044d8914bcfbb2 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -36,6 +36,7 @@
 #include "email/lib.h"
 #include "mutt.h"
 #include "copy.h"
+#include "address/lib.h"
 #include "context.h"
 #include "globals.h"
 #include "handler.h"

diff --git a/edit.c b/edit.c
index eede0ece2e77ef0235d1b3cee71bca79130fc8e6..faa87ce3c3c0c9fb20a2f7c4bca2b8854bd34da3 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -38,6 +38,7 @@
 #include <sys/stat.h>
 #include "mutt/mutt.h"
 #include "email/lib.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "curs_lib.h"

diff --git a/email/envelope.c b/email/envelope.c
index 184afbe382549a8dc3c610e1f296addce885ee2e..de1971a2456d177b991cbc7e750d15dbdfdc2f3a 100644 (file)
--- a/email/envelope.c
+++ b/email/envelope.c
@@ -31,7 +31,7 @@
 #include <stdbool.h>
 #include "mutt/mutt.h"
 #include "envelope.h"
-#include "address.h"
+#include "address/lib.h"
 
 /**
  * mutt_env_new - Create a new Envelope

diff --git a/email/lib.h b/email/lib.h
index d4baa49a85cbbcb6e7ad623518fee025359e60b8..6b086a8ea50e2d99160742fe3ba0917924dea427 100644 (file)
--- a/email/lib.h
+++ b/email/lib.h
@@ -27,15 +27,12 @@
  *
  * | File                   | Description              |
  * | :--------------------- | :----------------------- |
- * | email/address.c        | @subpage email_address   |
  * | email/attach.c         | @subpage email_attach    |
  * | email/body.c           | @subpage email_body      |
  * | email/email_globals.c  | @subpage email_globals   |
  * | email/envelope.c       | @subpage email_envelope  |
  * | email/from.c           | @subpage email_from      |
- * | email/group.c          | @subpage email_group     |
  * | email/email.c          | @subpage email_email     |
- * | email/idna.c           | @subpage email_idna      |
  * | email/mime.c           | @subpage email_mime      |
  * | email/parameter.c      | @subpage email_parameter |
  * | email/parse.c          | @subpage email_parse     |
@@ -49,7 +46,6 @@
 #ifndef MUTT_EMAIL_LIB_H
 #define MUTT_EMAIL_LIB_H
 
-#include "address.h"
 #include "attach.h"
 #include "body.h"
 #include "content.h"
@@ -57,8 +53,6 @@
 #include "email_globals.h"
 #include "envelope.h"
 #include "from.h"
-#include "group.h"
-#include "idna2.h"
 #include "mime.h"
 #include "parameter.h"
 #include "parse.h"

diff --git a/email/parse.c b/email/parse.c
index 8b1bcf4506a28da805a6efedbdf9de1e2aeeb6d1..d8f9051d4212ecd8d8785fab2eed431d5f6f05ef 100644 (file)
--- a/email/parse.c
+++ b/email/parse.c
@@ -36,7 +36,7 @@
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "parse.h"
-#include "address.h"
+#include "address/lib.h"
 #include "body.h"
 #include "email.h"
 #include "email_globals.h"

diff --git a/email/rfc2047.c b/email/rfc2047.c
index 95dc04b71f617c3af1bdeb91e969e1feebaff1db..5110a1e3e1abafc25e64f7a42b9936e250426c82 100644 (file)
--- a/email/rfc2047.c
+++ b/email/rfc2047.c
@@ -37,7 +37,7 @@
 #include <string.h>
 #include "mutt/mutt.h"
 #include "rfc2047.h"
-#include "address.h"
+#include "address/lib.h"
 #include "email_globals.h"
 #include "envelope.h"
 #include "mime.h"

diff --git a/hcache/serialize.c b/hcache/serialize.c
index 4b42a8ae668081f0eb10c7b7b687e2d430da2d6b..4c469bdcce06d53eab41013a6b7d7c79878049a3 100644 (file)
--- a/hcache/serialize.c
+++ b/hcache/serialize.c
@@ -37,6 +37,7 @@
 #include <sys/types.h>
 #include "mutt/mutt.h"
 #include "email/lib.h"
+#include "address/lib.h"
 #include "globals.h"
 #include "hcache.h"
 

diff --git a/hdrline.c b/hdrline.c
index 60bf5b58146b2c6d0db9ab51e89e6809425ffb60..1fed6b78c01b457964d2ae958d24849424f3c48d 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -40,6 +40,7 @@
 #include "email/lib.h"
 #include "mutt.h"
 #include "hdrline.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "curs_lib.h"

diff --git a/hook.c b/hook.c
index 76c2e1bced853d67272eadc086f3996e0839b8d0..dc9b2f469f344d82c515f6127adfb370918e25ca 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -37,6 +37,7 @@
 #include "email/lib.h"
 #include "mutt.h"
 #include "hook.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "globals.h"

diff --git a/init.c b/init.c
index 37cfe1512ea9f906419cd0e0791bfd2368c50249..7824412fc3ec7e1960424f9c22dc78612832d3c9 100644 (file)
--- a/init.c
+++ b/init.c
@@ -46,6 +46,7 @@
 #include "mutt.h"
 #include "init.h"
 #include "account.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "filter.h"

diff --git a/init.h b/init.h
index 1c0f93bef7a59f44da2c9305a07c0fdb4889045e..49aa527d9fbea2d5303dfab48ca26ea1467d278f 100644 (file)
--- a/init.h
+++ b/init.h
@@ -35,6 +35,7 @@
 #include "conn/conn.h"
 #include "mutt.h"
 #include "addrbook.h"
+#include "address/lib.h"
 #include "bcache.h"
 #include "browser.h"
 #include "color.h"
@@ -52,11 +53,11 @@
 #include "mailbox.h"
 #include "maildir/lib.h"
 #include "main.h"
-#include "mutt_menu.h"
 #include "mutt_account.h"
 #include "mutt_commands.h"
 #include "mutt_history.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_thread.h"
 #include "muttlib.h"
 #include "mx.h"

diff --git a/main.c b/main.c
index 656455b2ce7d99d1e7dc850a78258536230abe05..7fa82526fc9bac2cbb261716b6b2f96c3bb29208 100644 (file)
--- a/main.c
+++ b/main.c
@@ -48,6 +48,7 @@
 #include "conn/conn.h"
 #include "mutt.h"
 #include "account.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "browser.h"
 #include "color.h"

diff --git a/mbox/mbox.c b/mbox/mbox.c
index 6e5816c537f48bad61a42ec59d68e8325dd86c16..c35a096bae6537ae63f52828ff5131b3164d3221 100644 (file)
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -45,6 +45,7 @@
 #include "mutt.h"
 #include "mbox.h"
 #include "account.h"
+#include "address/lib.h"
 #include "context.h"
 #include "copy.h"
 #include "globals.h"

diff --git a/muttlib.c b/muttlib.c
index 0a0a8bc40edc199b846ec58e013733708406efcc..c911b227080a55c9fea613b54480b4ea3ff8b2cf 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -47,6 +47,7 @@
 #include "conn/conn.h"
 #include "mutt.h"
 #include "muttlib.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "curs_lib.h"
 #include "filter.h"

diff --git a/mx.c b/mx.c
index 220152a0c03b931c91f762e8d031d63980c0912d..f6202d8dc0e1927e1c8b6425ed8f04582e1996e8 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -44,6 +44,7 @@
 #include "mutt.h"
 #include "mx.h"
 #include "account.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "copy.h"

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index 958df358862e66131401dbc50e68d8899fc5b82f..0987c12183c82508ee66a2bfaaa32bd4f1b03f4f 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -42,6 +42,7 @@
 #include "config/lib.h"
 #include "email/lib.h"
 #include "mutt.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "copy.h"

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index c210e2ebb13556cb26dbc583ce0e532ec60ed665..196341bc11388c7d3014f8f1791fc60bdd656b93 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -53,6 +53,7 @@
 #include "config/lib.h"
 #include "email/lib.h"
 #include "mutt.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "crypt.h"
 #include "curs_lib.h"

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 59b736d5872aa992e1df078713e2196958fb450e..f943a9a75ede206bef4f52d0875d4c68e85fb1fd 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -45,6 +45,7 @@
 #include "config/lib.h"
 #include "email/lib.h"
 #include "mutt.h"
+#include "address/lib.h"
 #include "crypt.h"
 #include "cryptglue.h"
 #include "curs_lib.h"

diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c
index 5319de48c33c4935717bbf1a991bf8b184f44172..35fe7caf974413423a54cb22d448240bdcecbc13 100644 (file)
--- a/ncrypt/pgpinvoke.c
+++ b/ncrypt/pgpinvoke.c
@@ -36,6 +36,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "email/lib.h"
+#include "address/lib.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"

diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index 897db4fdfa8c5582661f1ee68d61a2eca39a3aaa..a3d4e2086f143871f27712849111b221af0d5794 100644 (file)
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -43,6 +43,7 @@
 #include "email/lib.h"
 #include "mutt.h"
 #include "pgpkey.h"
+#include "address/lib.h"
 #include "crypt.h"
 #include "curs_lib.h"
 #include "filter.h"

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 2fb9b91fd32e59bbf41e3ad46b3cb81e247f593f..528c007a65e8d642ff683b468502cc0f2e467621 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -39,6 +39,7 @@
 #include "config/lib.h"
 #include "email/lib.h"
 #include "mutt.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "copy.h"

diff --git a/pattern.c b/pattern.c
index 0bacf9b3964236fd89f5e6e77ce8eb03d75e3a12..70f943eb7c31fb0f5dfc1d155d113750e6a2d805 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -43,6 +43,7 @@
 #include "conn/conn.h"
 #include "mutt.h"
 #include "pattern.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "copy.h"

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index 4f1a8359d7aa63c0d0f4c6e2049c8c018faf749a..a4cbfdb7720ee5d84f25b130b8ac61f769c9b2a8 100644 (file)
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -35,6 +35,7 @@
 #include "mutt/mutt.h"
 #include "email/lib.h"
 #include "conn/conn.h"
+#include "address/lib.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"

diff --git a/query.c b/query.c
index 47ecfb15be0e6893663f597f83beaace8b9a112d..a8f51844733f934ad3ecdab19bf6a32c7e52b6f8 100644 (file)
--- a/query.c
+++ b/query.c
@@ -35,6 +35,7 @@
 #include "mutt/mutt.h"
 #include "email/lib.h"
 #include "mutt.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "curs_lib.h"
 #include "filter.h"

diff --git a/recvcmd.c b/recvcmd.c
index 362b25de725aa3ee4927569135f677d151d5273b..0e9aba126cfc4b3f3c27cd0e98b699b5376c5a0b 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -35,6 +35,7 @@
 #include "config/lib.h"
 #include "email/lib.h"
 #include "mutt.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "copy.h"

diff --git a/remailer.c b/remailer.c
index 1d0ae3ab65e128a59a6d59b4df68bfd67b25a295..797f21cc0d8aff2bda82f9f658567f16598eb828 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -35,6 +35,7 @@
 #include "mutt/mutt.h"
 #include "email/lib.h"
 #include "mutt.h"
+#include "address/lib.h"
 #include "curs_lib.h"
 #include "filter.h"
 #include "format_flags.h"

diff --git a/send.c b/send.c
index 47600da105e8a4bb1b87eeebf0f90af43a1dbdfb..ced8accd8e089692c748d532190ca86c2c98a655 100644 (file)
--- a/send.c
+++ b/send.c
@@ -42,6 +42,7 @@
 #include "email/lib.h"
 #include "mutt.h"
 #include "send.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "compose.h"
 #include "context.h"

diff --git a/sendlib.c b/sendlib.c
index 9903ce07f480740ce11053ce004540e2d87ce1c7..55ffcf1e300cccccbe9799c91b8968f3dfaf8b41 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -46,6 +46,7 @@
 #include "email/lib.h"
 #include "mutt.h"
 #include "sendlib.h"
+#include "address/lib.h"
 #include "context.h"
 #include "copy.h"
 #include "curs_lib.h"

diff --git a/smtp.c b/smtp.c
index 6b35be23235473d3115a88c44020f018472fe920..04f7efbbf02e7d7e629d036c74f8eb06692a80ca 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -42,6 +42,7 @@
 #include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
+#include "address/lib.h"
 #include "globals.h"
 #include "mutt_account.h"
 #include "mutt_socket.h"

diff --git a/sort.c b/sort.c
index 6e291223262841d380a083bf60fc4b51f13c75ef..3673f23e8ea5971d19a8bf2795bd670c6cb76ac1 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -33,6 +33,7 @@
 #include "mutt/mutt.h"
 #include "email/lib.h"
 #include "sort.h"
+#include "address/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "globals.h"

diff --git a/test/address.c b/test/address.c
index acd1fd6de477b67a4a1b7e19635f9b8507f94ce8..fb69ac78dadae5a61f75135d7246c174e95b399f 100644 (file)
--- a/test/address.c
+++ b/test/address.c
@@ -1,6 +1,6 @@
 #define TEST_NO_MAIN
 #include "acutest.h"
-#include "email/address.h"
+#include "address/lib.h"
 #include "mutt/memory.h"
 #include <string.h>
 

diff --git a/test/config/address.c b/test/config/address.c
index b48f7171d479d7b6885060c69d0ee1a1399513ce..e68696e05035274882f5e4ab3524f964a698a632 100644 (file)
--- a/test/config/address.c
+++ b/test/config/address.c
@@ -30,7 +30,7 @@
 #include "mutt/mutt.h"
 #include "config/common.h"
 #include "config/lib.h"
-#include "email/address.h"
+#include "address/lib.h"
 
 static struct Address *VarApple;
 static struct Address *VarBanana;

diff --git a/version.c b/version.c
index 1a098c801528038b0e7014fa51b041dc1ae8cd5a..3ab9a05d25909f2f3e4b1608fa7492708728ced2 100644 (file)
--- a/version.c
+++ b/version.c
@@ -36,6 +36,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "email/lib.h"
+#include "address/lib.h"
 #include "mutt_curses.h"
 #include "ncrypt/crypt_gpgme.h"
 #ifdef USE_INOTIFY