Look for ename in /e-util/ename instead of /addressbook/ename

2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>

	* gui/widgets/Makefile.am:
	* gui/component/Makefile.am:
	* contact-editor/Makefile.am:
	* printing/Makefile.am: Look for ename in /e-util/ename instead of
	/addressbook/ename

	* backend/ebook/e-card.c: Updated to include e-util/ename/*.h

	* ename: Moved to /e-util so it could be shared

	* Makefile.am (SUBDIRS): took out ename

svn path=/trunk/; revision=5578

9 files changed, 30 insertions, 16 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 05862784a4..c8bf71d284 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,17 @@
+2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
+
+	* gui/widgets/Makefile.am:
+	* gui/component/Makefile.am:
+	* contact-editor/Makefile.am:
+	* printing/Makefile.am: Look for ename in /e-util/ename instead of
+	/addressbook/ename
+	
+	* backend/ebook/e-card.c: Updated to include e-util/ename/*.h
+
+	* ename: Moved to /e-util so it could be shared
+
+	* Makefile.am (SUBDIRS): took out ename
+
 2000-09-25  Nat Friedman  <nat@helixcode.com>
 
 	* ename/e-name-western-tables.h: Added a ton of new prefixes and
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 66581af8ed..cc89ee5aeb 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -3,5 +3,5 @@ CONDUIT_SUBDIR=conduit
 endif
 
 SUBDIRS =	\
-	ename backend printing contact-editor gui $(CONDUIT_SUBDIR)
+	backend printing contact-editor gui $(CONDUIT_SUBDIR)
 
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index e3569a8df4..7f4a4c59fe 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -70,7 +70,7 @@ test_client_LDADD =					\
 	$(BONOBO_GNOME_LIBS)				\
 	$(EXTRA_GNOME_LIBS)				\
 	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/addressbook/ename/libename.la	\
+	$(top_builddir)/e-util/ename/libename.la	\
 	$(top_builddir)/e-util/libeutil.la
 
 test_client_list_SOURCES =				\
@@ -80,7 +80,7 @@ test_client_list_LDADD =				\
 	libebook.la					\
 	$(BONOBO_GNOME_LIBS)				\
 	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/addressbook/ename/libename.la	\
+	$(top_builddir)/e-util/ename/libename.la	\
 	$(top_builddir)/libversit/libversit.la		\
 	$(top_builddir)/e-util/libeutil.la
 
@@ -91,7 +91,7 @@ test_card_LDADD =					\
 	libebook.la					\
 	$(BONOBO_GNOME_LIBS)				\
 	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/addressbook/ename/libename.la	\
+	$(top_builddir)/e-util/ename/libename.la	\
 	$(top_builddir)/libversit/libversit.la		\
 	$(top_builddir)/e-util/libeutil.la
 
@@ -103,7 +103,7 @@ load_pine_addressbook_LDADD =				\
 	libebook.la					\
 	$(BONOBO_GNOME_LIBS)				\
 	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/addressbook/ename/libename.la	\
+	$(top_builddir)/e-util/ename/libename.la	\
 	$(top_builddir)/libversit/libversit.la		\
 	$(top_builddir)/e-util/libeutil.la
 
@@ -115,7 +115,7 @@ load_gnomecard_addressbook_LDADD =			\
 	libebook.la					\
 	$(BONOBO_GNOME_LIBS)				\
 	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/addressbook/ename/libename.la	\
+	$(top_builddir)/e-util/ename/libename.la	\
 	$(top_builddir)/libversit/libversit.la		\
 	$(top_builddir)/e-util/libeutil.la
 
diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
index 3ffa8368ed..528465f439 100644
--- a/addressbook/backend/ebook/e-card.c
+++ b/addressbook/backend/ebook/e-card.c
@@ -17,8 +17,8 @@
 #include <libversit/vcc.h>
 #include "e-card.h"
 #include "e-card-pairs.h"
-#include "e-name-western.h"
-#include "e-address-western.h"
+#include <e-util/ename/e-name-western.h>
+#include <e-util/ename/e-address-western.h>
 
 #include <gal/util/e-util.h>
 
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am
index d44ba6a60a..a424cbc55d 100644
--- a/addressbook/contact-editor/Makefile.am
+++ b/addressbook/contact-editor/Makefile.am
@@ -39,7 +39,7 @@ contact_editor_test_LDADD =					\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/addressbook/printing/libecontactprint.a	\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/addressbook/ename/libename.la		\
+	$(top_builddir)/e-util/ename/libename.la		\
 	$(top_builddir)/libversit/libversit.la			\
 	$(GNOMEGNORBA_LIBS)					\
 	$(BONOBO_GNOME_LIBS)				\
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 84c961c0c8..63125a42f2 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -48,7 +48,7 @@ evolution_addressbook_LDADD =						\
 	$(BONOBO_HTML_GNOME_LIBS)					\
 	$(top_builddir)/addressbook/gui/widgets/libeminicard.a		\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/addressbook/ename/libename.la			\
+	$(top_builddir)/e-util/ename/libename.la			\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/libversit/libversit.la				\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index d44ba6a60a..a424cbc55d 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -39,7 +39,7 @@ contact_editor_test_LDADD =					\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/addressbook/printing/libecontactprint.a	\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/addressbook/ename/libename.la		\
+	$(top_builddir)/e-util/ename/libename.la		\
 	$(top_builddir)/libversit/libversit.la			\
 	$(GNOMEGNORBA_LIBS)					\
 	$(BONOBO_GNOME_LIBS)				\
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index f592cf2ab2..c0c4c7d488 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -62,7 +62,7 @@ minicard_test_LDADD =							\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/addressbook/ename/libename.la			\
+	$(top_builddir)/e-util/ename/libename.la			\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/addressbook/printing/libecontactprint.a		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
@@ -79,7 +79,7 @@ reflow_test_LDADD =							\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/addressbook/ename/libename.la			\
+	$(top_builddir)/e-util/ename/libename.la			\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/addressbook/printing/libecontactprint.a		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
@@ -112,7 +112,7 @@ minicard_widget_test_LDADD =						\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/addressbook/ename/libename.la			\
+	$(top_builddir)/e-util/ename/libename.la			\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/addressbook/printing/libecontactprint.a		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 62a401dc5d..959f8ff924 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -47,7 +47,7 @@ contact_print_test_LDADD =	\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/addressbook/ename/libename.la			\
+	$(top_builddir)/e-util/ename/libename.la			\
 	libecontactprint.a	\
 	$(GNOME_PRINT_LIBS) 
 
@@ -60,7 +60,7 @@ contact_print_style_editor_test_LDADD =	\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/addressbook/ename/libename.la			\
+	$(top_builddir)/e-util/ename/libename.la			\
 	libecontactprint.a	\
 	$(GNOME_PRINT_LIBS)