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 --- tools/Makefile.am | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) (limited to 'tools') diff --git a/tools/Makefile.am b/tools/Makefile.am index 347e45f454..143790f87d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -10,30 +10,26 @@ bin_PROGRAMS = \ noinst_PROGRAMS = evolution-addressbook-abuse -INCLUDES = \ - -DG_LOG_DOMAIN=\"evolution-tools\" \ - $(EXTRA_GNOME_CFLAGS) \ - $(GNOME_INCLUDEDIR) \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(BONOBO_HTML_GNOME_CFLAGS) \ - -DEVOLUTION_BINDIR=\""$(bindir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -I$(top_srcdir)/addressbook +INCLUDES = \ + -DG_LOG_DOMAIN=\"evolution-tools\" \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -DEVOLUTION_BINDIR=\""$(bindir)"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ + -I$(top_srcdir)/addressbook \ + $(GNOME_FULL_CFLAGS) EXTRA_DIST = $(bin_SCRIPTS) verify-evolution-install.sh \ evolution-addressbook-clean.in -evolution_addressbook_import_LDADD = \ - $(EXTRA_GNOME_LIBS) \ - $(BONOBO_HTML_GNOME_LIBS) \ - $(BONOBO_CONF_LIBS) \ - $(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)/libversit/libversit.la \ - $(top_builddir)/e-util/libeutil.la \ +evolution_addressbook_import_LDADD = \ + $(GNOME_FULL_LIBS) \ + $(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)/libversit/libversit.la \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/menus/libmenus.la evolution_addressbook_export_LDADD = \ -- cgit v1.2.3