Make it compile.

svn path=/trunk/; revision=5833

notes/Makefile.am

@@ -1,5 +1,3 @@
-bin_PROGRAMS = evolution-notes
-
 noinst_PROGRAMS = notes-test
 
 INCLUDES = \
@@ -7,6 +5,7 @@ INCLUDES = \
 	-I$(top_srcdir)/shell				\
 	-I$(top_srcdir)/widgets/e-text			\
 	$(BONOBO_HTML_GNOME_CFLAGS)			\
+	$(EXTRA_GNOME_CFLAGS)				\
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
@@ -14,11 +13,6 @@ INCLUDES = \
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
 	-DG_LOG_DOMAIN=\"evolution-notes\"
 
-evolution_notes_SOURCES =		\
-	component-factory.c		\
-	main.c				\
-	notes.c
-
 notes_test_SOURCES = 			\
 	e-bevel-button.c		\
 	e-bevel-button.h		\
@@ -32,11 +26,5 @@ oafdir = $(datadir)/oaf
 oaf_DATA = evolution-notes.oafinfo
 
 notes_test_LDADD =					\
-	$(top_builddir)/widgets/e-text/libetext.a 	\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(BONOBO_HTML_GNOME_LIBS)			
-
-evolution_notes_LDADD = 				\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/shell/libeshell.a		\
-	$(BONOBO_HTML_GNOME_LIBS)			
+	$(BONOBO_HTML_GNOME_LIBS)			\
+	$(EXTRA_GNOME_LIBS)

notes/e-bevel-button.c

@@ -3,7 +3,7 @@
 #include <config.h>
 #include <gtk/gtkbutton.h>
 
-#include "e-util/e-util.h"
+#include <gal/util/e-util.h>
 
 #include "e-bevel-button.h"
 #include "e-bevel-button-util.h"

notes/e-note.c

@@ -4,9 +4,9 @@
 #include <gnome.h>
 #include <gdk/gdkx.h>
 
-#include "e-util/e-canvas.h"
-#include "e-util/e-util.h"
-#include "widgets/e-text/e-text.h"
+#include <gal/widgets/e-canvas.h>
+#include <gal/util/e-util.h>
+#include <gal/e-text/e-text.h>
 
 #include "e-note.h"
 #include "e-bevel-button.h"

notes/test-notes.c

@@ -4,8 +4,8 @@
 #include <gnome.h>
 #include <gdk/gdkx.h>
 
-#include "e-util/e-canvas.h"
-#include "widgets/e-text/e-text.h"
+#include <gal/widgets/e-canvas.h>
+#include <gal/e-text/e-text.h>
 
 #include "e-note.h"