diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-10-24 23:41:14 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-10-24 23:41:14 +0800 |
| commit | 89e5f86d5e4837791b9acbf91bb6e4b4832dabf0 (patch) | |
| tree | 93242d8c4ce1e6700438c5c12b708c8c1c7e1f99 | |
| parent | 0e7e3a04bb404e383580ccd4b915330b1cc8b412 (diff) | |
| download | gsoc2013-evolution-89e5f86d5e4837791b9acbf91bb6e4b4832dabf0.tar gsoc2013-evolution-89e5f86d5e4837791b9acbf91bb6e4b4832dabf0.tar.gz gsoc2013-evolution-89e5f86d5e4837791b9acbf91bb6e4b4832dabf0.tar.bz2 gsoc2013-evolution-89e5f86d5e4837791b9acbf91bb6e4b4832dabf0.tar.lz gsoc2013-evolution-89e5f86d5e4837791b9acbf91bb6e4b4832dabf0.tar.xz gsoc2013-evolution-89e5f86d5e4837791b9acbf91bb6e4b4832dabf0.tar.zst gsoc2013-evolution-89e5f86d5e4837791b9acbf91bb6e4b4832dabf0.zip | |
put back the conditional libpasldap stuff, and make evolution-wombat
* Makefile.am (evolution_wombat_LDADD): put back the conditional
libpasldap stuff, and make evolution-wombat explicitly depend on
the specific backends again; libpas itself cannot depend on the
backends. Use libpcsfile.la for the calendar dependency, and
remove libebook, libcal-util, libedb3util and libeutil, since
they're properly pulled in by libtool now.
svn path=/trunk/; revision=23063
| -rw-r--r-- | wombat/ChangeLog | 9 | ||||
| -rw-r--r-- | wombat/Makefile.am | 15 |
2 files changed, 17 insertions, 7 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog index 9e58d3acba..2bc9653870 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -1,3 +1,12 @@ +2003-10-24 Dan Winship <danw@ximian.com> + + * Makefile.am (evolution_wombat_LDADD): put back the conditional + libpasldap stuff, and make evolution-wombat explicitly depend on + the specific backends again; libpas itself cannot depend on the + backends. Use libpcsfile.la for the calendar dependency, and + remove libebook, libcal-util, libedb3util and libeutil, since + they're properly pulled in by libtool now. + 2003-10-23 Ettore Perazzoli <ettore@ximian.com> * GNOME_Evolution_WombatNOLDAP.server.in.in: Add diff --git a/wombat/Makefile.am b/wombat/Makefile.am index c66f38382c..37e1248ced 100644 --- a/wombat/Makefile.am +++ b/wombat/Makefile.am @@ -43,14 +43,15 @@ evolution_wombat_SOURCES = \ wombat-interface-check.h \ wombat.c +if ENABLE_LDAP +LDAP_BACKEND = $(top_builddir)/addressbook/backend/pas/libpasldap.la +endif + evolution_wombat_LDADD = \ - $(top_builddir)/addressbook/backend/pas/libpas.la \ - $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/calendar/pcs/libpcsfile.a \ - $(top_builddir)/calendar/pcs/libpcs.a \ - $(top_builddir)/calendar/cal-util/libcal-util.la \ - $(top_builddir)/e-util/libedb3util.la \ - $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/addressbook/backend/pas/libpasfile.la \ + $(top_builddir)/addressbook/backend/pas/libpasvcf.la \ + $(LDAP_BACKEND) \ + $(top_builddir)/calendar/pcs/libpcsfile.la \ $(WOMBAT_LIBS) if ENABLE_LDAP |