[nautilus] [src] autogenerate marshallers

[Cosimo Cecchi <cosimoc src gnome org>]

commit 608918449f548b0d3ea3e7916c944b077ac43e87
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Aug 20 10:59:17 2010 +0200

    [src] autogenerate marshallers

 src/Makefile.am             |   32 +++++++++++++++++++++++++++++---
 src/nautilus-query-editor.c |    4 ++--
 src/nautilus-window.c       |    6 +++---
 3 files changed, 34 insertions(+), 8 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 807a5d2..6838bb0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,6 +51,11 @@ desktopdir = $(datadir)/gnome/network/
 schemedir = $(datadir)/applications
 scheme_DATA = network-scheme.desktop
 
+BUILT_SOURCES = \
+	nautilus-src-marshal.c \
+	nautilus-src-marshal.h \
+	$(NULL)
+
 nautilus_SOURCES = \
 	nautilus-actions.h			\
 	nautilus-application.c			\
@@ -132,6 +137,28 @@ nautilus_SOURCES = \
 	nautilus-zoom-control.h			\
 	$(NULL)
 
+nodist_nautilus_SOURCES = \
+	$(BUILT_SOURCES) \
+	$(NULL)
+
+nautilus-src-marshal.list: $(nautilus_SOURCES) Makefile.am
+	$(AM_V_GEN)( cd $(srcdir) && \
+	sed -n -e 's/.*nautilus_src_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
+	$(nautilus_SOURCES) ) \
+	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $  tmp
+	@if cmp -s $  tmp $@; then \
+		rm $  tmp; \
+	else \
+		mv $  tmp $@; \
+	fi
+
+%-marshal.c: %-marshal.list Makefile
+	$(AM_V_GEN)echo "#include \"nautilus-src-marshal.h\"" > $@ && \
+	$(GLIB_GENMARSHAL) --body --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.c
+
+%-marshal.h: %-marshal.list Makefile
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h
+
 nautilus_file_management_properties_SOURCES= \
 	nautilus-file-management-properties.c		\
 	nautilus-file-management-properties.h		\
@@ -170,19 +197,18 @@ ui_DATA = 					\
 	$(NULL)
 
 CLEANFILES = \
+	$(BUILT_SOURCES)			\
 	$(desktop_files)			\
 	$(server_DATA)				\
 	$(NULL)
 
 EXTRA_DIST =					\
+	nautilus-src-marshal.list		\
 	$(server_in_files)			\
 	$(ui_DATA)				\
 	check-nautilus				\
 	$(desktop_in_files)			\
 	$(NULL)
 
-BUILT_SOURCES = \
-	$(NULL)
-
 dist-hook:
 	cd $(distdir); rm -f $(CLEANFILES)
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 52f583f..6fc3ebe 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -23,10 +23,10 @@
 
 #include <config.h>
 #include "nautilus-query-editor.h"
+#include "nautilus-src-marshal.h"
 #include "nautilus-window-slot.h"
 
 #include <string.h>
-#include <libnautilus-private/nautilus-marshal.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <eel/eel-gtk-macros.h>
@@ -187,7 +187,7 @@ nautilus_query_editor_class_init (NautilusQueryEditorClass *class)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusQueryEditorClass, changed),
 		              NULL, NULL,
-		              nautilus_marshal_VOID__OBJECT_BOOLEAN,
+		              nautilus_src_marshal_VOID__OBJECT_BOOLEAN,
 		              G_TYPE_NONE, 2, NAUTILUS_TYPE_QUERY, G_TYPE_BOOLEAN);
 
 	signals[CANCEL] =
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 217e76b..9652dc7 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -41,6 +41,7 @@
 #include "nautilus-zoom-control.h"
 #include "nautilus-search-bar.h"
 #include "nautilus-navigation-window-pane.h"
+#include "nautilus-src-marshal.h"
 #include <eel/eel-debug.h>
 #include <eel/eel-marshal.h>
 #include <eel/eel-gtk-macros.h>
@@ -58,7 +59,6 @@
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-horizontal-splitter.h>
 #include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-marshal.h>
 #include <libnautilus-private/nautilus-mime-actions.h>
 #include <libnautilus-private/nautilus-program-choosing.h>
 #include <libnautilus-private/nautilus-view-factory.h>
@@ -2010,7 +2010,7 @@ nautilus_window_class_init (NautilusWindowClass *class)
 			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 			      G_STRUCT_OFFSET (NautilusWindowClass, go_up),
 			      g_signal_accumulator_true_handled, NULL,
-			      eel_marshal_BOOLEAN__BOOLEAN,
+			      nautilus_src_marshal_BOOLEAN__BOOLEAN,
 			      G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN);
 	signals[RELOAD] =
 		g_signal_new ("reload",
@@ -2034,7 +2034,7 @@ nautilus_window_class_init (NautilusWindowClass *class)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      nautilus_marshal_VOID__INT_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN,
+			      nautilus_src_marshal_VOID__INT_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN,
 			      G_TYPE_NONE, 5,
 			      G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
 			      G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);