10 files changed, 17 insertions, 23 deletions
diff --git a/widgets/e-table/Makefile.am b/widgets/e-table/Makefile.am
index 73bd54ee2c..8f81a8076c 100644
--- a/widgets/e-table/Makefile.am
+++ b/widgets/e-table/Makefile.am
@@ -1,16 +1,11 @@
-
-SUBDIRS =
-	meeting-time-sel
-
 INCLUDES =					\
-	-I$(top_srcdir)/camel			\
-	-I$(top_builddir)/camel			\
-	$(GNOME_INCLUDEDIR)
+	$(GNOME_INCLUDEDIR)			\
+	-I$(top_srcdir)/e-util
 
 noinst_LIBRARIES =				\
-	libevolutionwidgets.a
+	libetable.a
 
-libevolutionwidgets_a_SOURCES = 		\
+libetable_a_SOURCES = 				\
 	e-cell.c				\
 	e-cell.h				\
 	e-cell-checkbox.c			\
@@ -19,8 +14,6 @@ libevolutionwidgets_a_SOURCES = 		\
 	e-cell-text.h				\
 	e-cell-toggle.c				\
 	e-cell-toggle.h				\
-	e-cursors.c				\
-	e-cursors.h				\
 	e-table.c				\
 	e-table.h				\
 	e-table-col.c				\
@@ -51,9 +44,10 @@ table_test_SOURCES = 	\
 	test-cols.c	\
 	table-test.c 
 
-table_test_LDADD =		\
-	$(EXTRA_GNOME_LIBS)	\
-	libevolutionwidgets.a	
+table_test_LDADD =				\
+	$(EXTRA_GNOME_LIBS)			\
+	libetable.a				\
+	$(top_builddir)/e-util/libeutil.a
 
 table_test_LDFLAGS = `gnome-config --libs gdk_pixbuf`
 
diff --git a/widgets/e-table/e-cell-checkbox.c b/widgets/e-table/e-cell-checkbox.c
index 6e4b597abf..d77e1fa4cd 100644
--- a/widgets/e-table/e-cell-checkbox.c
+++ b/widgets/e-table/e-cell-checkbox.c
@@ -14,7 +14,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <libgnomeui/gnome-canvas.h>
 #include "e-cell-checkbox.h"
-#include "e-util.h"
+#include <e-util/e-util.h>
 #include "e-table-item.h"
 
 #include "check-empty.xpm"
diff --git a/widgets/e-table/e-cell-text.c b/widgets/e-table/e-cell-text.c
index 1b2205ba51..9ce8190a14 100644
--- a/widgets/e-table/e-cell-text.c
+++ b/widgets/e-table/e-cell-text.c
@@ -15,7 +15,7 @@
 #include <libgnomeui/gnome-canvas.h>
 #include <stdio.h>
 #include "e-cell-text.h"
-#include "e-util.h"
+#include <e-util/e-util.h>
 #include "e-table-item.h"
 
 #define PARENT_TYPE e_cell_get_type()
diff --git a/widgets/e-table/e-cell-toggle.c b/widgets/e-table/e-cell-toggle.c
index 6ea181ea40..a933a62c49 100644
--- a/widgets/e-table/e-cell-toggle.c
+++ b/widgets/e-table/e-cell-toggle.c
@@ -14,7 +14,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <libgnomeui/gnome-canvas.h>
 #include "e-cell-toggle.h"
-#include "e-util.h"
+#include <e-util/e-util.h>
 #include "e-table-item.h"
 
 #define PARENT_TYPE e_cell_get_type()
diff --git a/widgets/e-table/e-cell.c b/widgets/e-table/e-cell.c
index 0f9297ecba..b5cbc0e850 100644
--- a/widgets/e-table/e-cell.c
+++ b/widgets/e-table/e-cell.c
@@ -8,7 +8,7 @@
  */
 #include <config.h>
 #include "e-cell.h"
-#include "e-util.h"
+#include <e-util/e-util.h>
 
 #define PARENT_TYPE gtk_object_get_type()
 
diff --git a/widgets/e-table/e-table-col.c b/widgets/e-table/e-table-col.c
index 86392a9419..62a451ca4f 100644
--- a/widgets/e-table/e-table-col.c
+++ b/widgets/e-table/e-table-col.c
@@ -10,7 +10,7 @@
 #include <gtk/gtkobject.h>
 #include <gtk/gtksignal.h>
 #include "e-table-col.h"
-#include "e-util.h"
+#include <e-util/e-util.h>
 
 #define PARENT_TYPE (gtk_object_get_type ())
 
diff --git a/widgets/e-table/e-table-group.c b/widgets/e-table/e-table-group.c
index 8765c3b83c..14c7a33f79 100644
--- a/widgets/e-table/e-table-group.c
+++ b/widgets/e-table/e-table-group.c
@@ -12,7 +12,7 @@
 #include "e-table-group.h"
 #include "e-table-item.h"
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "e-util.h"
+#include <e-util/e-util.h>
 
 #define TITLE_HEIGHT         16
 #define GROUP_INDENT         10
diff --git a/widgets/e-table/e-table-sorted.c b/widgets/e-table/e-table-sorted.c
index 6bc55ad9dc..b559b3d87f 100644
--- a/widgets/e-table/e-table-sorted.c
+++ b/widgets/e-table/e-table-sorted.c
@@ -8,7 +8,7 @@
  */
 #include <config.h>
 #include <stdlib.h>
-#include "e-util.h"
+#include <e-util/e-util.h>
 #include "e-table-sorted.h"
 
 #define PARENT_TYPE E_TABLE_SUBSET_TYPE
diff --git a/widgets/e-table/e-table-subset.c b/widgets/e-table/e-table-subset.c
index 88f5c18c85..be4c7ab732 100644
--- a/widgets/e-table/e-table-subset.c
+++ b/widgets/e-table/e-table-subset.c
@@ -9,7 +9,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <gtk/gtksignal.h>
-#include "e-util.h"
+#include <e-util/e-util.h>
 #include "e-table-subset.h"
 
 #define PARENT_TYPE E_TABLE_MODEL_TYPE
diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c
index 01389135bf..730306b374 100644
--- a/widgets/e-table/e-table.c
+++ b/widgets/e-table/e-table.c
@@ -14,8 +14,8 @@
 #include <stdio.h>
 #include <libgnomeui/gnome-canvas.h>
 #include <gtk/gtksignal.h>
+#include <e-util/e-util.h>
 #include "e-table.h"
-#include "e-util.h"
 #include "e-table-header-item.h"
 #include "e-table-subset.h"
 #include "e-table-item.h"