aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/Makefile.am2
2 files changed, 7 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index aa2e14080f..a1aca471b4 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-02 Christopher James Lahey <clahey@ximian.com>
+
+ * Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).
+ (evolution_LDADD): Added $(BONOBO_CONF_LIBS).
+
2001-07-02 Ettore Perazzoli <ettore@ximian.com>
* e-storage-set-view.c (popup_folder_menu): Don't assert that
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 99effbd86c..fc2d32e3e1 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES = -O \
-I$(top_srcdir) \
$(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \
+ $(BONOBO_CONF_CFLAGS) \
-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
@@ -165,6 +166,7 @@ evolution_LDADD = \
$(EXTRA_GNOME_LIBS) \
$(GNOME_PRINT_LIBS) \
$(GTKHTML_LIBS) \
+ $(BONOBO_CONF_LIBS) \
$(BONOBO_GNOME_LIBS)
# Test component