[evolution-data-server] Fix a compilation issue and warnings

[Chenthill Palanisamy <pchen src gnome org>]

commit bad59723d163b371f1ee18535edf93cdcad2d8f2
Author: Chenthill Palanisamy <pchenthill novell com>
Date:   Tue Sep 7 10:50:26 2010 +0530

    Fix a compilation issue and warnings

 calendar/backends/file/Makefile.am        |    2 +-
 calendar/libedata-cal/Makefile.am         |  100 ++++++++++++++--------------
 calendar/libedata-cal/test-intervaltree.c |    4 +-
 3 files changed, 54 insertions(+), 52 deletions(-)
---
diff --git a/calendar/backends/file/Makefile.am b/calendar/backends/file/Makefile.am
index 316a070..6d86de2 100644
--- a/calendar/backends/file/Makefile.am
+++ b/calendar/backends/file/Makefile.am
@@ -40,7 +40,7 @@ test_interval_searches_LDADD = \
 	$(top_builddir)/calendar/libecal/libecal-1.2.la				\
 	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la		\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la			\
-	$(top_builddir)/calendar/backends/file/libecalbackendfile.la		\
+	libecalbackendfile.la		\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 test_interval_searches_CPPFLAGS = \
diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
index adbe4b2..f88e24e 100644
--- a/calendar/libedata-cal/Makefile.am
+++ b/calendar/libedata-cal/Makefile.am
@@ -67,56 +67,6 @@ libedata_calinclude_HEADERS = 		\
 %-$(API_VERSION).pc: %.pc
 	 cp $< $@
 
-test_e_sexp_SOURCES = e-cal-backend-sexp.c e-cal-backend-sexp.h
-test_e_sexp_CPPFLAGS = \
-	$(AM_CPPFLAGS)				\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_builddir)/calendar		\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	-DTESTER=1
-
-test_e_sexp_LDADD = libedata-cal-1.2.la $(E_DATA_SERVER_LIBS)
-
-test_intervaltree_SOURCES = test-intervaltree.c e-cal-backend-intervaltree.c
-
-test_intervaltree_CPPFLAGS = \
-	$(AM_CPPFLAGS)				\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_builddir)/calendar		\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-test_intervaltree_LDADD = \
-	$(top_builddir)/calendar/libecal/libecal-1.2.la				\
-	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la		\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la			\
-	$(EVOLUTION_CALENDAR_LIBS)
-
-test_intervaltree_coverage_SOURCES = test-intervaltree.c e-cal-backend-intervaltree.c
-
-test_intervaltree_coverage_CPPFLAGS = \
-	$(AM_CPPFLAGS)				\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_builddir)/calendar		\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-test_intervaltree_coverage_LDADD = \
-	$(top_builddir)/calendar/libecal/libecal-1.2.la				\
-	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la		\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la			\
-	$(EVOLUTION_CALENDAR_LIBS)						\
-	-lgcov
-
-.PHONY: coverage
-coverage: 
-	mkdir -p ./coverage
-	lcov --directory . --zerocounters
-	./test-intervaltree-coverage
-	lcov --directory . --capture --output-file ./coverage/*.info
-	genhtml -o ./coverage --legend --num-spaces 2 ./coverage/*.info
-
-clean-local:
-	rm -f *.gcda *.gcno
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libedata-cal-$(API_VERSION).pc
 
@@ -167,3 +117,53 @@ e_calendar_factory_LDADD =						\
 	$(top_builddir)/libebackend/libebackend-1.2.la
 
 -include $(top_srcdir)/git.mk
+
+test_e_sexp_SOURCES = e-cal-backend-sexp.c e-cal-backend-sexp.h
+test_e_sexp_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
+	-I$(top_srcdir)/calendar		\
+	-I$(top_builddir)/calendar		\
+	$(EVOLUTION_CALENDAR_CFLAGS)		\
+	-DTESTER=1
+
+test_e_sexp_LDADD = libedata-cal-1.2.la $(E_DATA_SERVER_LIBS)
+
+test_intervaltree_SOURCES = test-intervaltree.c e-cal-backend-intervaltree.c
+
+test_intervaltree_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
+	-I$(top_srcdir)/calendar		\
+	-I$(top_builddir)/calendar		\
+	$(EVOLUTION_CALENDAR_CFLAGS)
+
+test_intervaltree_LDADD = \
+	$(top_builddir)/calendar/libecal/libecal-1.2.la				\
+	libedata-cal-1.2.la		\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la			\
+	$(EVOLUTION_CALENDAR_LIBS)
+
+test_intervaltree_coverage_SOURCES = test-intervaltree.c e-cal-backend-intervaltree.c
+
+test_intervaltree_coverage_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
+	-I$(top_srcdir)/calendar		\
+	-I$(top_builddir)/calendar		\
+	$(EVOLUTION_CALENDAR_CFLAGS)
+
+test_intervaltree_coverage_LDADD = \
+	$(top_builddir)/calendar/libecal/libecal-1.2.la				\
+	libedata-cal-1.2.la		\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la			\
+	$(EVOLUTION_CALENDAR_LIBS)						\
+	-lgcov
+
+.PHONY: coverage
+coverage: 
+	mkdir -p ./coverage
+	lcov --directory . --zerocounters
+	./test-intervaltree-coverage
+	lcov --directory . --capture --output-file ./coverage/*.info
+	genhtml -o ./coverage --legend --num-spaces 2 ./coverage/*.info
+
+clean-local:
+	rm -f *.gcda *.gcno
diff --git a/calendar/libedata-cal/test-intervaltree.c b/calendar/libedata-cal/test-intervaltree.c
index 8db8275..5ee7b04 100644
--- a/calendar/libedata-cal/test-intervaltree.c
+++ b/calendar/libedata-cal/test-intervaltree.c
@@ -185,6 +185,7 @@ unref_comp (gpointer data, gpointer user_data)
 	g_free(data);
 }
 
+/* Not used at the moment. Use it later 
 static void
 print_nodes_list (GList *l1)
 {
@@ -210,6 +211,7 @@ print_list (GList *l2)
 		l2 = l2->next;
 	}
 }
+*/
 
 static void
 random_test()
@@ -395,7 +397,7 @@ random_test()
 		/*
 		   g_print ("Results from tree:\n");
 		   print_nodes_list (l1);
-		   */
+		 */
 
 		l2 = search_in_list (list, start, end);