diff options
Diffstat (limited to 'wombat')
| -rw-r--r-- | wombat/ChangeLog | 4 | ||||
| -rw-r--r-- | wombat/Makefile.am | 35 |
2 files changed, 19 insertions, 20 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog index 1b735d4820..9e6069a254 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -1,3 +1,7 @@ +2002-01-27 Ettore Perazzoli <ettore@ximian.com> + + * Makefile.am: Use WOMBAT_LIBS and WOMBAT_CFLAGS. + 2001-10-29 Damon Chaplin <damon@ximian.com> * Makefile.am (wombat_LDADD): use libical-evolution.la diff --git a/wombat/Makefile.am b/wombat/Makefile.am index d92dacadb4..68017e81eb 100644 --- a/wombat/Makefile.am +++ b/wombat/Makefile.am @@ -9,10 +9,9 @@ INCLUDES = \ -I$(top_builddir)/calendar/pcs \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \ - $(GNOME_INCLUDEDIR) \ - $(BONOBO_VFS_GNOME_CFLAGS) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ + $(WOMBAT_CFLAGS) bin_PROGRAMS = \ wombat @@ -24,24 +23,20 @@ wombat_SOURCES = \ wombat-private-moniker.h \ wombat.c -wombat_LDADD = \ - $(top_builddir)/addressbook/backend/pas/libpas.a \ - $(DB3_LDADD) \ - $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/libibex/libibex.la \ - $(top_builddir)/e-util/ename/libename.la \ - $(top_builddir)/calendar/pcs/libpcs.a \ - $(top_builddir)/calendar/cal-util/libcal-util.la \ +wombat_LDADD = \ + $(top_builddir)/addressbook/backend/pas/libpas.a \ + $(top_builddir)/addressbook/backend/ebook/libebook.la \ + $(top_builddir)/camel/libcamel.la \ + $(top_builddir)/libibex/libibex.la \ + $(top_builddir)/e-util/ename/libename.la \ + $(top_builddir)/calendar/pcs/libpcs.a \ + $(top_builddir)/calendar/cal-util/libcal-util.la \ $(top_builddir)/libical/src/libical/libical-evolution.la \ - $(top_builddir)/libversit/libversit.la \ - $(top_builddir)/e-util/libedb3util.la \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/libwombat/libwombat.la \ - $(BONOBO_CONF_LIBS) \ - $(LDAP_LIBS) \ - $(EXTRA_GNOME_LIBS) \ - $(BONOBO_VFS_GNOME_LIBS) + $(top_builddir)/libversit/libversit.la \ + $(top_builddir)/e-util/libedb3util.la \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/libwombat/libwombat.la \ + $(WOMBAT_LIBS) oafdir = $(datadir)/oaf |