aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Williams <peterw@ximian.com>2001-07-02 22:39:10 +0800
committerPeter Williams <peterw@src.gnome.org>2001-07-02 22:39:10 +0800
commit55938df2d4948d9581adf7ef660b01fbc6482f4e (patch)
tree247cd16bc6918c7f45b4551e31f6e10fee498006
parentf9509b4cf4ce25e5c393f3a23c2b35b0fdf111b1 (diff)
downloadgsoc2013-evolution-55938df2d4948d9581adf7ef660b01fbc6482f4e.tar.gz
gsoc2013-evolution-55938df2d4948d9581adf7ef660b01fbc6482f4e.tar.zst
gsoc2013-evolution-55938df2d4948d9581adf7ef660b01fbc6482f4e.zip
srcdir != builddir compile fix.
2001-07-02 Peter Williams <peterw@ximian.com> * gui/contact-editor/Makefile.am (INCLUDES): srcdir != builddir compile fix. * gui/contact-list-editor/Makefile.am (INCLUDES): Same. * gui/widgets/Makefile.am (INCLUDES): Same. * gui/search/Makefile.am (INCLUDES): Same. svn path=/trunk/; revision=10680
-rw-r--r--addressbook/ChangeLog11
-rw-r--r--addressbook/gui/contact-editor/Makefile.am1
-rw-r--r--addressbook/gui/contact-list-editor/Makefile.am1
-rw-r--r--addressbook/gui/search/Makefile.am1
-rw-r--r--addressbook/gui/widgets/Makefile.am1
5 files changed, 15 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 474feef89d..5121ed4429 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,14 @@
+2001-07-02 Peter Williams <peterw@ximian.com>
+
+ * gui/contact-editor/Makefile.am (INCLUDES): srcdir !=
+ builddir compile fix.
+
+ * gui/contact-list-editor/Makefile.am (INCLUDES): Same.
+
+ * gui/widgets/Makefile.am (INCLUDES): Same.
+
+ * gui/search/Makefile.am (INCLUDES): Same.
+
2001-07-02 Christopher James Lahey <clahey@ximian.com>
* gui/contact-editor/e-contact-editor.c (categories_clicked):
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 6d3567b2f7..cfdebf408a 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES = \
-I$(top_srcdir)/addressbook/backend \
-I$(top_srcdir)/addressbook/gui/merging \
-I$(top_srcdir)/widgets/e-table \
+ -I$(top_builddir)/shell \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index fb16b8e6e7..1164f2c594 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES = \
-I$(top_srcdir)/addressbook/backend \
-I$(top_srcdir)/addressbook/gui/merging \
-I$(top_srcdir)/addressbook/gui/contact-editor \
+ -I$(top_builddir)/shell \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
index d932aaac77..d5f3602bbb 100644
--- a/addressbook/gui/search/Makefile.am
+++ b/addressbook/gui/search/Makefile.am
@@ -11,6 +11,7 @@ INCLUDES = \
-I$(top_srcdir)/addressbook/contact-editor \
-I$(top_srcdir)/widgets/e-text \
-I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/shell \
-DSEARCH_RULE_DIR=\"$(ruledir)\" \
$(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS)
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index dc84125c39..f031b284e5 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -8,6 +8,7 @@ INCLUDES = \
-I$(top_srcdir)/addressbook/gui/contact-editor \
-I$(top_srcdir)/addressbook/gui/merging \
-I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/shell \
$(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS)