aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/contact-editor/Makefile.am2
-rw-r--r--addressbook/gui/contact-editor/Makefile.am2
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/cal-client/Makefile.am1
-rw-r--r--calendar/cal-util/Makefile.am1
6 files changed, 17 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 22ebb523a7..988e7f6c85 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-18 <ettore@helixcode.com>
+
+ * contact-editor/Makefile.am (INCLUDES): Use
+ `$(BONOBO_GNOME_CFLAGS)' so that we compile when Bonobo is not in
+ the default GNOME prefix.
+
2000-06-17 Christopher James Lahey <clahey@helixcode.com>
* gui/minicard/e-minicard-label.c,
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am
index 8ad4b7925e..d7729421b1 100644
--- a/addressbook/contact-editor/Makefile.am
+++ b/addressbook/contact-editor/Makefile.am
@@ -3,7 +3,7 @@ CPPFLAGS = \
-DDATADIR=\""$(datadir)"\"
INCLUDES = \
- $(GNOME_INCLUDEDIR) \
+ $(BONOBO_GNOME_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook/ \
-I$(top_srcdir)/addressbook/backend \
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 8ad4b7925e..d7729421b1 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -3,7 +3,7 @@ CPPFLAGS = \
-DDATADIR=\""$(datadir)"\"
INCLUDES = \
- $(GNOME_INCLUDEDIR) \
+ $(BONOBO_GNOME_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook/ \
-I$(top_srcdir)/addressbook/backend \
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8fc5523a33..311222464c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-18 Ettore Perazzoli <ettore@helixcode.com>
+
+ * cal-util/Makefile.am (INCLUDES): Include from
+ `$(top_builddir)/libical/src/libical' too. [For the generated
+ libical `icalversion.h' header.]
+ * cal-client/Makefile.am (INCLUDES): Likewise.
+
2000-06-18 Damon Chaplin <damon@helixcode.com>
* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received):
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index 2384bb0888..9aef9d2fee 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -24,6 +24,7 @@ INCLUDES = \
-I. \
-I.. \
-I$(top_builddir) \
+ -I$(top_builddir)/libical/src/libical \
-I$(top_srcdir)/libical/src/libical \
$(BONOBO_GNOME_CFLAGS)
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index a3a5797d0a..92302f9e1b 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = \
-I.. \
-I$(top_builddir) \
-I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
$(GNOME_INCLUDEDIR)
lib_LTLIBRARIES = libcal-util.la