From 1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 4 Oct 2011 21:32:41 -0400 Subject: Simplify library dependency flags. We have a confusing array of nearly-identical CFLAGS/LIBS definitions in configure.ac. Time to simplify. Instead let's just have one definition that includes all the libraries provided by Evolution-Data-Server (incl. Camel). That, in combination with GNOME_PLATFORM, gives us most of what we need for compliation and linking, and we can sprinkle definitions for additional library dependencies in Makefile.am's as needed. --- addressbook/tools/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addressbook/tools') diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am index 35d742ef3d..26ead07ac5 100644 --- a/addressbook/tools/Makefile.am +++ b/addressbook/tools/Makefile.am @@ -16,7 +16,7 @@ evolution_addressbook_export_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -I$(top_srcdir)/addressbook \ -I$(top_builddir)/addressbook \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) evolution_addressbook_export_SOURCES = \ evolution-addressbook-export.c \ @@ -25,7 +25,7 @@ evolution_addressbook_export_SOURCES = \ evolution-addressbook-export.h evolution_addressbook_export_LDADD = \ - $(EVOLUTION_ADDRESSBOOK_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) if OS_WIN32 evolution_addressbook_export_LDFLAGS = -mwindows -- cgit v1.2.3