aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFridrich Strba <fridrich.strba@bluewin.ch>2009-06-04 01:22:16 +0800
committerFridrich Strba <fridrich.strba@bluewin.ch>2009-06-04 01:26:24 +0800
commit3bfe9497a68753c12c6cef695595b9993d3fef21 (patch)
tree4b4f989e7922a55bbd89822e4bfbdfacd47a5168
parent9271d4e8e459608e3cdcc7e0a148f5e6dbba16e7 (diff)
downloadgsoc2013-evolution-3bfe9497a68753c12c6cef695595b9993d3fef21.tar
gsoc2013-evolution-3bfe9497a68753c12c6cef695595b9993d3fef21.tar.gz
gsoc2013-evolution-3bfe9497a68753c12c6cef695595b9993d3fef21.tar.bz2
gsoc2013-evolution-3bfe9497a68753c12c6cef695595b9993d3fef21.tar.lz
gsoc2013-evolution-3bfe9497a68753c12c6cef695595b9993d3fef21.tar.xz
gsoc2013-evolution-3bfe9497a68753c12c6cef695595b9993d3fef21.tar.zst
gsoc2013-evolution-3bfe9497a68753c12c6cef695595b9993d3fef21.zip
Add libraries to LIBADD so that -no-undefined on win32 works well.
-rw-r--r--plugins/audio-inline/Makefile.am10
-rw-r--r--plugins/bbdb/Makefile.am10
-rw-r--r--plugins/vcard-inline/Makefile.am13
3 files changed, 29 insertions, 4 deletions
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index 73e0b988d6..006b39f3c8 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 1bf7604e92..481d465887 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 781eb53bd4..01e1f3f811 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