[evolution-data-server] Camel: Fix linking issue.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Camel: Fix linking issue.
- Date: Wed, 24 Aug 2011 18:22:32 +0000 (UTC)
commit 74c634ecddf83ec8c0f10edb9b0192fcc0598a4a
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Aug 24 14:16:28 2011 -0400
Camel: Fix linking issue.
camel-enumtypes.c is linked into libcamel.so, but is needed by
camel-network-settings.c which is part of libcamel-provider.so,
and libcamel-provider.so is lower in the dependency chain.
Move camel-enumtypes.c into libcamel-provider.so.
ed. I don't understand why libcamel-provider.so even exists as a
separate library, unless there's some hidden circular dependency
I haven't tripped over yet. Tempted to merge it into libcamel.so
and see how it goes...
camel/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 6f9c606..d58ac77 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -52,6 +52,7 @@ libcamel_provider_1_2_la_CPPFLAGS = \
$(CAMEL_CFLAGS)
libcamel_provider_1_2_la_SOURCES = \
+ $(ENUM_GENERATED) \
camel-cipher-context.c \
camel-disco-diary.c \
camel-disco-folder.c \
@@ -177,7 +178,6 @@ libcamel_1_2_la_CPPFLAGS = \
$(CAMEL_CFLAGS)
libcamel_1_2_la_SOURCES = \
- $(ENUM_GENERATED) \
$(MARSHAL_GENERATED) \
camel-address.c \
camel-block-file.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]