aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/Makefile.am6
2 files changed, 11 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 2022dd4a3a..df037a8105 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-10 Damon Chaplin <damon@helixcode.com>
+
+ * gui/Makefile.am (INCLUDES): moved srcdir directories to the top so
+ we search headers in the evolution tree before installed headers.
+ (Otherwise when you do 'make install' lots of files in gui/ get
+ rebuilt, since they depend on the installed cal-client.h which has just
+ been updated.)
+
2000-04-09 Seth Alves <alves@hungry.com>
* gui/gnome-cal.c (gnome_calendar_load): catch cal_loaded signal
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 9ccfa96672..d51e5a5986 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -8,13 +8,13 @@ help_base = $(datadir)/gnome/help/cal
INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/calendar \
+ -I$(top_srcdir)/libical/src/libical \
-I$(includedir) \
$(BONOBO_VFS_GNOME_CFLAGS) \
$(GNOME_CONDUIT_INCLUDEDIR) \
$(PISOCK_INCLUDEDIR) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/calendar \
- -I$(top_srcdir)/libical/src/libical \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"