diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-10-24 23:37:56 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-10-24 23:37:56 +0800 |
| commit | 0e7e3a04bb404e383580ccd4b915330b1cc8b412 (patch) | |
| tree | ec6939752e833eea3c0ed59a22403ed1f6b4ea7a | |
| parent | 8fcca0ed99c346ee7a8a2d35921a288473b76eeb (diff) | |
| download | gsoc2013-evolution-0e7e3a04bb404e383580ccd4b915330b1cc8b412.tar gsoc2013-evolution-0e7e3a04bb404e383580ccd4b915330b1cc8b412.tar.gz gsoc2013-evolution-0e7e3a04bb404e383580ccd4b915330b1cc8b412.tar.bz2 gsoc2013-evolution-0e7e3a04bb404e383580ccd4b915330b1cc8b412.tar.lz gsoc2013-evolution-0e7e3a04bb404e383580ccd4b915330b1cc8b412.tar.xz gsoc2013-evolution-0e7e3a04bb404e383580ccd4b915330b1cc8b412.tar.zst gsoc2013-evolution-0e7e3a04bb404e383580ccd4b915330b1cc8b412.zip | |
libpas should depend on libebook, but NOT on libpasfile, etc, since it
* backend/pas/Makefile.am (libpas_la_LIBADD): libpas should depend
on libebook, but NOT on libpasfile, etc, since it needs to be
linked into all backends, not just the wombat.
(libpasfile_la_LIBADD): depend on libpas.la and libedb3util.la
(libpasvcf_la_LIBADD): depend on libpas.la
(libpasldap_la_LIBADD): depend on libpas.la and $(LDAP_LIBS)
svn path=/trunk/; revision=23062
| -rw-r--r-- | addressbook/ChangeLog | 20 | ||||
| -rw-r--r-- | addressbook/backend/pas/Makefile.am | 16 |
2 files changed, 34 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index bfa617f432..b939e5a41d 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,23 @@ +2003-10-24 Dan Winship <danw@ximian.com> + + * backend/pas/Makefile.am (libpas_la_LIBADD): libpas should depend + on libebook, but NOT on libpasfile, etc, since it needs to be + linked into all backends, not just the wombat. + (libpasfile_la_LIBADD): depend on libpas.la and libedb3util.la + (libpasvcf_la_LIBADD): depend on libpas.la + (libpasldap_la_LIBADD): depend on libpas.la and $(LDAP_LIBS) + +2003-10-23 Dan Winship <danw@ximian.com> + + * backend/ebook/e-contact.c (e_contact_date_equal): new util func + + * backend/pas/pas-backend-ldap.c (anniversary_compare, + birthday_compare): Use it + + * backend/pas/pas-backend-summary.c + (pas_backend_summary_check_contact): Check if an ID exists in the + summary. + 2003-10-23 Chris Toshok <toshok@ximian.com> * tools/Makefile.am: convert 8 spaces to a tab. diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am index 6217456006..269bb8656f 100644 --- a/addressbook/backend/pas/Makefile.am +++ b/addressbook/backend/pas/Makefile.am @@ -70,20 +70,32 @@ libpas_la_SOURCES = \ pas-marshal.c \ ximian-vcard.h +libpas_la_LIBADD = \ + $(top_builddir)/addressbook/backend/ebook/libebook.la + libpasfile_la_SOURCES = \ pas-backend-file.c \ pas-backend-file.h +libpasfile_la_LIBADD = \ + libpas.la \ + $(top_builddir)/e-util/libedb3util.la + libpasvcf_la_SOURCES = \ pas-backend-vcf.c \ pas-backend-vcf.h +libpasvcf_la_LIBADD = \ + libpas.la + if ENABLE_LDAP libpasldap_la_SOURCES = \ $(LDAP_BACKEND_FILES) -endif -libpas_la_LIBADD = libpasfile.la libpasvcf.la $(LDAP_BACKEND) $(DB3_LDADD) +libpasldap_la_LIBADD = \ + libpas.la \ + $(LDAP_LIBS) +endif MARSHAL_GENERATED = pas-marshal.c pas-marshal.h @EVO_MARSHAL_RULE@ |