aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-09-09 22:16:48 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-09-09 22:16:48 +0800
commit2ed44700c8c82cc1aff07404b3058fe50e2e624a (patch)
treebc0bef421301c5ef0d7b3fbb24127b4079518191
parent94aeb35a961f8015d8f522ade32b64a5393ae161 (diff)
downloadgsoc2013-evolution-2ed44700c8c82cc1aff07404b3058fe50e2e624a.tar
gsoc2013-evolution-2ed44700c8c82cc1aff07404b3058fe50e2e624a.tar.gz
gsoc2013-evolution-2ed44700c8c82cc1aff07404b3058fe50e2e624a.tar.bz2
gsoc2013-evolution-2ed44700c8c82cc1aff07404b3058fe50e2e624a.tar.lz
gsoc2013-evolution-2ed44700c8c82cc1aff07404b3058fe50e2e624a.tar.xz
gsoc2013-evolution-2ed44700c8c82cc1aff07404b3058fe50e2e624a.tar.zst
gsoc2013-evolution-2ed44700c8c82cc1aff07404b3058fe50e2e624a.zip
Fix the calendar Makefiles so that they #include the `icalversion.h'
from the build directory (instead of using the installed version) when compiling with `builddir != srcdir'. This way the calendar doesn't get rebuilt from scratch all the time after a `make install'. svn path=/trunk/; revision=5283
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/Makefile.am1
-rw-r--r--calendar/gui/dialogs/Makefile.am1
3 files changed, 10 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index cd4612f212..524d25cdfb 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2000-09-09 Ettore Perazzoli <ettore@helixcode.com>
+
+ * gui/dialogs/Makefile.am (INCLUDES): Add
+ `-I$(top_builddir)/libical/src/libical' so that we get
+ `icalversion.h' from the build directory instead of taking it from
+ the installation directory, which is of course Wrong (tm).
+ * gui/Makefile.am (INCLUDES): Likewise.
+
2000-09-08 Federico Mena Quintero <federico@helixcode.com>
* gui/gnome-cal.c (cal_loaded_cb): New function with the
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index ac072c0b0c..7de9313589 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -14,6 +14,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/calendar \
-I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
-I$(top_srcdir)/widgets \
-I$(includedir) \
$(BONOBO_VFS_GNOME_CFLAGS) \
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 227cb5aa07..98646769c1 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -5,6 +5,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/calendar \
-I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
-I$(includedir) \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
$(BONOBO_VFS_GNOME_CFLAGS) \