aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-09-28 16:55:59 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-09-28 16:55:59 +0800
commit665105ab1052fe36ddc742747ff541fdfdae49a5 (patch)
treeb22f156b8d85e6d71ebe1b3160a4ddd99385c831 /plugins
parent4276d74d2713f8b835bc7db8e0e9f92b7e10fdbc (diff)
downloadgsoc2013-evolution-665105ab1052fe36ddc742747ff541fdfdae49a5.tar.gz
gsoc2013-evolution-665105ab1052fe36ddc742747ff541fdfdae49a5.tar.zst
gsoc2013-evolution-665105ab1052fe36ddc742747ff541fdfdae49a5.zip
Drop unused SOCKET_LIBS leftover. Don't check for OpenLDAP on Win32. Set
2005-09-28 Tor Lillqvist <tml@novell.com> * 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 <winldap.h> 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 <tml@novell.com> * 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
Diffstat (limited to 'plugins')
-rw-r--r--plugins/exchange-operations/ChangeLog7
-rw-r--r--plugins/exchange-operations/Makefile.am13
2 files changed, 11 insertions, 9 deletions
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 <tml@novell.com>
+
+ * 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 <kpraveen@novell.com>
** 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 \