[evolution-ews] Bug 730878 - Split libcamelews into a static and a dynamic library

[Milan Crha <mcrha src gnome org>]

commit 4d5d78c6adae687037e77e6e3048947b476493cf
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jul 10 13:19:19 2014 +0200

    Bug 730878 - Split libcamelews into a static and a dynamic library
    
    After the initial change within     bug 730878, which made the libcamelews
    a module, the module-ews-configuration also linking into it was
    producing a warning during compile time:
       *** Warning: Linking the shared library module-ews-configuration.la
       *** against the loadable module libcamelews.so is not portable!
    To avoid this warning I     split the libcamelews into a statis and
    a dynamic library and made the module-ews-configuration     link against
    the static library.

 src/camel/Makefile.am         |   67 +++++++++++++++++++++++++++++++---------
 src/configuration/Makefile.am |    2 +-
 2 files changed, 53 insertions(+), 16 deletions(-)
---
diff --git a/src/camel/Makefile.am b/src/camel/Makefile.am
index 0bdab09..014e2e7 100644
--- a/src/camel/Makefile.am
+++ b/src/camel/Makefile.am
@@ -1,7 +1,6 @@
 NULL =
 
-camel_provider_LTLIBRARIES = libcamelews.la
-camel_provider_DATA = libcamelews.urls
+noinst_LTLIBRARIES = libcamelews-priv.la
 
 ENUM_TYPES = camel-ews-enums.h
 
@@ -21,7 +20,19 @@ ENUM_GENERATED = \
        camel-ews-enumtypes.c \
        $(NULL)
 
-libcamelews_la_CPPFLAGS = \
+noinst_HEADERS = \
+       camel-ews-enums.h \
+       camel-ews-enumtypes.h \
+       camel-ews-folder.h \
+       camel-ews-private.h \
+       camel-ews-store-summary.h \
+       camel-ews-store.h \
+       camel-ews-summary.h \
+       camel-ews-utils.h \
+       camel-ews-transport.h \
+       $(NULL)
+
+libcamelews_priv_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/src \
@@ -38,32 +49,58 @@ libcamelews_la_CPPFLAGS = \
        $(CODE_COVERAGE_CFLAGS) \
        $(NULL)
 
-libcamelews_la_SOURCES = \
+libcamelews_priv_la_SOURCES = \
        camel-ews-enumtypes.c \
        camel-ews-folder.c \
        camel-ews-store-summary.c \
        camel-ews-store.c \
        camel-ews-summary.c \
-       camel-ews-provider.c \
        camel-ews-utils.c \
        camel-ews-transport.c \
        $(NULL)
 
-noinst_HEADERS = \
-       camel-ews-enums.h \
-       camel-ews-enumtypes.h \
-       camel-ews-folder.h \
-       camel-ews-private.h \
-       camel-ews-store-summary.h \
-       camel-ews-store.h \
-       camel-ews-summary.h \
-       camel-ews-utils.h \
-       camel-ews-transport.h \
+libcamelews_priv_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
+
+libcamelews_priv_la_LIBADD = \
+       $(top_builddir)/src/server/libeews-1.2.la  \
+       $(top_builddir)/src/utils/libewsutils.la  \
+       $(CAMEL_LIBS) \
+       $(EVOLUTION_SHELL_LIBS) \
+       $(LIBEDATASERVER_LIBS) \
+       $(LIBEBACKEND_LIBS) \
+       $(LIBECAL_LIBS) \
+       $(SOUP_LIBS) \
+       $(E_DATA_SERVER_LIBS) \
+       $(NULL)
+
+camel_provider_LTLIBRARIES = libcamelews.la
+camel_provider_DATA = libcamelews.urls
+
+libcamelews_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/src \
+       -DEXCHANGE_EWS_LOCALEDIR=\"$(localedir)\" \
+       -DG_LOG_DOMAIN=\"camel-ews-provider\" \
+       $(CAMEL_CFLAGS) \
+       $(LIBEDATASERVER_CFLAGS) \
+       $(LIBECAL_CFLAGS) \
+       $(EVOLUTION_SHELL_CFLAGS) \
+       $(GNOME_INCLUDEDIR) \
+       $(SOUP_CFLAGS) \
+       $(LIBEBACKEND_CFLAGS) \
+       $(E_DATA_SERVER_CFLAGS) \
+       $(CODE_COVERAGE_CFLAGS) \
+       $(NULL)
+
+libcamelews_la_SOURCES = \
+       camel-ews-provider.c \
        $(NULL)
 
 libcamelews_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
 libcamelews_la_LIBADD = \
+       libcamelews-priv.la  \
        $(top_builddir)/src/server/libeews-1.2.la  \
        $(top_builddir)/src/utils/libewsutils.la  \
        $(CAMEL_LIBS) \
diff --git a/src/configuration/Makefile.am b/src/configuration/Makefile.am
index 2aa408b..e555548 100644
--- a/src/configuration/Makefile.am
+++ b/src/configuration/Makefile.am
@@ -50,7 +50,7 @@ module_ews_configuration_la_SOURCES = \
        $(NULL)
 
 module_ews_configuration_la_LIBADD = \
-       $(top_builddir)/src/camel/libcamelews.la \
+       $(top_builddir)/src/camel/libcamelews-priv.la \
        $(top_builddir)/src/server/libeews-1.2.la \
        $(top_builddir)/src/utils/libewsutils.la \
        $(EVOLUTION_MAIL_LIBS) \