From 3c30fb17476059e2a30df110bf9842b2fecee634 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 11 Nov 2013 10:45:43 -0500 Subject: Convert libemail-engine to a single-include model. Use: #include --- libemail-engine/Makefile.am | 2 ++ libemail-engine/camel-null-store.h | 4 +++ libemail-engine/camel-sasl-xoauth2.h | 4 +++ libemail-engine/e-mail-authenticator.h | 4 +++ libemail-engine/e-mail-engine-enums.h | 4 +++ libemail-engine/e-mail-folder-utils.h | 4 +++ libemail-engine/e-mail-junk-filter.h | 4 +++ libemail-engine/e-mail-session-utils.h | 4 +++ libemail-engine/e-mail-session.h | 4 +++ libemail-engine/e-mail-store-utils.h | 4 +++ libemail-engine/e-mail-utils.h | 4 +++ libemail-engine/em-filter-folder-element.h | 4 +++ libemail-engine/em-vfolder-context.h | 4 +++ libemail-engine/em-vfolder-rule.h | 4 +++ libemail-engine/libemail-engine.h | 48 ++++++++++++++++++++++++++++++ libemail-engine/mail-config.h | 4 +++ libemail-engine/mail-folder-cache.h | 4 +++ libemail-engine/mail-mt.h | 4 +++ libemail-engine/mail-ops.h | 4 +++ libemail-engine/mail-tools.h | 4 +++ libemail-engine/mail-vfolder.h | 4 +++ 21 files changed, 126 insertions(+) create mode 100644 libemail-engine/libemail-engine.h (limited to 'libemail-engine') diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am index f483fb11dc..15d12c62d6 100644 --- a/libemail-engine/Makefile.am +++ b/libemail-engine/Makefile.am @@ -21,6 +21,7 @@ libemail_engine_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_builddir) \ + -DLIBEMAIL_ENGINE_COMPILATION \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(GTKHTML_CFLAGS) \ @@ -29,6 +30,7 @@ libemail_engine_la_CPPFLAGS = \ libmailengineincludedir = $(privincludedir)/libemail-engine libmailengineinclude_HEADERS = \ + libemail-engine.h \ camel-null-store.h \ camel-sasl-xoauth2.h \ e-mail-authenticator.h \ diff --git a/libemail-engine/camel-null-store.h b/libemail-engine/camel-null-store.h index cedcef4154..aa076dfd2d 100644 --- a/libemail-engine/camel-null-store.h +++ b/libemail-engine/camel-null-store.h @@ -21,6 +21,10 @@ * the account type. This bizarre hack keeps that bizzare hack working * until we can support multiple identities properly. */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef CAMEL_NULL_STORE_H #define CAMEL_NULL_STORE_H diff --git a/libemail-engine/camel-sasl-xoauth2.h b/libemail-engine/camel-sasl-xoauth2.h index 940964b498..fa461447d2 100644 --- a/libemail-engine/camel-sasl-xoauth2.h +++ b/libemail-engine/camel-sasl-xoauth2.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef CAMEL_SASL_XOAUTH2_H #define CAMEL_SASL_XOAUTH2_H diff --git a/libemail-engine/e-mail-authenticator.h b/libemail-engine/e-mail-authenticator.h index 864d32dea0..0f6b19b0aa 100644 --- a/libemail-engine/e-mail-authenticator.h +++ b/libemail-engine/e-mail-authenticator.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef E_MAIL_AUTHENTICATOR_H #define E_MAIL_AUTHENTICATOR_H diff --git a/libemail-engine/e-mail-engine-enums.h b/libemail-engine/e-mail-engine-enums.h index 3b1d3bd127..c63786a780 100644 --- a/libemail-engine/e-mail-engine-enums.h +++ b/libemail-engine/e-mail-engine-enums.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef E_MAIL_ENGINE_ENUMS_H #define E_MAIL_ENGINE_ENUMS_H diff --git a/libemail-engine/e-mail-folder-utils.h b/libemail-engine/e-mail-folder-utils.h index 5217f2d608..c6253b0bab 100644 --- a/libemail-engine/e-mail-folder-utils.h +++ b/libemail-engine/e-mail-folder-utils.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef E_MAIL_FOLDER_UTILS_H #define E_MAIL_FOLDER_UTILS_H diff --git a/libemail-engine/e-mail-junk-filter.h b/libemail-engine/e-mail-junk-filter.h index efcd25f9d9..7b26d34575 100644 --- a/libemail-engine/e-mail-junk-filter.h +++ b/libemail-engine/e-mail-junk-filter.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef E_MAIL_JUNK_FILTER_H #define E_MAIL_JUNK_FILTER_H diff --git a/libemail-engine/e-mail-session-utils.h b/libemail-engine/e-mail-session-utils.h index 6349834d8d..cc498bbc3a 100644 --- a/libemail-engine/e-mail-session-utils.h +++ b/libemail-engine/e-mail-session-utils.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef E_MAIL_SESSION_UTILS_H #define E_MAIL_SESSION_UTILS_H diff --git a/libemail-engine/e-mail-session.h b/libemail-engine/e-mail-session.h index de726436ae..68dd125a35 100644 --- a/libemail-engine/e-mail-session.h +++ b/libemail-engine/e-mail-session.h @@ -22,6 +22,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef E_MAIL_SESSION_H #define E_MAIL_SESSION_H diff --git a/libemail-engine/e-mail-store-utils.h b/libemail-engine/e-mail-store-utils.h index dc2431684a..55ade881f2 100644 --- a/libemail-engine/e-mail-store-utils.h +++ b/libemail-engine/e-mail-store-utils.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef E_MAIL_STORE_UTILS_H #define E_MAIL_STORE_UTILS_H diff --git a/libemail-engine/e-mail-utils.h b/libemail-engine/e-mail-utils.h index a0ea188f9f..f055f3d6aa 100644 --- a/libemail-engine/e-mail-utils.h +++ b/libemail-engine/e-mail-utils.h @@ -19,6 +19,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef E_MAIL_UTILS_H #define E_MAIL_UTILS_H diff --git a/libemail-engine/em-filter-folder-element.h b/libemail-engine/em-filter-folder-element.h index 8c619017a6..d76c93423f 100644 --- a/libemail-engine/em-filter-folder-element.h +++ b/libemail-engine/em-filter-folder-element.h @@ -22,6 +22,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef EM_FILTER_FOLDER_ELEMENT_H #define EM_FILTER_FOLDER_ELEMENT_H diff --git a/libemail-engine/em-vfolder-context.h b/libemail-engine/em-vfolder-context.h index 9e2faf357a..cad3b35b10 100644 --- a/libemail-engine/em-vfolder-context.h +++ b/libemail-engine/em-vfolder-context.h @@ -22,6 +22,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef EM_VFOLDER_CONTEXT_H #define EM_VFOLDER_CONTEXT_H diff --git a/libemail-engine/em-vfolder-rule.h b/libemail-engine/em-vfolder-rule.h index 255485d39a..671d1bca24 100644 --- a/libemail-engine/em-vfolder-rule.h +++ b/libemail-engine/em-vfolder-rule.h @@ -21,6 +21,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef EM_VFOLDER_RULE_H #define EM_VFOLDER_RULE_H diff --git a/libemail-engine/libemail-engine.h b/libemail-engine/libemail-engine.h new file mode 100644 index 0000000000..855610009a --- /dev/null +++ b/libemail-engine/libemail-engine.h @@ -0,0 +1,48 @@ +/* + * libemail-engine.h + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + */ + +#ifndef LIBEMAIL_ENGINE_H +#define LIBEMAIL_ENGINE_H + +#define __LIBEMAIL_ENGINE_H_INSIDE__ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#undef __LIBEMAIL_ENGINE_H_INSIDE__ + +#endif /* LIBEMAIL_ENGINE_H */ + diff --git a/libemail-engine/mail-config.h b/libemail-engine/mail-config.h index cc836acf95..cfbdbef2e8 100644 --- a/libemail-engine/mail-config.h +++ b/libemail-engine/mail-config.h @@ -20,6 +20,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef MAIL_CONFIG_H #define MAIL_CONFIG_H diff --git a/libemail-engine/mail-folder-cache.h b/libemail-engine/mail-folder-cache.h index 8a91ca56a4..da836b98ec 100644 --- a/libemail-engine/mail-folder-cache.h +++ b/libemail-engine/mail-folder-cache.h @@ -23,6 +23,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef MAIL_FOLDER_CACHE_H #define MAIL_FOLDER_CACHE_H diff --git a/libemail-engine/mail-mt.h b/libemail-engine/mail-mt.h index 3fd5819d0c..34bee2e7f0 100644 --- a/libemail-engine/mail-mt.h +++ b/libemail-engine/mail-mt.h @@ -20,6 +20,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef _MAIL_MT #define _MAIL_MT diff --git a/libemail-engine/mail-ops.h b/libemail-engine/mail-ops.h index dd115ff601..ec9ab739ab 100644 --- a/libemail-engine/mail-ops.h +++ b/libemail-engine/mail-ops.h @@ -21,6 +21,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef MAIL_OPS_H #define MAIL_OPS_H diff --git a/libemail-engine/mail-tools.h b/libemail-engine/mail-tools.h index 94b19c0d12..c56924da54 100644 --- a/libemail-engine/mail-tools.h +++ b/libemail-engine/mail-tools.h @@ -20,6 +20,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef MAIL_TOOLS_H #define MAIL_TOOLS_H diff --git a/libemail-engine/mail-vfolder.h b/libemail-engine/mail-vfolder.h index 00d3e54035..a5b4639e4c 100644 --- a/libemail-engine/mail-vfolder.h +++ b/libemail-engine/mail-vfolder.h @@ -19,6 +19,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only should be included directly." +#endif + #ifndef _MAIL_VFOLDER_H #define _MAIL_VFOLDER_H -- cgit v1.2.3