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. --- widgets/table/Makefile.am | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'widgets/table/Makefile.am') diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am index 0ae1e2b7e9..36af5ec2bf 100644 --- a/widgets/table/Makefile.am +++ b/widgets/table/Makefile.am @@ -7,11 +7,10 @@ libetable_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - $(E_UTIL_CFLAGS) \ - $(E_WIDGETS_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - -DEVOLUTION_UIDIR=\"$(uidir)\" \ - -DG_LOG_DOMAIN=\"e-table\" + -DEVOLUTION_UIDIR=\"$(uidir)\" \ + -DG_LOG_DOMAIN=\"e-table\" libetable_la_SOURCES = \ e-cell.c \ @@ -173,10 +172,9 @@ libetable_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/text/libetext.la \ $(top_builddir)/libgnomecanvas/libgnomecanvas.la \ - $(E_UTIL_LIBS) \ - $(E_WIDGETS_LIBS) \ - $(MATH_LIB) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(MATH_LIB) icons = \ arrow-down.xpm \ -- cgit v1.2.3