Removed e-card-iterator.c, e-card-iterator.h, e-card-list-iterator.c,

2000-07-03  Christopher James Lahey  <clahey@helixcode.com>

	* backend/ebook/Makefile.am: Removed e-card-iterator.c,
	e-card-iterator.h, e-card-list-iterator.c, e-card-list-iterator.h,
	e-card-list.c, e-card-list.h.

	* backend/ebook/e-card-iterator.c,
	backend/ebook/e-card-iterator.h,
	backend/ebook/e-card-list-iterator.c,
	backend/ebook/e-card-list-iterator.h, backend/ebook/e-card-list.c,
	backend/ebook/e-card-list.h: Removed in favor or versions without
	the -card in the e-util directory since these classes are not
	specific to cards at all.

	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
	backend/ebook/e-card.c, backend/ebook/e-card.h,
	backend/ebook/load-pine-addressbook.c, backend/ebook/test-card.c,
	backend/pas/pas-backend-file.c: Changed the references to
	e-card-list.c and friends to e-list.c and friends.

	* contact-editor/e-contact-editor.c: Added #include
	<e-contact-save-as.h> to fix a warning.

	* gui/component/Makefile.am: Moved a number of classes associated
	with the select-names object to the new select-names directory.

	* gui/component/addressbook.c: Changed the reference to
	e-select-names.h.

	* gui/component/e-select-names.c, gui/component/e-select-names.h,
	gui/component/select-names.glade,
	gui/component/select-names.glade.h: Moved these files into
	select-names/.

	* gui/component/select-names/.cvsignore,
	gui/component/select-names/Makefile.am,
	gui/component/select-names/e-select-names-manager.c,
	gui/component/select-names/e-select-names-manager.h,
	gui/component/select-names/e-select-names-model.c,
	gui/component/select-names/e-select-names-model.h,
	gui/component/select-names/e-select-names-table-model.c,
	gui/component/select-names/e-select-names-table-model.h,
	gui/component/select-names/e-select-names-text-model.c,
	gui/component/select-names/e-select-names-text-model.h,
	gui/component/select-names/e-select-names.c,
	gui/component/select-names/e-select-names.h,
	gui/component/select-names/recipient.glade,
	gui/component/select-names/select-names.glade,
	gui/component/select-names/select-names.glade.h: New files for
	select names dialog (e-select-names.c, e-select-names.h,
	select-names.glade, select-names.glade.h and recipient.glade moved
	from gui/component/.)

svn path=/trunk/; revision=3876

1 files changed, 12 insertions, 12 deletions

diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index ade764904b..f4776e3dd1 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS	= select-names
+
 CPPFLAGS =					\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
 
@@ -26,21 +28,20 @@ bin_PROGRAMS =	\
 	evolution-addressbook
 
 evolution_addressbook_SOURCES = 	\
-	e-ldap-server-dialog.c          \
-	e-ldap-server-dialog.h		\
-	e-addressbook-model.c		\
-	e-addressbook-model.h		\
-	e-cardlist-model.c		\
-	e-cardlist-model.h		\
-	e-select-names.c		\
-	e-select-names.h		\
 	addressbook-component.c		\
 	addressbook-component.h		\
 	addressbook-factory.c		\
 	addressbook.c			\
-	addressbook.h
+	addressbook.h			\
+	e-addressbook-model.c		\
+	e-addressbook-model.h		\
+	e-cardlist-model.c		\
+	e-cardlist-model.h		\
+	e-ldap-server-dialog.c          \
+	e-ldap-server-dialog.h
 
 evolution_addressbook_LDADD =						\
+	select-names/libeselectnames.la					\
 	$(top_builddir)/shell/libeshell.a				\
 	$(EXTRA_GNOME_LIBS)						\
 	$(BONOBO_HTML_GNOME_LIBS)					\
@@ -66,14 +67,13 @@ gnorba_DATA = addressbook.gnorba
 endif
 
 gladedir   = $(datadir)/evolution/glade
-glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h alphabet.glade select-names.glade
+glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h alphabet.glade
 
 EXTRA_DIST = 			\
 	$(glade_DATA)		\
 	addressbook.gnorba	\
 	addressbook.oafinfo	\
-	alphabet.glade.h	\
-	select-names.glade.h
+	alphabet.glade.h
 
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@