[evolution] Remove EVO_MARSHAL_RULE.

[Matthew Barnes <mbarnes src gnome org>]

commit fc1a6b4088eebe2d9e6d923e73f4706062c06094
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Oct 23 00:32:34 2010 -0400

    Remove EVO_MARSHAL_RULE.
    
    Use glib-gen.mak instead.

 configure.ac               |    4 ----
 libgnomecanvas/Makefile.am |    5 +++--
 marshal.mk                 |    7 -------
 3 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 133161e..aef2f5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1112,10 +1112,6 @@ dnl GObject marshalling
 dnl *******************
 AM_PATH_GLIB_2_0
 
-dnl We use AC_SUBST_FILE because AC_SUBST won't deal with newlines
-EVO_MARSHAL_RULE=$srcdir/marshal.mk
-AC_SUBST_FILE(EVO_MARSHAL_RULE)
-
 dnl *****************************************************************
 dnl Utility macro to set compiler flags for a specific lib.
 dnl EVO_SET_COMPILE_FLAGS(VAR-PREFIX, DEPS, EXTRA-CFLAGS, EXTRA-LIBS)
diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am
index b1e5637..e0719ec 100644
--- a/libgnomecanvas/Makefile.am
+++ b/libgnomecanvas/Makefile.am
@@ -65,12 +65,13 @@ libgnomecanvas_la_SOURCES =			\
 	gnome-canvas.c				\
 	libgnomecanvastypes.c
 
+include $(top_srcdir)/glib-gen.mak
+glib_enum_prefix=gnome_canvas
+
 MARSHAL_GENERATED =				\
 	gnome-canvas-marshal.c			\
 	gnome-canvas-marshal.h
 
- EVO_MARSHAL_RULE@
-
 libgnomecanvas_la_LIBADD = \
 	$(top_builddir)/libart_lgpl/libart_lgpl.la	\
 	$(GNOME_PLATFORM_LIBS)