[evolution-mapi/wip/cmake] Use ${PROJECT_NAME}-config.h unconditionally in the sources
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-mapi/wip/cmake] Use ${PROJECT_NAME}-config.h unconditionally in the sources
- Date: Wed, 5 Oct 2016 17:21:19 +0000 (UTC)
commit edef5badae516982695b3c55cf08c3b3aaa9f983
Author: Milan Crha <mcrha redhat com>
Date: Wed Oct 5 19:21:51 2016 +0200
Use ${PROJECT_NAME}-config.h unconditionally in the sources
CMakeLists.txt | 8 +++-----
config.h.in | 2 +-
src/addressbook/e-book-backend-mapi-contacts.c | 4 +---
src/addressbook/e-book-backend-mapi-factory.c | 4 +---
src/addressbook/e-book-backend-mapi-gal.c | 4 +---
src/addressbook/e-book-backend-mapi.c | 4 +---
src/calendar/e-cal-backend-mapi-factory.c | 4 +---
src/calendar/e-cal-backend-mapi.c | 4 +---
src/camel/camel-mapi-folder-summary.c | 4 +---
src/camel/camel-mapi-folder.c | 4 +---
src/camel/camel-mapi-provider.c | 4 +---
src/camel/camel-mapi-sasl-krb.c | 4 +---
src/camel/camel-mapi-store-summary.c | 4 +---
src/camel/camel-mapi-store.c | 4 +---
src/camel/camel-mapi-transport.c | 4 +---
src/collection/e-mapi-backend.c | 4 +---
src/collection/module-mapi-backend.c | 4 +---
src/configuration/e-book-config-mapi.c | 4 +---
src/configuration/e-book-config-mapigal.c | 4 +---
src/configuration/e-cal-config-mapi.c | 4 +---
src/configuration/e-mail-config-mapi-backend.c | 4 +---
src/configuration/e-mail-config-mapi-extension.c | 4 +---
src/configuration/e-mail-config-mapi-page.c | 4 +---
src/configuration/e-mapi-config-ui-extension.c | 4 +---
src/configuration/e-mapi-config-utils.c | 4 +---
src/configuration/e-mapi-edit-folder-permissions.c | 4 +---
src/configuration/e-mapi-search-gal-user.c | 4 +---
.../e-mapi-subscribe-foreign-folder.c | 4 +---
src/configuration/module-mapi-configuration.c | 4 +---
src/libexchangemapi/e-mapi-book-utils.c | 4 +---
src/libexchangemapi/e-mapi-cal-recur-utils.c | 4 +---
src/libexchangemapi/e-mapi-cal-tz-utils.c | 4 +---
src/libexchangemapi/e-mapi-cal-utils.c | 4 +---
src/libexchangemapi/e-mapi-connection.c | 4 +---
src/libexchangemapi/e-mapi-fast-transfer.c | 4 +---
src/libexchangemapi/e-mapi-folder.c | 4 +---
src/libexchangemapi/e-mapi-mail-utils.c | 4 +---
src/libexchangemapi/e-mapi-mail-utils.h | 4 +---
src/libexchangemapi/e-mapi-operation-queue.c | 4 +---
src/libexchangemapi/e-mapi-utils.c | 4 +---
40 files changed, 42 insertions(+), 120 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2998a5..590bffc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 3.0)
cmake_policy(VERSION 3.0)
-project(evolution
+project(evolution-mapi
VERSION 3.23.1
LANGUAGES C CXX)
set(PROJECT_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-mapi")
@@ -178,10 +178,8 @@ else(WIN32)
set(privsolibdir "${privlibdir}")
endif(WIN32)
-# Generate the config.h file
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h)
-
-add_definitions(-DHAVE_CONFIG_H=1)
+# Generate the ${PROJECT_NAME}-config.h file
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-config.h)
print_build_options()
diff --git a/config.h.in b/config.h.in
index 873b484..e87bf50 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,4 @@
-/* config.h generated by CMake */
+/* @PROJECT_NAME@-config.h generated by CMake */
/* Name of the package */
#define PACKAGE "@PROJECT_NAME@"
diff --git a/src/addressbook/e-book-backend-mapi-contacts.c b/src/addressbook/e-book-backend-mapi-contacts.c
index d1eda50..b1a07f6 100644
--- a/src/addressbook/e-book-backend-mapi-contacts.c
+++ b/src/addressbook/e-book-backend-mapi-contacts.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <stdlib.h>
#include <fcntl.h>
diff --git a/src/addressbook/e-book-backend-mapi-factory.c b/src/addressbook/e-book-backend-mapi-factory.c
index ce03145..c4c664d 100644
--- a/src/addressbook/e-book-backend-mapi-factory.c
+++ b/src/addressbook/e-book-backend-mapi-factory.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
diff --git a/src/addressbook/e-book-backend-mapi-gal.c b/src/addressbook/e-book-backend-mapi-gal.c
index 26c183b..e189599 100644
--- a/src/addressbook/e-book-backend-mapi-gal.c
+++ b/src/addressbook/e-book-backend-mapi-gal.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <stdlib.h>
#include <fcntl.h>
diff --git a/src/addressbook/e-book-backend-mapi.c b/src/addressbook/e-book-backend-mapi.c
index f5f3cc6..355bae8 100644
--- a/src/addressbook/e-book-backend-mapi.c
+++ b/src/addressbook/e-book-backend-mapi.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/src/calendar/e-cal-backend-mapi-factory.c b/src/calendar/e-cal-backend-mapi-factory.c
index 1f13d34..20f676a 100644
--- a/src/calendar/e-cal-backend-mapi-factory.c
+++ b/src/calendar/e-cal-backend-mapi-factory.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
diff --git a/src/calendar/e-cal-backend-mapi.c b/src/calendar/e-cal-backend-mapi.c
index 7fce4fd..9e34118 100644
--- a/src/calendar/e-cal-backend-mapi.c
+++ b/src/calendar/e-cal-backend-mapi.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
#include <gio/gio.h>
diff --git a/src/camel/camel-mapi-folder-summary.c b/src/camel/camel-mapi-folder-summary.c
index 9023a72..922ca0b 100644
--- a/src/camel/camel-mapi-folder-summary.c
+++ b/src/camel/camel-mapi-folder-summary.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index e03efd0..cc726b3 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <string.h>
#include <time.h>
diff --git a/src/camel/camel-mapi-provider.c b/src/camel/camel-mapi-provider.c
index 84b2737..ca752aa 100644
--- a/src/camel/camel-mapi-provider.c
+++ b/src/camel/camel-mapi-provider.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <sys/types.h>
#include <string.h>
diff --git a/src/camel/camel-mapi-sasl-krb.c b/src/camel/camel-mapi-sasl-krb.c
index 3f744a3..7fda05b 100644
--- a/src/camel/camel-mapi-sasl-krb.c
+++ b/src/camel/camel-mapi-sasl-krb.c
@@ -14,9 +14,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <string.h>
diff --git a/src/camel/camel-mapi-store-summary.c b/src/camel/camel-mapi-store-summary.c
index 07da88c..cef8fb0 100644
--- a/src/camel/camel-mapi-store-summary.c
+++ b/src/camel/camel-mapi-store-summary.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index 69f992d..336ab5f 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <stdint.h>
#include <stdbool.h>
diff --git a/src/camel/camel-mapi-transport.c b/src/camel/camel-mapi-transport.c
index 6865186..78d9a9a 100644
--- a/src/camel/camel-mapi-transport.c
+++ b/src/camel/camel-mapi-transport.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <string.h>
diff --git a/src/collection/e-mapi-backend.c b/src/collection/e-mapi-backend.c
index 1769556..fdf8a30 100644
--- a/src/collection/e-mapi-backend.c
+++ b/src/collection/e-mapi-backend.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
diff --git a/src/collection/module-mapi-backend.c b/src/collection/module-mapi-backend.c
index 0d27ae5..40fa78f 100644
--- a/src/collection/module-mapi-backend.c
+++ b/src/collection/module-mapi-backend.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
diff --git a/src/configuration/e-book-config-mapi.c b/src/configuration/e-book-config-mapi.c
index 13effc3..aebdc03 100644
--- a/src/configuration/e-book-config-mapi.c
+++ b/src/configuration/e-book-config-mapi.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include "e-book-config-mapi.h"
#include "e-mapi-config-utils.h"
diff --git a/src/configuration/e-book-config-mapigal.c b/src/configuration/e-book-config-mapigal.c
index 518317a..6841842 100644
--- a/src/configuration/e-book-config-mapigal.c
+++ b/src/configuration/e-book-config-mapigal.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
diff --git a/src/configuration/e-cal-config-mapi.c b/src/configuration/e-cal-config-mapi.c
index fbb0ae5..f0ffede 100644
--- a/src/configuration/e-cal-config-mapi.c
+++ b/src/configuration/e-cal-config-mapi.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include "e-cal-config-mapi.h"
#include "e-mapi-config-utils.h"
diff --git a/src/configuration/e-mail-config-mapi-backend.c b/src/configuration/e-mail-config-mapi-backend.c
index 8c346da..37dbbaa 100644
--- a/src/configuration/e-mail-config-mapi-backend.c
+++ b/src/configuration/e-mail-config-mapi-backend.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
diff --git a/src/configuration/e-mail-config-mapi-extension.c
b/src/configuration/e-mail-config-mapi-extension.c
index 186d685..df094a3 100644
--- a/src/configuration/e-mail-config-mapi-extension.c
+++ b/src/configuration/e-mail-config-mapi-extension.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <mail/e-mail-config-notebook.h>
diff --git a/src/configuration/e-mail-config-mapi-page.c b/src/configuration/e-mail-config-mapi-page.c
index 806d803..b82f3f9 100644
--- a/src/configuration/e-mail-config-mapi-page.c
+++ b/src/configuration/e-mail-config-mapi-page.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
diff --git a/src/configuration/e-mapi-config-ui-extension.c b/src/configuration/e-mapi-config-ui-extension.c
index cdaf2ac..9d834cc 100644
--- a/src/configuration/e-mapi-config-ui-extension.c
+++ b/src/configuration/e-mapi-config-ui-extension.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/src/configuration/e-mapi-config-utils.c b/src/configuration/e-mapi-config-utils.c
index ea2c384..387f390 100644
--- a/src/configuration/e-mapi-config-utils.c
+++ b/src/configuration/e-mapi-config-utils.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <string.h>
#include <unistd.h>
diff --git a/src/configuration/e-mapi-edit-folder-permissions.c
b/src/configuration/e-mapi-edit-folder-permissions.c
index 35ade8a..33e6941 100644
--- a/src/configuration/e-mapi-edit-folder-permissions.c
+++ b/src/configuration/e-mapi-edit-folder-permissions.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/src/configuration/e-mapi-search-gal-user.c b/src/configuration/e-mapi-search-gal-user.c
index 1512d2a..12a4a1b 100644
--- a/src/configuration/e-mapi-search-gal-user.c
+++ b/src/configuration/e-mapi-search-gal-user.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/src/configuration/e-mapi-subscribe-foreign-folder.c
b/src/configuration/e-mapi-subscribe-foreign-folder.c
index ac3c5f5..08047a0 100644
--- a/src/configuration/e-mapi-subscribe-foreign-folder.c
+++ b/src/configuration/e-mapi-subscribe-foreign-folder.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/src/configuration/module-mapi-configuration.c b/src/configuration/module-mapi-configuration.c
index 211b317..20136e4 100644
--- a/src/configuration/module-mapi-configuration.c
+++ b/src/configuration/module-mapi-configuration.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
diff --git a/src/libexchangemapi/e-mapi-book-utils.c b/src/libexchangemapi/e-mapi-book-utils.c
index a15e5ce..9f0283c 100644
--- a/src/libexchangemapi/e-mapi-book-utils.c
+++ b/src/libexchangemapi/e-mapi-book-utils.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <libedataserver/libedataserver.h>
diff --git a/src/libexchangemapi/e-mapi-cal-recur-utils.c b/src/libexchangemapi/e-mapi-cal-recur-utils.c
index 797dc02..3274a30 100644
--- a/src/libexchangemapi/e-mapi-cal-recur-utils.c
+++ b/src/libexchangemapi/e-mapi-cal-recur-utils.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <libecal/libecal.h>
diff --git a/src/libexchangemapi/e-mapi-cal-tz-utils.c b/src/libexchangemapi/e-mapi-cal-tz-utils.c
index b68f675..72abe0c 100644
--- a/src/libexchangemapi/e-mapi-cal-tz-utils.c
+++ b/src/libexchangemapi/e-mapi-cal-tz-utils.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include "e-mapi-cal-tz-utils.h"
diff --git a/src/libexchangemapi/e-mapi-cal-utils.c b/src/libexchangemapi/e-mapi-cal-utils.c
index b41bf92..2b1bb53 100644
--- a/src/libexchangemapi/e-mapi-cal-utils.c
+++ b/src/libexchangemapi/e-mapi-cal-utils.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gstdio.h>
#include <glib/gi18n-lib.h>
diff --git a/src/libexchangemapi/e-mapi-connection.c b/src/libexchangemapi/e-mapi-connection.c
index 29e5723..2ba0d08 100644
--- a/src/libexchangemapi/e-mapi-connection.c
+++ b/src/libexchangemapi/e-mapi-connection.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
#include <camel/camel.h>
diff --git a/src/libexchangemapi/e-mapi-fast-transfer.c b/src/libexchangemapi/e-mapi-fast-transfer.c
index 05fb207..9a6cbfb 100644
--- a/src/libexchangemapi/e-mapi-fast-transfer.c
+++ b/src/libexchangemapi/e-mapi-fast-transfer.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include "e-mapi-connection.h"
#include "e-mapi-debug.h"
diff --git a/src/libexchangemapi/e-mapi-folder.c b/src/libexchangemapi/e-mapi-folder.c
index a1cdb13..1c19181 100644
--- a/src/libexchangemapi/e-mapi-folder.c
+++ b/src/libexchangemapi/e-mapi-folder.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib/gi18n-lib.h>
diff --git a/src/libexchangemapi/e-mapi-mail-utils.c b/src/libexchangemapi/e-mapi-mail-utils.c
index 835c687..7f5d5ad 100644
--- a/src/libexchangemapi/e-mapi-mail-utils.c
+++ b/src/libexchangemapi/e-mapi-mail-utils.c
@@ -17,9 +17,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <camel/camel.h>
#include <libecal/libecal.h>
diff --git a/src/libexchangemapi/e-mapi-mail-utils.h b/src/libexchangemapi/e-mapi-mail-utils.h
index 1cf2357..b4dccba 100644
--- a/src/libexchangemapi/e-mapi-mail-utils.h
+++ b/src/libexchangemapi/e-mapi-mail-utils.h
@@ -20,9 +20,7 @@
#ifndef E_MAPI_MAIL_UTILS_H
#define E_MAPI_MAIL_UTILS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib.h>
#include <gio/gio.h>
diff --git a/src/libexchangemapi/e-mapi-operation-queue.c b/src/libexchangemapi/e-mapi-operation-queue.c
index 86b504d..95dec04 100644
--- a/src/libexchangemapi/e-mapi-operation-queue.c
+++ b/src/libexchangemapi/e-mapi-operation-queue.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <stdio.h>
#include "e-mapi-operation-queue.h"
diff --git a/src/libexchangemapi/e-mapi-utils.c b/src/libexchangemapi/e-mapi-utils.c
index b88052f..092cf79 100644
--- a/src/libexchangemapi/e-mapi-utils.c
+++ b/src/libexchangemapi/e-mapi-utils.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-mapi-config.h"
#include <glib.h>
#include <gio/gio.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]