From d158af8cdfa6e4bf85c1e74769e8d61bc469494c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 10 Dec 2008 18:30:29 +0000 Subject: Merge revisions 36811:36865 from trunk. svn path=/branches/kill-bonobo/; revision=36867 --- plugins/calendar-weather/Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'plugins/calendar-weather/Makefile.am') diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 8f57db1dcc..2e2be150e3 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -7,7 +7,8 @@ INCLUDES = \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(SOURCE_SEL_CFLAGS) \ -DWEATHER_DATADIR=\""$(weatherdatadir)"\" \ - -DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\" + -DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\" \ + $(LIBGWEATHER_CFLAGS) @EVO_PLUGIN_RULE@ @@ -24,12 +25,12 @@ plugin_DATA = org-gnome-calendar-weather.eplug plugin_LTLIBRARIES = liborg-gnome-calendar-weather.la liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c -liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_calendar_weather_la_LIBADD = \ +liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(LIBGWEATHER_LIBS) +liborg_gnome_calendar_weather_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(EVOLUTION_CALENDAR_LIBS) -EXTRA_DIST = \ +EXTRA_DIST = \ org-gnome-calendar-weather.eplug.xml \ $(weatherdata_DATA) -- cgit v1.2.3 From c22126d54f0cf0637e3d5ddd5d78b3ff5d111582 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 17 Jan 2009 20:06:17 +0000 Subject: Hack GtkIconTheme so we can reference category icons as named icons. Necessary for EActionComboBox, since GtkActions can only handle named or stock icons. Hopefully this is just a temporary hack. Eventually we should make the category icons themeable. Kill the "mail-account-disable" plugin and integrate it properly. More dead plugins to follow... Don't show disabled menu items in pop-up context menus. It does the user no good to see things he CAN'T do with the object he clicked on. svn path=/branches/kill-bonobo/; revision=37093 --- plugins/calendar-weather/Makefile.am | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'plugins/calendar-weather/Makefile.am') diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 2e2be150e3..cb0253e8fe 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -1,5 +1,4 @@ eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2` -weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather INCLUDES = \ -I$(top_srcdir) \ @@ -12,15 +11,6 @@ INCLUDES = \ @EVO_PLUGIN_RULE@ -weatherdata_DATA = \ - category_weather_cloudy_16.png \ - category_weather_fog_16.png \ - category_weather_partly_cloudy_16.png \ - category_weather_rain_16.png \ - category_weather_snow_16.png \ - category_weather_sun_16.png \ - category_weather_tstorm_16.png - plugin_DATA = org-gnome-calendar-weather.eplug plugin_LTLIBRARIES = liborg-gnome-calendar-weather.la -- cgit v1.2.3 From 504642b7984f5fed0db6284e2f4da6b1c9b8d1e0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 May 2009 11:09:30 -0400 Subject: Use Behdad's brilliant git.mk to generate .gitignore files. --- plugins/calendar-weather/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugins/calendar-weather/Makefile.am') diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index cb0253e8fe..4404dedcde 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -26,3 +26,5 @@ EXTRA_DIST = \ BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk -- cgit v1.2.3 From bfc5ba2511dc5fd9f5aa9868946c8860afad81bf Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Jun 2009 18:34:08 -0400 Subject: Fix "make distcheck" errors and other build cleanups. --- plugins/calendar-weather/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/calendar-weather/Makefile.am') diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 4404dedcde..8ba5fdf2cd 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -1,6 +1,6 @@ eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2` -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir)/shell \ $(EVOLUTION_CALENDAR_CFLAGS) \ -- cgit v1.2.3 From e68456f60f37d5d6e18fac95a5a9ddea2e9627fa Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 11 Aug 2009 23:19:03 -0400 Subject: Get the calendar-weather plugin working. --- plugins/calendar-weather/Makefile.am | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/calendar-weather/Makefile.am') diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 0f3daf774b..484adf71e9 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -1,12 +1,12 @@ eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2` -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/shell \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) \ - -DWEATHER_DATADIR=\""$(weatherdatadir)"\" \ - -DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\" \ +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ + $(EVOLUTION_CALENDAR_CFLAGS) \ + $(SOURCE_SEL_CFLAGS) \ + -DWEATHER_DATADIR=\""$(weatherdatadir)"\" \ + -DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\" \ $(LIBGWEATHER_CFLAGS) @EVO_PLUGIN_RULE@ -- cgit v1.2.3