From 665105ab1052fe36ddc742747ff541fdfdae49a5 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 28 Sep 2005 08:55:59 +0000 Subject: Drop unused SOCKET_LIBS leftover. Don't check for OpenLDAP on Win32. Set 2005-09-28 Tor Lillqvist * configure.in: Drop unused SOCKET_LIBS leftover. Don't check for OpenLDAP on Win32. Set corresponding variables unconditionally on Win32, as LDAP support is always present (in and -lwldap32). (CAMEL_EXCHANGE): Add more stuff to CAMEL_EXCHANGE_CFLAGS and _LIBS. These are used only in plugins/exchange-operations/Makefile.am, and now it's enough to use only that CAMEL_EXCHANGE_CFLAGS and _LIBS there. In plugins/exchange-operations: 2005-09-28 Tor Lillqvist * Makefile.am (INCLUDES, LIBADD): Use just CAMEL_EXCHANGE_CFLAGS and _LIBS, they now includes all necessary (see top-level ChangeLog). (LDFLAGS): Use NO_UNDEFINED. svn path=/trunk/; revision=30388 --- plugins/exchange-operations/ChangeLog | 7 +++++++ plugins/exchange-operations/Makefile.am | 13 ++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'plugins/exchange-operations') diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index ee216d2820..5f1376e4fb 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,10 @@ +2005-09-28 Tor Lillqvist + + * Makefile.am (INCLUDES, LIBADD): Use just CAMEL_EXCHANGE_CFLAGS + and _LIBS, they now includes all necessary (see top-level + ChangeLog). + (LDFLAGS): Use NO_UNDEFINED. + 2005-09-22 Praveen Kumar ** Fixes bug 312849 diff --git a/plugins/exchange-operations/Makefile.am b/plugins/exchange-operations/Makefile.am index 896eaf2d9b..8d57a5c1fd 100644 --- a/plugins/exchange-operations/Makefile.am +++ b/plugins/exchange-operations/Makefile.am @@ -2,11 +2,7 @@ INCLUDES = -I . \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/calendar \ - $(EVOLUTION_MAIL_CFLAGS) \ $(CAMEL_EXCHANGE_CFLAGS) \ - $(CAMEL_CFLAGS) \ - $(LDAP_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DCONNECTOR_GLADEDIR=\""$(gladedir)"\" @@ -47,16 +43,15 @@ liborg_gnome_exchange_operations_la_SOURCES = \ exchange-folder-subscription.h \ exchange-folder.c -liborg_gnome_exchange_operations_la_LIBADD = \ - $(EVOLUTION_MAIL_LIBS) \ - $(CAMEL_EXCHANGE_LIBS) \ +liborg_gnome_exchange_operations_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la + $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \ + $(CAMEL_EXCHANGE_LIBS) -liborg_gnome_exchange_operations_la_LDFLAGS = -module -avoid-version +liborg_gnome_exchange_operations_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) glade_DATA = \ exchange-change-password.glade \ -- cgit v1.2.3