5 files changed, 16 insertions, 6 deletions
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index b3b644b561..12f63005e7 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -15,6 +15,7 @@ INCLUDES =						\
 	-I$(top_srcdir)/widgets/e-table			\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_srcdir)/addressbook/gui/minicard	\
+	-I$(top_srcdir)/addressbook/gui/widgets		\
 	-I$(top_srcdir)/addressbook/contact-editor	\
 	-I$(top_srcdir)/addressbook/backend		\
 	-I$(top_builddir)/addressbook/backend		\
@@ -34,8 +35,6 @@ evolution_addressbook_SOURCES = 	\
 	addressbook-factory.c		\
 	addressbook.c			\
 	addressbook.h			\
-	e-addressbook-model.c		\
-	e-addressbook-model.h		\
 	e-cardlist-model.c		\
 	e-cardlist-model.h		\
 	e-ldap-server-dialog.c          \
@@ -68,12 +67,11 @@ oafdir = $(datadir)/oaf
 oaf_DATA = addressbook.oafinfo
 
 gladedir   = $(datadir)/evolution/glade
-glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h alphabet.glade
+glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h
 
 EXTRA_DIST = 			\
 	$(glade_DATA)		\
-	$(oaf_DATA)		\
-	alphabet.glade.h 
+	$(oaf_DATA)
 
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 9ee83d110f..658da4c04c 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -31,6 +31,7 @@
 #include <e-addressbook-model.h>
 #include <select-names/e-select-names.h>
 #include <select-names/e-select-names-manager.h>
+
 #include "e-contact-editor.h"
 #include "e-contact-save-as.h"
 #include "e-ldap-server-dialog.h"
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 2a11a8fa3e..6116b36b06 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -34,6 +34,7 @@ INCLUDES =						\
 	-I$(top_srcdir)/widgets/e-text			\
 	-I$(top_srcdir)/widgets/e-table			\
 	-I$(top_srcdir)/addressbook/gui/minicard	\
+	-I$(top_srcdir)/addressbook/gui/widgets		\
 	-I$(top_srcdir)/addressbook/contact-editor	\
 	-I$(top_srcdir)/addressbook/backend		\
 	-I$(top_builddir)/addressbook/backend		\
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index 2303f13ad1..7f422082e8 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -24,7 +24,7 @@
 #include "e-select-names.h"
 #include <e-table-simple.h>
 #include <e-cell-text.h>
-#include <addressbook/gui/component/e-addressbook-model.h>
+#include <addressbook/gui/widgets/e-addressbook-model.h>
 #include <addressbook/gui/component/e-cardlist-model.h>
 #include <addressbook/backend/ebook/e-book.h>
 #include "e-select-names-table-model.h"
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 9afcb020ef..2d2cc902d0 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES =						\
 	-I$(top_srcdir)/addressbook/contact-editor	\
 	-I$(top_srcdir)/widgets/e-text			\
 	-I$(top_srcdir)/widgets/e-reflow		\
+	-I$(top_srcdir)/widgets/e-table			\
 	-I$(top_srcdir)/widgets/misc			\
 	$(BONOBO_GNOME_CFLAGS)
 
@@ -13,6 +14,8 @@ noinst_LIBRARIES =				\
 	libeminicard.a
 
 libeminicard_a_SOURCES =			\
+	e-addressbook-model.c			\
+	e-addressbook-model.h			\
 	e-minicard-control.c			\
 	e-minicard-control.h			\
 	e-minicard-label.c			\
@@ -120,3 +123,10 @@ minicard_widget_test_LDADD =				\
 	$(top_builddir)/widgets/e-reflow/libereflow.a 			\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/widgets/e-text/libetext.a
+
+gladedir   = $(datadir)/evolution/glade
+glade_DATA = alphabet.glade 
+
+EXTRA_DIST = 			\
+	$(glade_DATA)		\
+	alphabet.glade.h