Stop using glib-genmarshal at build time

To help cross compilation, don't use glib-genmarshal in our
build.  This is easy now that we have g_cclosure_marshal_generic().

In gobject/, add gmarshal.[ch] to git (making the existing entry
points stubs).

In gio/, simply switch to using g_cclosure_marshal_generic().

https://bugzilla.gnome.org/show_bug.cgi?id=652168

6 files changed, 533 insertions, 61 deletions

diff --git a/gobject/.gitignore b/gobject/.gitignore
index 89dda70f8..6ecf1fbfe 100644
--- a/gobject/.gitignore
+++ b/gobject/.gitignore
@@ -1,6 +1,5 @@
 glib-genmarshal
 glib-mkenums
-gmarshal.[ch]
 gmarshal.strings
 gobject-query
 testgobject
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 5250548ea..af090d66d 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -6,6 +6,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = . tests
 
+BUILT_SOURCES=
 CLEANFILES=
 
 if HAVE_THREADS
@@ -95,6 +96,7 @@ gobject_public_h_sources = \
 	gboxed.h		\
 	gclosure.h		\
 	genums.h		\
+	gmarshal.h		\
 	gobject.h		\
 	gparam.h		\
 	gparamspecs.h		\
@@ -107,8 +109,7 @@ gobject_public_h_sources = \
 	gvaluearray.h		\
 	gvaluecollector.h	\
 	gvaluetypes.h		\
-	gobjectnotifyqueue.c	\
-	gmarshal.h
+	gobjectnotifyqueue.c
 
 # GObject library header files that don't get installed
 gobject_private_h_sources =     \
@@ -123,6 +124,7 @@ gobject_c_sources = \
 	gboxed.c		\
 	gclosure.c		\
 	genums.c		\
+	gmarshal.c		\
 	gobject.c		\
 	gobject_trace.h		\
 	gparam.c		\
@@ -137,9 +139,6 @@ gobject_c_sources = \
 	gvaluetransform.c	\
 	gvaluetypes.c
 
-# these sources (also mentioned above) are generated.
-BUILT_SOURCES = gmarshal.h gmarshal.c
-
 if ENABLE_DTRACE
 gobject_probes.h: gobject_probes.d Makefile
 	$(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
@@ -200,28 +199,6 @@ CLEANFILES += $(gen_sources)
 # srcdir to be writable, passing --disable-rebuilds to
 # ../configure will supress all autogeneration rules.
 
-if CROSS_COMPILING
-  glib_genmarshal=$(GLIB_GENMARSHAL)
-else
-  glib_genmarshal=./glib-genmarshal
-endif
-
-gmarshal.h: stamp-gmarshal.h
-	@true
-stamp-gmarshal.h: @REBUILD@ gmarshal.list glib-genmarshal$(EXEEXT)
-	$(MAKE) glib-genmarshal$(EXEEXT)
-	$(AM_V_GEN) echo "#ifndef __G_MARSHAL_H__" > xgen-gmh \
-	&& echo "#define __G_MARSHAL_H__" >> xgen-gmh \
-	&& $(glib_genmarshal) --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --header >> xgen-gmh \
-	&& echo "#endif /* __G_MARSHAL_H__ */" >> xgen-gmh \
-	&& (cmp -s xgen-gmh gmarshal.h 2>/dev/null || cp xgen-gmh gmarshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~ \
-	&& echo timestamp > $@
-
-gmarshal.c: @REBUILD@ stamp-gmarshal.h
-	$(AM_V_GEN) $(glib_genmarshal) --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --body >> xgen-gmc \
-	&& cp xgen-gmc gmarshal.c \
-	&& rm -f xgen-gmc xgen-gmc~
 
 gmarshal.strings: @REBUILD@ $(srcdir)/gmarshal.list
 	$(AM_V_GEN) grep '^[A-Z]' $(srcdir)/gmarshal.list \
@@ -230,7 +207,6 @@ gmarshal.strings: @REBUILD@ $(srcdir)/gmarshal.list
 	&& rm -f xgen-gms xgen-gms~
 
 glib-genmarshal.o: gmarshal.strings
-gsignal.lo: gmarshal.c
 
 # target platform:
 libgobjectinclude_HEADERS = $(gobject_target_headers)
@@ -264,10 +240,7 @@ EXTRA_DIST += 			\
 
 BUILT_EXTRA_DIST = \
 	makefile.msc		\
-	gobject.rc		\
-	gmarshal.h		\
-	gmarshal.c		\
-	stamp-gmarshal.h
+	gobject.rc
 
 gobject-win32-res.o: gobject.rc
 	$(AM_V_GEN) $(WINDRES) gobject.rc $@
diff --git a/gobject/gmarshal.c b/gobject/gmarshal.c
new file mode 100644
index 000000000..02a7c117a
--- /dev/null
+++ b/gobject/gmarshal.c
@@ -0,0 +1,338 @@
+/* Note: This file is no longer generated.  See the comment in gmarshal.list */
+
+#include "gvalue.h"
+#include "gclosure.h"
+
+#ifdef G_ENABLE_DEBUG
+#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+#define g_marshal_value_peek_int(v)      g_value_get_int (v)
+#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
+#define g_marshal_value_peek_long(v)     g_value_get_long (v)
+#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
+#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
+#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
+#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
+#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
+#define g_marshal_value_peek_float(v)    g_value_get_float (v)
+#define g_marshal_value_peek_double(v)   g_value_get_double (v)
+#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
+#define g_marshal_value_peek_param(v)    g_value_get_param (v)
+#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
+#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
+#define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#define g_marshal_value_peek_variant(v)  g_value_get_variant (v)
+#else /* !G_ENABLE_DEBUG */
+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+ *          Do not access GValues directly in your code. Instead, use the
+ *          g_value_get_*() functions
+ */
+#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
+#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
+#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
+#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
+#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
+#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
+#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
+#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
+#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
+#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
+#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_variant(v)  (v)->data[0].v_pointer
+#endif /* !G_ENABLE_DEBUG */
+
+
+/* VOID:VOID (./gmarshal.list:6) */
+void
+g_cclosure_marshal_VOID__VOID (GClosure     *closure,
+                               GValue       *return_value G_GNUC_UNUSED,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint G_GNUC_UNUSED,
+                               gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:BOOLEAN (./gmarshal.list:7) */
+void
+g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
+                                  GValue       *return_value G_GNUC_UNUSED,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                  gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:CHAR (./gmarshal.list:8) */
+void
+g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
+                               GValue       *return_value G_GNUC_UNUSED,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint G_GNUC_UNUSED,
+                               gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:UCHAR (./gmarshal.list:9) */
+void
+g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
+                                GValue       *return_value G_GNUC_UNUSED,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:INT (./gmarshal.list:10) */
+void
+g_cclosure_marshal_VOID__INT (GClosure     *closure,
+                              GValue       *return_value G_GNUC_UNUSED,
+                              guint         n_param_values,
+                              const GValue *param_values,
+                              gpointer      invocation_hint G_GNUC_UNUSED,
+                              gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:UINT (./gmarshal.list:11) */
+void
+g_cclosure_marshal_VOID__UINT (GClosure     *closure,
+                               GValue       *return_value G_GNUC_UNUSED,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint G_GNUC_UNUSED,
+                               gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:LONG (./gmarshal.list:12) */
+void
+g_cclosure_marshal_VOID__LONG (GClosure     *closure,
+                               GValue       *return_value G_GNUC_UNUSED,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint G_GNUC_UNUSED,
+                               gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:ULONG (./gmarshal.list:13) */
+void
+g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
+                                GValue       *return_value G_GNUC_UNUSED,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:ENUM (./gmarshal.list:14) */
+void
+g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
+                               GValue       *return_value G_GNUC_UNUSED,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint G_GNUC_UNUSED,
+                               gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:FLAGS (./gmarshal.list:15) */
+void
+g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
+                                GValue       *return_value G_GNUC_UNUSED,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:FLOAT (./gmarshal.list:16) */
+void
+g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
+                                GValue       *return_value G_GNUC_UNUSED,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:DOUBLE (./gmarshal.list:17) */
+void
+g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
+                                 GValue       *return_value G_GNUC_UNUSED,
+                                 guint         n_param_values,
+                                 const GValue *param_values,
+                                 gpointer      invocation_hint G_GNUC_UNUSED,
+                                 gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:STRING (./gmarshal.list:18) */
+void
+g_cclosure_marshal_VOID__STRING (GClosure     *closure,
+                                 GValue       *return_value G_GNUC_UNUSED,
+                                 guint         n_param_values,
+                                 const GValue *param_values,
+                                 gpointer      invocation_hint G_GNUC_UNUSED,
+                                 gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:PARAM (./gmarshal.list:19) */
+void
+g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
+                                GValue       *return_value G_GNUC_UNUSED,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:BOXED (./gmarshal.list:20) */
+void
+g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
+                                GValue       *return_value G_GNUC_UNUSED,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:POINTER (./gmarshal.list:21) */
+void
+g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
+                                  GValue       *return_value G_GNUC_UNUSED,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                  gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:OBJECT (./gmarshal.list:22) */
+void
+g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
+                                 GValue       *return_value G_GNUC_UNUSED,
+                                 guint         n_param_values,
+                                 const GValue *param_values,
+                                 gpointer      invocation_hint G_GNUC_UNUSED,
+                                 gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:VARIANT (./gmarshal.list:23) */
+void
+g_cclosure_marshal_VOID__VARIANT (GClosure     *closure,
+                                  GValue       *return_value G_GNUC_UNUSED,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                  gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* VOID:UINT,POINTER (./gmarshal.list:26) */
+void
+g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
+                                       GValue       *return_value G_GNUC_UNUSED,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint G_GNUC_UNUSED,
+                                       gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* BOOL:FLAGS (./gmarshal.list:27) */
+void
+g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
+                                   GValue       *return_value G_GNUC_UNUSED,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint G_GNUC_UNUSED,
+                                   gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* STRING:OBJECT,POINTER (./gmarshal.list:28) */
+void
+g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
+                                           GValue       *return_value G_GNUC_UNUSED,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint G_GNUC_UNUSED,
+                                           gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
+/* BOOL:BOXED,BOXED (./gmarshal.list:29) */
+void
+g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure     *closure,
+                                         GValue       *return_value G_GNUC_UNUSED,
+                                         guint         n_param_values,
+                                         const GValue *param_values,
+                                         gpointer      invocation_hint G_GNUC_UNUSED,
+                                         gpointer      marshal_data)
+{
+  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
+			      invocation_hint, marshal_data);
+}
+
diff --git a/gobject/gmarshal.h b/gobject/gmarshal.h
new file mode 100644
index 000000000..1238c0227
--- /dev/null
+++ b/gobject/gmarshal.h
@@ -0,0 +1,187 @@
+/* Note: This file is no longer generated.  See the comment in gmarshal.list */
+#ifndef __G_MARSHAL_H__
+#define __G_MARSHAL_H__
+
+G_BEGIN_DECLS
+
+/* VOID:VOID (./gmarshal.list:6) */
+extern void g_cclosure_marshal_VOID__VOID (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data);
+
+/* VOID:BOOLEAN (./gmarshal.list:7) */
+extern void g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
+                                              GValue       *return_value,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint,
+                                              gpointer      marshal_data);
+
+/* VOID:CHAR (./gmarshal.list:8) */
+extern void g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data);
+
+/* VOID:UCHAR (./gmarshal.list:9) */
+extern void g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
+                                            GValue       *return_value,
+                                            guint         n_param_values,
+                                            const GValue *param_values,
+                                            gpointer      invocation_hint,
+                                            gpointer      marshal_data);
+
+/* VOID:INT (./gmarshal.list:10) */
+extern void g_cclosure_marshal_VOID__INT (GClosure     *closure,
+                                          GValue       *return_value,
+                                          guint         n_param_values,
+                                          const GValue *param_values,
+                                          gpointer      invocation_hint,
+                                          gpointer      marshal_data);
+
+/* VOID:UINT (./gmarshal.list:11) */
+extern void g_cclosure_marshal_VOID__UINT (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data);
+
+/* VOID:LONG (./gmarshal.list:12) */
+extern void g_cclosure_marshal_VOID__LONG (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data);
+
+/* VOID:ULONG (./gmarshal.list:13) */
+extern void g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
+                                            GValue       *return_value,
+                                            guint         n_param_values,
+                                            const GValue *param_values,
+                                            gpointer      invocation_hint,
+                                            gpointer      marshal_data);
+
+/* VOID:ENUM (./gmarshal.list:14) */
+extern void g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data);
+
+/* VOID:FLAGS (./gmarshal.list:15) */
+extern void g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
+                                            GValue       *return_value,
+                                            guint         n_param_values,
+                                            const GValue *param_values,
+                                            gpointer      invocation_hint,
+                                            gpointer      marshal_data);
+
+/* VOID:FLOAT (./gmarshal.list:16) */
+extern void g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
+                                            GValue       *return_value,
+                                            guint         n_param_values,
+                                            const GValue *param_values,
+                                            gpointer      invocation_hint,
+                                            gpointer      marshal_data);
+
+/* VOID:DOUBLE (./gmarshal.list:17) */
+extern void g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
+                                             GValue       *return_value,
+                                             guint         n_param_values,
+                                             const GValue *param_values,
+                                             gpointer      invocation_hint,
+                                             gpointer      marshal_data);
+
+/* VOID:STRING (./gmarshal.list:18) */
+extern void g_cclosure_marshal_VOID__STRING (GClosure     *closure,
+                                             GValue       *return_value,
+                                             guint         n_param_values,
+                                             const GValue *param_values,
+                                             gpointer      invocation_hint,
+                                             gpointer      marshal_data);
+
+/* VOID:PARAM (./gmarshal.list:19) */
+extern void g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
+                                            GValue       *return_value,
+                                            guint         n_param_values,
+                                            const GValue *param_values,
+                                            gpointer      invocation_hint,
+                                            gpointer      marshal_data);
+
+/* VOID:BOXED (./gmarshal.list:20) */
+extern void g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
+                                            GValue       *return_value,
+                                            guint         n_param_values,
+                                            const GValue *param_values,
+                                            gpointer      invocation_hint,
+                                            gpointer      marshal_data);
+
+/* VOID:POINTER (./gmarshal.list:21) */
+extern void g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
+                                              GValue       *return_value,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint,
+                                              gpointer      marshal_data);
+
+/* VOID:OBJECT (./gmarshal.list:22) */
+extern void g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
+                                             GValue       *return_value,
+                                             guint         n_param_values,
+                                             const GValue *param_values,
+                                             gpointer      invocation_hint,
+                                             gpointer      marshal_data);
+
+/* VOID:VARIANT (./gmarshal.list:23) */
+extern void g_cclosure_marshal_VOID__VARIANT (GClosure     *closure,
+                                              GValue       *return_value,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint,
+                                              gpointer      marshal_data);
+
+/* VOID:UINT,POINTER (./gmarshal.list:26) */
+extern void g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
+                                                   GValue       *return_value,
+                                                   guint         n_param_values,
+                                                   const GValue *param_values,
+                                                   gpointer      invocation_hint,
+                                                   gpointer      marshal_data);
+
+/* BOOL:FLAGS (./gmarshal.list:27) */
+extern void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
+                                               GValue       *return_value,
+                                               guint         n_param_values,
+                                               const GValue *param_values,
+                                               gpointer      invocation_hint,
+                                               gpointer      marshal_data);
+#define g_cclosure_marshal_BOOL__FLAGS	g_cclosure_marshal_BOOLEAN__FLAGS
+
+/* STRING:OBJECT,POINTER (./gmarshal.list:28) */
+extern void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
+                                                       GValue       *return_value,
+                                                       guint         n_param_values,
+                                                       const GValue *param_values,
+                                                       gpointer      invocation_hint,
+                                                       gpointer      marshal_data);
+
+/* BOOL:BOXED,BOXED (./gmarshal.list:29) */
+extern void g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure     *closure,
+                                                     GValue       *return_value,
+                                                     guint         n_param_values,
+                                                     const GValue *param_values,
+                                                     gpointer      invocation_hint,
+                                                     gpointer      marshal_data);
+#define g_cclosure_marshal_BOOL__BOXED_BOXED	g_cclosure_marshal_BOOLEAN__BOXED_BOXED
+
+G_END_DECLS
+
+#endif /* __G_MARSHAL_H__ */
diff --git a/gobject/gmarshal.list b/gobject/gmarshal.list
index 41cf74aec..270a9eb5f 100644
--- a/gobject/gmarshal.list
+++ b/gobject/gmarshal.list
@@ -1,27 +1,6 @@
-# see glib-genmarshal(1) for a detailed description of the file format,
-# possible parameter types are:
-#   VOID        indicates   no   return   type,  or  no  extra
-#               parameters. if VOID is used as  the  parameter
-#               list, no additional parameters may be present.
-#   BOOLEAN     for boolean types (gboolean)
-#   CHAR        for signed char types (gchar)
-#   UCHAR       for unsigned char types (guchar)
-#   INT         for signed integer types (gint)
-#   UINT        for unsigned integer types (guint)
-#   LONG        for signed long integer types (glong)
-#   ULONG       for unsigned long integer types (gulong)
-#   ENUM        for enumeration types (gint)
-#   FLAGS       for flag enumeration types (guint)
-#   FLOAT       for single-precision float types (gfloat)
-#   DOUBLE      for double-precision float types (gdouble)
-#   STRING      for string types (gchar*)
-#   PARAM       for GParamSpec or derived types  (GParamSpec*)
-#   BOXED       for boxed (anonymous but reference counted) types (GBoxed*)
-#   POINTER     for anonymous pointer types (gpointer)
-#   OBJECT      for GObject or derived types (GObject*)
-#   VARIANT     for variants (GVariant*)
-#   NONE        deprecated alias for VOID
-#   BOOL        deprecated alias for BOOLEAN
+# Note: This file used to generate gmarshal.[ch], but it doesn't any
+# longer.  Now that we have g_cclosure_marshal_generic(), there's no
+# reason to use these.  They're kept for ABI compatibility.
 
 # standard VOID return marshallers
 VOID:VOID
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index 03dd73d61..c8cd4beac 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -3474,7 +3474,3 @@ g_signal_accumulator_first_wins (GSignalInvocationHint *ihint,
   g_value_copy (handler_return, return_accu);
   return FALSE;
 }
-
-
-/* --- compile standard marshallers --- */
-#include "gmarshal.c"