aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Petter Jansson <hpj@novell.com>2004-12-23 15:02:17 +0800
committerHans Petter <hansp@src.gnome.org>2004-12-23 15:02:17 +0800
commit6d9d18b7ad7e6bf4b4ea1d22f3933db43ad6aeb5 (patch)
tree0ab29a7bd6746dab8f0083718e459734e5cdc372
parent50f85ab17af236a754cd95fd289beb2e1d6e30c9 (diff)
downloadgsoc2013-evolution-6d9d18b7ad7e6bf4b4ea1d22f3933db43ad6aeb5.tar
gsoc2013-evolution-6d9d18b7ad7e6bf4b4ea1d22f3933db43ad6aeb5.tar.gz
gsoc2013-evolution-6d9d18b7ad7e6bf4b4ea1d22f3933db43ad6aeb5.tar.bz2
gsoc2013-evolution-6d9d18b7ad7e6bf4b4ea1d22f3933db43ad6aeb5.tar.lz
gsoc2013-evolution-6d9d18b7ad7e6bf4b4ea1d22f3933db43ad6aeb5.tar.xz
gsoc2013-evolution-6d9d18b7ad7e6bf4b4ea1d22f3933db43ad6aeb5.tar.zst
gsoc2013-evolution-6d9d18b7ad7e6bf4b4ea1d22f3933db43ad6aeb5.zip
Remove select-names from here.
2004-12-23 Hans Petter Jansson <hpj@novell.com> * Makefile.am (selectnamesdir) (IDL_GENERATED) (INCLUDES): Remove select-names from here. * Composer.idl: Remove Evolution-Addressbook-SelectNames.idl include. svn path=/trunk/; revision=28190
-rw-r--r--composer/ChangeLog8
-rw-r--r--composer/Composer.idl1
-rw-r--r--composer/Makefile.am7
3 files changed, 10 insertions, 6 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index a6b931380e..a310f095dc 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-23 Hans Petter Jansson <hpj@novell.com>
+
+ * Makefile.am (selectnamesdir)
+ (IDL_GENERATED)
+ (INCLUDES): Remove select-names from here.
+
+ * Composer.idl: Remove Evolution-Addressbook-SelectNames.idl include.
+
2004-12-22 Hans Petter Jansson <hpj@novell.com>
* e-msg-composer-hdrs.c (addressbook_dialog_response)
diff --git a/composer/Composer.idl b/composer/Composer.idl
index a6cb35c037..0f2e47e517 100644
--- a/composer/Composer.idl
+++ b/composer/Composer.idl
@@ -1,4 +1,3 @@
/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <Evolution-Addressbook-SelectNames.idl>
#include <Evolution-Composer.idl>
diff --git a/composer/Makefile.am b/composer/Makefile.am
index aee419abf9..4d536dc95e 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -16,11 +16,9 @@ HTML_EDITOR_GENERATED = \
Editor-skels.c \
Editor-stubs.c
-selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names
-
-$(IDL_GENERATED): $(IDLS) $(selectnamesdir)/Evolution-Addressbook-SelectNames.idl
+$(IDL_GENERATED): $(IDLS)
$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl $(IDL_INCLUDES) \
- -I $(selectnamesdir) $(srcdir)/Composer.idl
+ $(srcdir)/Composer.idl
Editor-commmon.c: $(GTKHTML_DATADIR)/Editor.idl
@@ -53,7 +51,6 @@ INCLUDES = \
-I$(top_builddir)/camel \
-I$(top_srcdir)/addressbook/backend \
-I$(top_builddir)/addressbook/backend \
- -I$(top_builddir)/addressbook/gui/component/select-names \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
-DEVOLUTION_DATADIR=\"$(datadir)\" \