aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/cal-util
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-10-10 05:08:00 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-10-10 05:08:00 +0800
commit6cccb0c60fca242f9c34f161abede3515986e23e (patch)
tree820141835c6a4129da0f398443c526c9cafee612 /calendar/cal-util
parent9f20d8032c2544a78de0f1f0a3f6de7d14e84256 (diff)
downloadgsoc2013-evolution-6cccb0c60fca242f9c34f161abede3515986e23e.tar.gz
gsoc2013-evolution-6cccb0c60fca242f9c34f161abede3515986e23e.tar.zst
gsoc2013-evolution-6cccb0c60fca242f9c34f161abede3515986e23e.zip
INCLUDE path fixes for changes made to libical build.
2003-10-09 Jeffrey Stedfast <fejj@ximian.com> * cal-client/Makefile.am: INCLUDE path fixes for changes made to libical build. * cal-util/Makefile.am: INCLUDE path fixes for changes made to libical build. * cal-util/*.[c,h]: #include <libical/ical.h> instead of <ical.h> * gui/Makefile.am: INCLUDE path fixes for changes made to libical build. * gui/*.[c,h]: #include <libical/ical.h> instead of <ical.h> * gui/alarm-notify/Makefile.am: INCLUDE path fixes for changes made to libical build. * gui/alarm-notify/config-data.h: #include <libical/ical.h> instead of <ical.h> * gui/dialogs/Makefile.am: INCLUDE path fixes for changes made to libical build. * gui/dialogs/comp-editor-util.c: #include <libical/ical.h> instead of <ical.h> * gui/dialogs/e-delegate-dialog.c: #include <libical/ical.h> instead of <ical.h> * importers/Makefile.am: INCLUDE path fixes for changes made to libical build. * pcs/Makefile.am: INCLUDE path fixes for changes made to libical build. * pcs/cal.c: #include <libical/ical.h> instead of <ical.h> svn path=/trunk/; revision=22845
Diffstat (limited to 'calendar/cal-util')
-rw-r--r--calendar/cal-util/Makefile.am3
-rw-r--r--calendar/cal-util/cal-component.h2
-rw-r--r--calendar/cal-util/cal-util.h2
-rw-r--r--calendar/cal-util/timeutil.c1
-rw-r--r--calendar/cal-util/timeutil.h2
5 files changed, 4 insertions, 6 deletions
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index b7d6715ce0..80eb0dc4f3 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -7,8 +7,7 @@ INCLUDES = \
-I. \
-I.. \
-I$(top_builddir) \
- -I$(top_srcdir)/libical/src/libical \
- -I$(top_builddir)/libical/src/libical \
+ -I$(top_srcdir)/libical/src \
$(EVOLUTION_CALENDAR_CFLAGS)
#
diff --git a/calendar/cal-util/cal-component.h b/calendar/cal-util/cal-component.h
index f363099836..3296c7b31c 100644
--- a/calendar/cal-util/cal-component.h
+++ b/calendar/cal-util/cal-component.h
@@ -25,7 +25,7 @@
#include <glib/gmacros.h>
#include <time.h>
#include <glib-object.h>
-#include <ical.h>
+#include <libical/ical.h>
G_BEGIN_DECLS
diff --git a/calendar/cal-util/cal-util.h b/calendar/cal-util/cal-util.h
index 03d5cd736b..336fabd6b4 100644
--- a/calendar/cal-util/cal-util.h
+++ b/calendar/cal-util/cal-util.h
@@ -22,7 +22,7 @@
#ifndef CAL_UTIL_H
#define CAL_UTIL_H
-#include <ical.h>
+#include <libical/ical.h>
#include <time.h>
#include <glib.h>
#include <cal-util/cal-component.h>
diff --git a/calendar/cal-util/timeutil.c b/calendar/cal-util/timeutil.c
index 75e04611a3..32ba50c4ae 100644
--- a/calendar/cal-util/timeutil.c
+++ b/calendar/cal-util/timeutil.c
@@ -10,7 +10,6 @@
#include <string.h>
#include <ctype.h>
#include <glib.h>
-#include <ical.h>
#include "timeutil.h"
diff --git a/calendar/cal-util/timeutil.h b/calendar/cal-util/timeutil.h
index 77a8f180e1..df5d2db91c 100644
--- a/calendar/cal-util/timeutil.h
+++ b/calendar/cal-util/timeutil.h
@@ -13,7 +13,7 @@
#include <time.h>
-#include <ical.h>
+#include <libical/ical.h>
#include <glib.h>