From dfc28aa9cefad63fb0fc926ce725f7cad8125cb0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 16 Dec 2010 14:03:25 -0500 Subject: Drop support for gtk+-2.0. --- plugins/calendar-weather/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/calendar-weather/Makefile.am') diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 96f1fd2da7..5cc4b8cd07 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -14,7 +14,7 @@ liborg_gnome_calendar_weather_la_CPPFLAGS = \ $(SOURCE_SEL_CFLAGS) \ -DWEATHER_DATADIR=\""$(weatherdatadir)"\" \ -DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\" \ - $(LIBGWEATHER_CFLAGS) + $(GWEATHER_CFLAGS) liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) @@ -22,7 +22,7 @@ liborg_gnome_calendar_weather_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_CALENDAR_LIBS) \ - $(LIBGWEATHER_LIBS) \ + $(GWEATHER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = \ -- cgit v1.2.3 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. --- plugins/calendar-weather/Makefile.am | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'plugins/calendar-weather/Makefile.am') diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 5cc4b8cd07..4283318ffb 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -9,11 +9,10 @@ liborg_gnome_calendar_weather_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) \ -DWEATHER_DATADIR=\""$(weatherdatadir)"\" \ -DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ $(GWEATHER_CFLAGS) liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c @@ -21,9 +20,9 @@ liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED liborg_gnome_calendar_weather_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(GWEATHER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GWEATHER_LIBS) EXTRA_DIST = \ org-gnome-calendar-weather.eplug.xml \ -- cgit v1.2.3