use EVO_MARSHAL_RULE Likewise Likewise Likewise Likewise Likewise

	* backend/ebook/Makefile.am: use EVO_MARSHAL_RULE
	* backend/pas/Makefile.am: Likewise
	* gui/component/select-names/Makefile.am: Likewise
	* gui/contact-editor/Makefile.am: Likewise
	* gui/contact-list-editor/Makefile.am: Likewise
	* gui/widgets/Makefile.am: Likewise

	* gui/contact-editor/e-contact-editor.c
	(e_contact_editor_class_init):
	s/ece_marshal/e_contact_editor_marshal/

	* gui/contact-list-editor/e-contact-list-editor.c
	(e_contact_list_editor_class_init): Likewise for ecle_marshal

svn path=/trunk/; revision=21913

9 files changed, 28 insertions, 81 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 5dd942495b..d25b269f9f 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,19 @@
 2003-07-23  Dan Winship  <danw@ximian.com>
 
+	* backend/ebook/Makefile.am: use EVO_MARSHAL_RULE
+	* backend/pas/Makefile.am: Likewise
+	* gui/component/select-names/Makefile.am: Likewise
+	* gui/contact-editor/Makefile.am: Likewise
+	* gui/contact-list-editor/Makefile.am: Likewise
+	* gui/widgets/Makefile.am: Likewise
+
+	* gui/contact-editor/e-contact-editor.c
+	(e_contact_editor_class_init):
+	s/ece_marshal/e_contact_editor_marshal/
+
+	* gui/contact-list-editor/e-contact-list-editor.c
+	(e_contact_list_editor_class_init): Likewise for ecle_marshal
+
 	* gui/search/e-addressbook-search-dialog.c
 	(e_addressbook_search_dialog_init): Remove gtk_window_set_policy
 	call since that function is deprecated and it was just setting
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index d79cd7abdc..024240f95a 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -99,19 +99,8 @@ libebookinclude_HEADERS =				\
 libebook_static_la_SOURCES = $(libebook_la_SOURCES)
 libebook_static_la_LDFLAGS = -all-static
 
-# GLib marshalling cruft
-
-e-book-marshal.h: e-book-marshal.list
-	( @GLIB_GENMARSHAL@ --prefix=e_book_marshal e-book-marshal.list --header > e-book-marshal.h.tmp \
-	&& mv e-book-marshal.h.tmp e-book-marshal.h ) \
-	|| ( rm -f e-book-marshal.h.tmp && exit 1 )
-
-e-book-marshal.c: e-book-marshal.h
-	( @GLIB_GENMARSHAL@ --prefix=e_book_marshal e-book-marshal.list --body > e-book-marshal.c.tmp \
-	&& mv e-book-marshal.c.tmp e-book-marshal.c ) \
-	|| ( rm -f e-book-marshal.c.tmp && exit 1 )
-
 MARSHAL_GENERATED = e-book-marshal.c e-book-marshal.h
+@EVO_MARSHAL_RULE@
 
 test_client_SOURCES =					\
 	test-client.c
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index 92115eae19..c618050ca2 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -78,19 +78,8 @@ libpasldap_a_SOURCES =					\
 	$(LDAP_BACKEND_FILES)
 endif
 
-# GLib marshalling cruft
-
-pas-marshal.h: pas-marshal.list
-	( @GLIB_GENMARSHAL@ --prefix=pas_marshal pas-marshal.list --header > pas-marshal.tmp \
-	&& mv pas-marshal.tmp pas-marshal.h ) \
-	|| ( rm -f pas-marshal.tmp && exit 1 )
-
-pas-marshal.c: pas-marshal.h
-	( @GLIB_GENMARSHAL@ --prefix=pas_marshal pas-marshal.list --body > pas-marshal.tmp \
-	&& mv pas-marshal.tmp pas-marshal.c ) \
-	|| ( rm -f pas-marshal.tmp && exit 1 )
-
 MARSHAL_GENERATED = pas-marshal.c pas-marshal.h
+@EVO_MARSHAL_RULE@
 
 BUILT_SOURCES = $(CORBA_SOURCE) $(MARSHAL_GENERATED)
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 72a09715ca..051a168815 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -83,19 +83,8 @@ libeselectnames_la_LIBADD =					\
 #	e-select-names-factory.c
 #	e-select-names-factory.h
 
-# GLib marshalling cruft
-
-e-select-names-marshal.h: e-select-names-marshal.list
-	( @GLIB_GENMARSHAL@ --prefix=e_select_names_marshal e-select-names-marshal.list --header > e-select-names-marshal.tmp \
-	&& mv e-select-names-marshal.tmp e-select-names-marshal.h ) \
-	|| ( rm -f e-select-names-marshal.tmp && exit 1 )
-
-e-select-names-marshal.c: e-select-names-marshal.h
-	( @GLIB_GENMARSHAL@ --prefix=e_select_names_marshal e-select-names-marshal.list --body > e-select-names-marshal.tmp \
-	&& mv e-select-names-marshal.tmp e-select-names-marshal.c ) \
-	|| ( rm -f e-select-names-marshal.tmp && exit 1 )
-
 MARSHAL_GENERATED = e-select-names-marshal.c e-select-names-marshal.h
+@EVO_MARSHAL_RULE@
 
 glade_DATA = select-names.glade
 etspec_DATA = e-select-names.etspec e-select-names-section.etspec
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index c6738099b9..fc3a0a71d0 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -34,19 +34,8 @@ libecontacteditor_la_SOURCES = 			\
 	e-contact-quick-add.c			\
 	e-contact-quick-add.h
 
-# GLib marshalling cruft
-
-e-contact-editor-marshal.h: e-contact-editor-marshal.list
-	( @GLIB_GENMARSHAL@ --prefix=ece_marshal e-contact-editor-marshal.list --header > e-contact-editor-marshal.tmp \
-	&& mv e-contact-editor-marshal.tmp e-contact-editor-marshal.h ) \
-	|| ( rm -f e-contact-editor-marshal.tmp && exit 1 )
-
-e-contact-editor-marshal.c: e-contact-editor-marshal.h
-	( @GLIB_GENMARSHAL@ --prefix=ece_marshal e-contact-editor-marshal.list --body > e-contact-editor-marshal.tmp \
-	&& mv e-contact-editor-marshal.tmp e-contact-editor-marshal.c ) \
-	|| ( rm -f e-contact-editor-marshal.tmp && exit 1 )
-
 MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h
+@EVO_MARSHAL_RULE@
 
 glade_DATA = 				\
 	contact-editor.glade		\
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 28443887f5..2330daf063 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -199,7 +199,7 @@ e_contact_editor_class_init (EContactEditorClass *klass)
 			G_SIGNAL_RUN_FIRST,
 			G_STRUCT_OFFSET (EContactEditorClass, card_added),
 			NULL, NULL,
-			ece_marshal_NONE__INT_OBJECT,
+			e_contact_editor_marshal_NONE__INT_OBJECT,
 			G_TYPE_NONE, 2,
 			G_TYPE_INT, G_TYPE_OBJECT);
 
@@ -209,7 +209,7 @@ e_contact_editor_class_init (EContactEditorClass *klass)
 			G_SIGNAL_RUN_FIRST,
 			G_STRUCT_OFFSET (EContactEditorClass, card_modified),
 			NULL, NULL,
-			ece_marshal_NONE__INT_OBJECT,
+			e_contact_editor_marshal_NONE__INT_OBJECT,
 			G_TYPE_NONE, 2,
 			G_TYPE_INT, G_TYPE_OBJECT);
 
@@ -219,7 +219,7 @@ e_contact_editor_class_init (EContactEditorClass *klass)
 			G_SIGNAL_RUN_FIRST,
 			G_STRUCT_OFFSET (EContactEditorClass, card_deleted),
 			NULL, NULL,
-			ece_marshal_NONE__INT_OBJECT,
+			e_contact_editor_marshal_NONE__INT_OBJECT,
 			G_TYPE_NONE, 2,
 			G_TYPE_INT, G_TYPE_OBJECT);
 
@@ -229,7 +229,7 @@ e_contact_editor_class_init (EContactEditorClass *klass)
 			G_SIGNAL_RUN_FIRST,
 			G_STRUCT_OFFSET (EContactEditorClass, editor_closed),
 			NULL, NULL,
-			ece_marshal_NONE__NONE,
+			e_contact_editor_marshal_NONE__NONE,
 			G_TYPE_NONE, 0);
 }
 
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 82e296f8cf..9cc18f9394 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -29,20 +29,8 @@ libecontactlisteditor_la_SOURCES = 		\
 	e-contact-list-model.c			\
 	e-contact-list-model.h
 
-# GLib marshalling cruft
-
-e-contact-list-editor-marshal.h: e-contact-list-editor-marshal.list
-	( @GLIB_GENMARSHAL@ --prefix=ecle_marshal e-contact-list-editor-marshal.list --header > e-contact-list-editor-marshal.tmp \
-	&& mv e-contact-list-editor-marshal.tmp e-contact-list-editor-marshal.h ) \
-	|| ( rm -f e-contact-list-editor-marshal.tmp && exit 1 )
-
-e-contact-list-editor-marshal.c: e-contact-list-editor-marshal.h
-	( @GLIB_GENMARSHAL@ --prefix=ecle_marshal e-contact-list-editor-marshal.list --body > e-contact-list-editor-marshal.tmp \
-	&& mv e-contact-list-editor-marshal.tmp e-contact-list-editor-marshal.c ) \
-	|| ( rm -f e-contact-list-editor-marshal.tmp && exit 1 )
-
 MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marshal.h
-
+@EVO_MARSHAL_RULE@
 
 glade_DATA  = contact-list-editor.glade
 etspec_DATA = e-contact-list-editor.etspec
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index ab6ea97096..e53ebf6786 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -171,7 +171,7 @@ e_contact_list_editor_class_init (EContactListEditorClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EContactListEditorClass, list_added),
 			      NULL, NULL,
-			      ecle_marshal_NONE__INT_OBJECT,
+			      e_contact_list_editor_marshal_NONE__INT_OBJECT,
 			      G_TYPE_NONE, 2,
 			      G_TYPE_INT, G_TYPE_OBJECT);
 
@@ -181,7 +181,7 @@ e_contact_list_editor_class_init (EContactListEditorClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EContactListEditorClass, list_modified),
 			      NULL, NULL,
-			      ecle_marshal_NONE__INT_OBJECT,
+			      e_contact_list_editor_marshal_NONE__INT_OBJECT,
 			      G_TYPE_NONE, 2,
 			      G_TYPE_INT, G_TYPE_OBJECT);
 
@@ -191,7 +191,7 @@ e_contact_list_editor_class_init (EContactListEditorClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EContactListEditorClass, list_deleted),
 			      NULL, NULL,
-			      ecle_marshal_NONE__INT_OBJECT,
+			      e_contact_list_editor_marshal_NONE__INT_OBJECT,
 			      G_TYPE_NONE, 2,
 			      G_TYPE_INT, G_TYPE_OBJECT);
 
@@ -201,7 +201,7 @@ e_contact_list_editor_class_init (EContactListEditorClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (EContactListEditorClass, editor_closed),
 			      NULL, NULL,
-			      ecle_marshal_NONE__NONE,
+			      e_contact_list_editor_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 }
 
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 0626acee52..2185d10764 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -74,19 +74,8 @@ libeminicard_la_SOURCES =			\
 #			gal-view-treeview.c			\
 #			gal-view-treeview.h
 
-# GLib marshalling cruft
-
-e-addressbook-marshal.h: e-addressbook-marshal.list
-	( @GLIB_GENMARSHAL@ --prefix=e_addressbook_marshal e-addressbook-marshal.list --header > e-addressbook-marshal.tmp \
-	&& mv e-addressbook-marshal.tmp e-addressbook-marshal.h ) \
-	|| ( rm -f e-addressbook-marshal.tmp && exit 1 )
-
-e-addressbook-marshal.c: e-addressbook-marshal.h
-	( @GLIB_GENMARSHAL@ --prefix=e_addressbook_marshal e-addressbook-marshal.list --body > e-addressbook-marshal.tmp \
-	&& mv e-addressbook-marshal.tmp e-addressbook-marshal.c ) \
-	|| ( rm -f e-addressbook-marshal.tmp && exit 1 )
-
 MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h
+@EVO_MARSHAL_RULE@
 
 BUILT_SOURCES = $(CORBA_SOURCE) $(MARSHAL_GENERATED)
 CLEANFILES = $(BUILT_SOURCES)