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/plugin-manager/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/plugin-manager') diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am index 1e66fb4bd8..f350426b50 100644 --- a/modules/plugin-manager/Makefile.am +++ b/modules/plugin-manager/Makefile.am @@ -5,8 +5,8 @@ libevolution_module_plugin_manager_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-plugin-manager\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(SHELL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libevolution_module_plugin_manager_la_SOURCES = \ evolution-plugin-manager.c @@ -14,8 +14,8 @@ libevolution_module_plugin_manager_la_SOURCES = \ libevolution_module_plugin_manager_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(GNOME_PLATFORM_LIBS) \ - $(SHELL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_plugin_manager_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) -- cgit v1.2.3