[evolution] Add libraries to LIBADD so that -no-undefined on win32 works well.
- From: Fridrich Strba <strba src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution] Add libraries to LIBADD so that -no-undefined on win32 works well.
- Date: Wed, 3 Jun 2009 13:49:14 -0400 (EDT)
commit 3bfe9497a68753c12c6cef695595b9993d3fef21
Author: Fridrich Strba <fridrich strba bluewin ch>
Date: Wed Jun 3 19:22:16 2009 +0200
Add libraries to LIBADD so that -no-undefined on win32 works well.
---
plugins/audio-inline/Makefile.am | 10 +++++++++-
plugins/bbdb/Makefile.am | 10 +++++++++-
plugins/vcard-inline/Makefile.am | 13 +++++++++++--
3 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index 73e0b98..006b39f 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -1,3 +1,10 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = \
+ $(top_builddir)/mail/libevolution-mail.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(GNOME_PLATFORM_LIBS)
+endif
+
INCLUDES = \
-I$(top_srcdir) \
$(EVOLUTION_MAIL_CFLAGS) \
@@ -12,7 +19,8 @@ liborg_gnome_audio_inline_la_SOURCES = audio-inline.c
liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_audio_inline_la_LIBADD = \
$(GSTREAMER_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(NO_UNDEFINED_REQUIRED_LIBS)
EXTRA_DIST = org-gnome-audio-inline.eplug.xml
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index 1bf7604..481d465 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -1,3 +1,10 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = \
+ $(top_builddir)/mail/libevolution-mail.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(GNOME_PLATFORM_LIBS)
+endif
+
INCLUDES = \
-I$(top_builddir)/composer \
-I$(top_srcdir) \
@@ -14,7 +21,8 @@ liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c
liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_evolution_bbdb_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS)
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(NO_UNDEFINED_REQUIRED_LIBS)
EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index 781eb53..01e1f3f 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -1,3 +1,10 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = \
+ $(top_builddir)/mail/libevolution-mail.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(GNOME_PLATFORM_LIBS)
+endif
+
INCLUDES = \
-I$(top_srcdir) \
$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
@@ -11,8 +18,10 @@ plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la
liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_vcard_inline_la_LIBADD = \
- $(EVOLUTION_ADDRESSBOOK_LIBS)
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(EVOLUTION_MAIL_LIBS) \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(NO_UNDEFINED_REQUIRED_LIBS)
EXTRA_DIST = org-gnome-vcard-inline.eplug.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]