From 79a377ddf20574b03d02f93fc85f542455b12744 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sun, 27 Jan 2002 17:21:36 +0000 Subject: Final cleanup for the CFLAGS and LIBS in the Makefiles. svn path=/trunk/; revision=15486 --- wombat/Makefile.am | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) (limited to 'wombat/Makefile.am') 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 -- cgit