From 1fdd8e2b759b73c8c39d11ac194173cc84a369a6 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 18 Apr 2001 16:12:36 +0000 Subject: Hot builddir != srcdir loving action. svn path=/trunk/; revision=9444 --- calendar/ChangeLog | 9 +++++++++ calendar/cal-client/cal-query.h | 3 ++- calendar/gui/Makefile.am | 2 ++ calendar/gui/dialogs/Makefile.am | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 8b063690a9..40b92f4252 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2001-04-18 Ettore Perazzoli + + * gui/dialogs/Makefile.am (INCLUDES): Add + `-I$(top_srcdir)/calendar/cal-client', + `-I$(top_builddir)/calendar/cal-client'. + * gui/Makefile.am (INCLUDES): Likewise. + + * cal-client/cal-query.h: #include "evolution-calendar.h". + 2001-04-17 Federico Mena Quintero * gui/event-editor.c (init_widgets): Connect to the "changed" diff --git a/calendar/cal-client/cal-query.h b/calendar/cal-client/cal-query.h index 8db6f29f7a..53bc7382da 100644 --- a/calendar/cal-client/cal-query.h +++ b/calendar/cal-client/cal-query.h @@ -24,7 +24,8 @@ #include #include -#include + +#include "evolution-calendar.h" BEGIN_GNOME_DECLS diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 8e30ee2c23..42bbcd51de 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -25,6 +25,8 @@ INCLUDES = \ -I$(top_srcdir)/shell \ -I$(top_srcdir) \ -I$(top_srcdir)/calendar \ + -I$(top_srcdir)/calendar/cal-client \ + -I$(top_builddir)/calendar/cal-client \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \ -I$(top_srcdir)/widgets \ diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index dd9a2b2540..f8331e2d35 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -4,6 +4,8 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"calendar-gui\" \ -I$(top_srcdir) \ -I$(top_srcdir)/calendar \ + -I$(top_srcdir)/calendar/cal-client \ + -I$(top_builddir)/calendar/cal-client \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \ -I$(includedir) \ -- cgit