aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-07-23 02:23:59 +0800
committerDan Winship <danw@src.gnome.org>2002-07-23 02:23:59 +0800
commit3112b6942561e0b027133547feb66cdf24dbd945 (patch)
tree9f663c4d3cc901bdd21f77fbac7d8f93589af168
parent4143d8b5a12b0a2ec3a38c7f8f0a6ea6e10d0661 (diff)
downloadgsoc2013-evolution-3112b6942561e0b027133547feb66cdf24dbd945.tar
gsoc2013-evolution-3112b6942561e0b027133547feb66cdf24dbd945.tar.gz
gsoc2013-evolution-3112b6942561e0b027133547feb66cdf24dbd945.tar.bz2
gsoc2013-evolution-3112b6942561e0b027133547feb66cdf24dbd945.tar.lz
gsoc2013-evolution-3112b6942561e0b027133547feb66cdf24dbd945.tar.xz
gsoc2013-evolution-3112b6942561e0b027133547feb66cdf24dbd945.tar.zst
gsoc2013-evolution-3112b6942561e0b027133547feb66cdf24dbd945.zip
Include libpcsfile.a, libpasfile.a and (if ENABLE_LDAP) libpasldap.a
* Makefile.am (wombat_LDADD): Include libpcsfile.a, libpasfile.a and (if ENABLE_LDAP) libpasldap.a svn path=/trunk/; revision=17530
-rw-r--r--wombat/ChangeLog5
-rw-r--r--wombat/Makefile.am12
2 files changed, 15 insertions, 2 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index bc982da15b..efcdb8df3d 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-22 Dan Winship <danw@ximian.com>
+
+ * Makefile.am (wombat_LDADD): Include libpcsfile.a, libpasfile.a
+ and (if ENABLE_LDAP) libpasldap.a
+
2002-07-15 Peter Williams <peterw@ximian.com>
* Makefile.am (EXTRA_DIST): Apparently we can't remove
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index 8a4b6889b2..46438d7f2d 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -23,13 +23,21 @@ wombat_SOURCES = \
wombat-private-moniker.h \
wombat.c
+if ENABLE_LDAP
+LDAP_STUFF = \
+ $(top_builddir)/addressbook/backend/pas/libpasldap.a \
+ $(LDAP_LIBS)
+endif
+
wombat_LDADD = \
- $(top_builddir)/addressbook/backend/pas/libpas.a \
+ $(top_builddir)/addressbook/backend/pas/libpasfile.a \
$(DB3_LDADD) \
- $(LDAP_LIBS) \
+ $(LDAP_STUFF) \
+ $(top_builddir)/addressbook/backend/pas/libpas.a \
$(top_builddir)/addressbook/backend/ebook/libebook.la \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/e-util/ename/libename.la \
+ $(top_builddir)/calendar/pcs/libpcsfile.a \
$(top_builddir)/calendar/pcs/libpcs.a \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/libical/src/libical/libical-evolution.la \