4 files changed, 34 insertions, 45 deletions
diff --git a/libcaja-private/Makefile.am b/libcaja-private/Makefile.am
index 5db9c6e1..cbf91983 100644
--- a/libcaja-private/Makefile.am
+++ b/libcaja-private/Makefile.am
@@ -18,6 +18,11 @@ INCLUDES = \
 $(UNIQUE_CFLAGS) \
 $(NULL)
 
+BUILT_SOURCES = \
+ caja-marshal.c \
+ caja-marshal.h \
+ $(NULL)
+
 dependency_static_libs = \
 $(top_builddir)/cut-n-paste-code/libegg/libegg.la \
 $(NULL)
@@ -36,11 +41,6 @@ libcaja_private_la_LIBADD = \
 $(CORE_LIBS) \
 $(NULL)
 
-marshal_sources = \
- caja-marshal.h \
- caja-marshal-guts.c \
- $(NULL)
-
 libcaja_private_la_SOURCES = \
 caja-autorun.c \
 caja-autorun.h \
@@ -125,8 +125,6 @@ libcaja_private_la_SOURCES = \
 caja-lib-self-check-functions.h \
 caja-link.c \
 caja-link.h \
- caja-marshal.c \
- caja-marshal.h \
 caja-merged-directory.c \
 caja-merged-directory.h \
 caja-metadata.h \
@@ -195,14 +193,29 @@ libcaja_private_la_SOURCES = \
 caja-undostack-manager.h \
 $(NULL)
 
+nodist_libcaja_private_la_SOURCES =\
+ $(BUILT_SOURCES) \
+ $(NULL)
+
 $(lib_LTLIBRARIES): $(dependency_static_libs)
 
-caja-marshal.h: caja-marshal.list $(GLIB_GENMARSHAL)
- $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=caja_marshal > $@
-caja-marshal-guts.c: caja-marshal.list $(GLIB_GENMARSHAL)
- $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --body --prefix=caja_marshal > $@
+caja-marshal.list: $(libcaja_private_la_SOURCES) Makefile.am
+ $(AM_V_GEN)( cd $(srcdir) && \
+ sed -n -e 's/.*caja_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
+ $(libcaja_private_la_SOURCES) ) \
+ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > [email protected]
+ @if cmp -s [email protected] $@; then \
+ rm [email protected]; \
+ else \
+ mv [email protected] $@; \
+ fi
+
+%-marshal.h: %-marshal.list Makefile
+ $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h
 
-$(libcaja_private_la_OBJECTS): $(marshal_sources)
+%-marshal.c: %-marshal.list Makefile
+ $(AM_V_GEN)echo "#include \"caja-marshal.h\"" > $@ && \
+ $(GLIB_GENMARSHAL) --body --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.c
 
 gsettingsschema_in_files = org.mate.caja.gschema.xml.in org.mate.media-handling.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
@@ -220,9 +233,10 @@ EXTRA_DIST = \
 $(NULL)
 
 CLEANFILES = \
- $(marshal_sources) \
+ $(BUILT_SOURCES) \
 $(schema_DATA) \
 $(gsettings_SCHEMAS) \
+ caja-marshal.list \
 $(NULL)
 
 dist-hook:
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index b9a7dfc4..eb1eaedb 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -6346,7 +6346,7 @@ caja_icon_container_class_init (CajaIconContainerClass *class)
 G_STRUCT_OFFSET (CajaIconContainerClass,
 get_icon_uri),
 NULL, NULL,
- eel_marshal_STRING__POINTER,
+ caja_marshal_STRING__POINTER,
 G_TYPE_STRING, 1,
 G_TYPE_POINTER);
 signals[GET_ICON_DROP_TARGET_URI]
@@ -6356,7 +6356,7 @@ caja_icon_container_class_init (CajaIconContainerClass *class)
 G_STRUCT_OFFSET (CajaIconContainerClass,
 get_icon_drop_target_uri),
 NULL, NULL,
- eel_marshal_STRING__POINTER,
+ caja_marshal_STRING__POINTER,
 G_TYPE_STRING, 1,
 G_TYPE_POINTER);
 signals[MOVE_COPY_ITEMS]
@@ -6439,7 +6439,7 @@ caja_icon_container_class_init (CajaIconContainerClass *class)
 G_STRUCT_OFFSET (CajaIconContainerClass,
 get_container_uri),
 NULL, NULL,
- eel_marshal_STRING__VOID,
+ caja_marshal_STRING__VOID,
 G_TYPE_STRING, 0);
 signals[CAN_ACCEPT_ITEM]
 = g_signal_new ("can_accept_item",
@@ -6448,7 +6448,7 @@ caja_icon_container_class_init (CajaIconContainerClass *class)
 G_STRUCT_OFFSET (CajaIconContainerClass,
 can_accept_item),
 NULL, NULL,
- eel_marshal_INT__POINTER_STRING,
+ caja_marshal_INT__POINTER_STRING,
 G_TYPE_INT, 2,
 G_TYPE_POINTER,
 G_TYPE_STRING);
@@ -6459,7 +6459,7 @@ caja_icon_container_class_init (CajaIconContainerClass *class)
 G_STRUCT_OFFSET (CajaIconContainerClass,
 get_stored_icon_position),
 NULL, NULL,
- eel_marshal_BOOLEAN__POINTER_POINTER,
+ caja_marshal_BOOLEAN__POINTER_POINTER,
 G_TYPE_BOOLEAN, 2,
 G_TYPE_POINTER,
 G_TYPE_POINTER);
@@ -6470,7 +6470,7 @@ caja_icon_container_class_init (CajaIconContainerClass *class)
 G_STRUCT_OFFSET (CajaIconContainerClass,
 get_stored_layout_timestamp),
 NULL, NULL,
- eel_marshal_BOOLEAN__POINTER_POINTER,
+ caja_marshal_BOOLEAN__POINTER_POINTER,
 G_TYPE_BOOLEAN, 2,
 G_TYPE_POINTER,
 G_TYPE_POINTER);
@@ -6481,7 +6481,7 @@ caja_icon_container_class_init (CajaIconContainerClass *class)
 G_STRUCT_OFFSET (CajaIconContainerClass,
 store_layout_timestamp),
 NULL, NULL,
- eel_marshal_BOOLEAN__POINTER_POINTER,
+ caja_marshal_BOOLEAN__POINTER_POINTER,
 G_TYPE_BOOLEAN, 2,
 G_TYPE_POINTER,
 G_TYPE_POINTER);
diff --git a/libcaja-private/caja-marshal.c b/libcaja-private/caja-marshal.c
deleted file mode 100644
index 59c9ddcc..00000000
--- a/libcaja-private/caja-marshal.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "caja-marshal.h"
-#include "caja-marshal-guts.c"
diff --git a/libcaja-private/caja-marshal.list b/libcaja-private/caja-marshal.list
deleted file mode 100644
index 787dcc52..00000000
--- a/libcaja-private/caja-marshal.list
+++ /dev/null
@@ -1,23 +0,0 @@
-BOOLEAN:POINTER
-BOOLEAN:VOID
-INT:POINTER,BOOLEAN
-INT:POINTER,INT
-INT:POINTER,POINTER
-OBJECT:BOXED
-POINTER:VOID
-STRING:VOID
-VOID:DOUBLE
-VOID:INT,BOOLEAN,BOOLEAN,BOOLEAN,BOOLEAN
-VOID:INT,STRING
-VOID:OBJECT,BOOLEAN
-VOID:OBJECT,OBJECT
-VOID:POINTER,ENUM
-VOID:POINTER,POINTER
-VOID:POINTER,POINTER
-VOID:POINTER,POINTER,POINTER,ENUM,INT,INT
-VOID:POINTER,STRING
-VOID:POINTER,STRING,ENUM,INT,INT
-VOID:STRING,STRING,ENUM,INT,INT
-VOID:STRING,ENUM,INT,INT
-VOID:STRING,STRING
-VOID:POINTER,INT,STRING,STRING,ENUM,INT,INT