[evolution-data-server/gnome-3-6] Bug 685588 - Remove useless LIBICAL_CFLAGS and LIBICAL_LIBS

[Matthew Barnes <mbarnes src gnome org>]

commit 1a887ff81d522e58274b053eb9fbba5719a2f3a0
Author: Peter Hurley <peter hurleysoftware com>
Date:   Fri Oct 5 19:15:28 2012 -0400

    Bug 685588 - Remove useless LIBICAL_CFLAGS and LIBICAL_LIBS
    
    These variables are no longer defined by configure.ac but they're still
    hanging around in a few Makefile.am files.
    
    (cherry picked from commit 189fc5d38ae5d96acf40194e923a70c7274e35c0)

 calendar/libecal/Makefile.am                     |    6 ++----
 calendar/libedata-cal/Makefile.am                |    2 --
 docs/reference/calendar/libecal/Makefile.am      |    1 -
 docs/reference/calendar/libedata-cal/Makefile.am |    1 -
 tests/libecal/Makefile.am                        |    4 ----
 5 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index 6a8548f..10fa228 100644
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -29,7 +29,6 @@ libecal_1_2_la_CPPFLAGS =			\
 	$(libecal_INCLUDES)			\
 	-DLIBECAL_COMPILATION			\
 	-DG_LOG_DOMAIN=\"libecal\"		\
-	$(LIBICAL_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	$(CAMEL_CFLAGS)				\
 	$(CODE_COVERAGE_CFLAGS)			\
@@ -55,7 +54,6 @@ libecal_1_2_la_SOURCES =			\
 libecal_1_2_la_LIBADD = 					\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la 	\
 	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la	\
-	$(LIBICAL_LIBS)						\
 	$(EVOLUTION_CALENDAR_LIBS)				\
 	$(CAMEL_LIBS)
 
@@ -104,8 +102,8 @@ introspection_sources = \
 
 ECalendar-1.2.gir: libecal-1.2.la
 ECalendar_1_2_gir_INCLUDES = GObject-2.0 EDataServer-1.2 GLib-2.0
-ECalendar_1_2_gir_CFLAGS = $(libecal_INCLUDES) -DLIBECAL_COMPILATION $(LIBICAL_CFLAGS) $(EVOLUTION_CALENDAR_CFLAGS) $(CAMEL_CFLAGS)
-ECalendar_1_2_gir_LIBS = libecal-1.2.la $(top_builddir)/calendar/libegdbus/libegdbus-cal.la $(top_builddir)/libedataserver/libedataserver-1.2.la $(top_builddir)/camel/libcamel-1.2.la $(LIBICAL_LIBS)
+ECalendar_1_2_gir_CFLAGS = $(libecal_INCLUDES) -DLIBECAL_COMPILATION $(EVOLUTION_CALENDAR_CFLAGS) $(CAMEL_CFLAGS)
+ECalendar_1_2_gir_LIBS = libecal-1.2.la $(top_builddir)/calendar/libegdbus/libegdbus-cal.la $(top_builddir)/libedataserver/libedataserver-1.2.la $(top_builddir)/camel/libcamel-1.2.la
 ECalendar_1_2_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += ECalendar-1.2.gir
 
diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
index ed57304..b26ebb7 100644
--- a/calendar/libedata-cal/Makefile.am
+++ b/calendar/libedata-cal/Makefile.am
@@ -11,7 +11,6 @@ libedata_cal_1_2_la_CPPFLAGS = 			\
 	-I$(top_srcdir)/calendar/libegdbus	\
 	-I$(top_builddir)			\
 	-I$(top_builddir)/calendar		\
-	$(LIBICAL_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	$(CAMEL_CFLAGS)				\
 	$(CODE_COVERAGE_CFLAGS)			\
@@ -36,7 +35,6 @@ libedata_cal_1_2_la_LIBADD =					\
 	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la 	\
 	$(top_builddir)/libebackend/libebackend-1.2.la 		\
-	$(LIBICAL_LIBS)						\
 	$(EVOLUTION_CALENDAR_LIBS)				\
 	$(CAMEL_LIBS)
 
diff --git a/docs/reference/calendar/libecal/Makefile.am b/docs/reference/calendar/libecal/Makefile.am
index 22a0530..7592d39 100644
--- a/docs/reference/calendar/libecal/Makefile.am
+++ b/docs/reference/calendar/libecal/Makefile.am
@@ -27,7 +27,6 @@ GTKDOC_CFLAGS = \
 	-I$(top_builddir)					\
 	-I$(top_builddir)/calendar				\
 	-I$(top_builddir)/calendar/libecal			\
-	$(LIBICAL_CFLAGS)					\
 	$(EVOLUTION_CALENDAR_CFLAGS)				\
 	$(CAMEL_CFLAGS)
 
diff --git a/docs/reference/calendar/libedata-cal/Makefile.am b/docs/reference/calendar/libedata-cal/Makefile.am
index e792ba5..97acb95 100644
--- a/docs/reference/calendar/libedata-cal/Makefile.am
+++ b/docs/reference/calendar/libedata-cal/Makefile.am
@@ -30,7 +30,6 @@ GTKDOC_CFLAGS = \
 	-I$(top_srcdir)/calendar			\
 	-I$(top_builddir)				\
 	-I$(top_builddir)/calendar			\
-	$(LIBICAL_CFLAGS)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(CAMEL_CFLAGS)
 
diff --git a/tests/libecal/Makefile.am b/tests/libecal/Makefile.am
index c69d825..584e0e9 100644
--- a/tests/libecal/Makefile.am
+++ b/tests/libecal/Makefile.am
@@ -12,7 +12,6 @@ libecal_test_utils_la_CPPFLAGS = \
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_builddir)/calendar			\
-	$(LIBICAL_CFLAGS)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)                    \
 	$(CAMEL_CFLAGS)					\
 	$(NULL)
@@ -122,7 +121,6 @@ test_ecal_INCLUDES =			\
 test_ecal_LDADD =							\
 	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(LIBICAL_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 test_recur_SOURCES = test-recur.c
@@ -133,7 +131,6 @@ test_recur_INCLUDES =			\
 test_recur_LDADD =							\
 	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(LIBICAL_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 test_search_SOURCES = test-search.c
@@ -144,7 +141,6 @@ test_search_INCLUDES =			\
 test_search_LDADD =							\
 	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(LIBICAL_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 endif