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. --- modules/online-accounts/Makefile.am | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'modules/online-accounts') diff --git a/modules/online-accounts/Makefile.am b/modules/online-accounts/Makefile.am index a5dfd97a0b..ccb7ada29a 100644 --- a/modules/online-accounts/Makefile.am +++ b/modules/online-accounts/Makefile.am @@ -4,10 +4,8 @@ libevolution_module_online_accounts_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-online-accounts\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(GOA_CFLAGS) libevolution_module_online_accounts_la_SOURCES = \ @@ -20,10 +18,8 @@ libevolution_module_online_accounts_la_SOURCES = \ libevolution_module_online_accounts_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ $(GOA_LIBS) libevolution_module_online_accounts_la_LDFLAGS = \ -- cgit v1.2.3