aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-10-28 19:47:25 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-10-28 19:47:25 +0800
commit20bd2dbf35f5b62c3ca8e955204cdf4e2ed96a47 (patch)
tree6f7b91f093cc2077c539253847da9b9386cdd82a
parent85cc391f1a403157837f5d9aa8e681f57a32afc0 (diff)
downloadgsoc2013-evolution-20bd2dbf35f5b62c3ca8e955204cdf4e2ed96a47.tar.gz
gsoc2013-evolution-20bd2dbf35f5b62c3ca8e955204cdf4e2ed96a47.tar.zst
gsoc2013-evolution-20bd2dbf35f5b62c3ca8e955204cdf4e2ed96a47.zip
builddir != srcdir fun.
svn path=/trunk/; revision=6247
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/Makefile.am2
-rw-r--r--executive-summary/ChangeLog6
-rw-r--r--executive-summary/component/Makefile.am4
4 files changed, 15 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 1ae2fa7bb3..a0bcbf194e 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27 Ettore Perazzoli <ettore@helixcode.com>
+
+ * Makefile.am ($(IDL_GENERATED)): Get `Composer.idl' from
+ `$(srcdir)' so that it builds with builddir != srcdir.
+
2000-10-27 Jeffrey Stedfast <fejj@helixcode.com>
* e-msg-composer.c (e_msg_composer_new_with_message): Fixed my
diff --git a/composer/Makefile.am b/composer/Makefile.am
index e0208e8a94..cfd50b8cbc 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -14,7 +14,7 @@ selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names
$(IDL_GENERATED): $(IDLS) $(selectnamesdir)/Evolution-Addressbook-SelectNames.idl
$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
- -I $(selectnamesdir) -I . Composer.idl
+ -I $(selectnamesdir) -I . $(srcdir)/Composer.idl
##
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index e6e9b48afc..1f1717db45 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-28 Ettore Perazzoli <ettore@helixcode.com>
+
+ * component/Makefile.am (INCLUDES): Add
+ `-I$(top_builddir)/executive-summary/evolution-services' and
+ `-I$(top_srcdir)/executive-summary/evolution-services'.
+
2000-10-25 Iain Holmes <iain@helixcode.com>
* component/e-summary-url.c (e_summary_url_exec): Execute a program
diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am
index 496d70d2ac..5b3f147dfd 100644
--- a/executive-summary/component/Makefile.am
+++ b/executive-summary/component/Makefile.am
@@ -7,7 +7,9 @@ INCLUDES = \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
-I$(top_builddir)/executive-summary \
- -I$(top_srcdir)/executive-summary/ \
+ -I$(top_srcdir)/executive-summary \
+ -I$(top_builddir)/executive-summary/evolution-services \
+ -I$(top_srcdir)/executive-summary/evolution-services \
$(EXTRA_GNOME_CFLAGS) \
$(GNOME_VFS_CFLAGS) \
$(UNICODE_CFLAGS) \