Use generic marshaler

If only to keep people from refiling the same issue over
and over again...

perf/Makefile.am

@@ -30,8 +30,6 @@ testperf_SOURCES =		\
 	gtkwidgetprofiler.c	\
 	gtkwidgetprofiler.h	\
 	main.c			\
-	marshalers.c		\
-	marshalers.h		\
 	textview.c		\
 	treeview.c		\
 	typebuiltins.c		\
@@ -39,13 +37,10 @@ testperf_SOURCES =		\
 	widgets.h
 
 BUILT_SOURCES =			\
-	marshalers.c		\
-	marshalers.h		\
 	typebuiltins.c		\
 	typebuiltins.h
 
 stamp_files =			\
-	stamp-marshalers.h	\
 	stamp-typebuiltins.h
 
 headers_with_enums = 		\
@@ -53,18 +48,6 @@ headers_with_enums = 		\
 
 MAINTAINERCLEANFILES = $(BUILT_SOURCES) $(stamp_files)
 
-marshalers.h: stamp-marshalers.h
-	@true
-
-stamp-marshalers.h: @REBUILD@ marshalers.list
-	$(GLIB_GENMARSHAL) --prefix=_testperf_marshal $(srcdir)/marshalers.list --header >> xgen-gmlh \
-	&& (cmp -s xgen-gmlh marshalers.h || cp xgen-gmlh marshalers.h) \
-	&& rm -f xgen-gmlh \
-	&& echo timestamp > $(@F)
-marshalers.c: @REBUILD@ marshalers.list
-	$(GLIB_GENMARSHAL) --prefix=_testperf_marshal $(srcdir)/marshalers.list --body >> xgen-gmlc \
-	&& cp xgen-gmlc marshalers.c \
-	&& rm -f xgen-gmlc
 
 typebuiltins.h: stamp-typebuiltins.h
 	@true
@@ -83,7 +66,6 @@ typebuiltins.c: @REBUILD@ $(headers_with_enums) typebuiltins.c.template
 
 EXTRA_DIST += 		\
 	README		\
-	marshalers.list	\
 	typebuiltins.c.template	\
 	typebuiltins.h.template	\
 	$(BUILT_SOURCES)

perf/gtkwidgetprofiler.c

@@ -1,7 +1,6 @@
 #include "config.h"
 #include <string.h>
 #include "gtkwidgetprofiler.h"
-#include "marshalers.h"
 #include "typebuiltins.h"
 
 typedef enum {
@@ -53,7 +52,7 @@ gtk_widget_profiler_class_init (GtkWidgetProfilerClass *class)
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (GtkWidgetProfilerClass, create_widget),
 		  NULL, NULL,
-		  _testperf_marshal_OBJECT__VOID,
+		  NULL,
 		  G_TYPE_OBJECT, 0);
 
   signals[REPORT] =
@@ -62,7 +61,7 @@ gtk_widget_profiler_class_init (GtkWidgetProfilerClass *class)
 		  G_SIGNAL_RUN_FIRST,
 		  G_STRUCT_OFFSET (GtkWidgetProfilerClass, report),
 		  NULL, NULL,
-		  _testperf_marshal_VOID__ENUM_OBJECT_DOUBLE,
+		  NULL,
 		  G_TYPE_NONE, 3,
 		  GTK_TYPE_WIDGET_PROFILER_REPORT,
 		  G_TYPE_OBJECT,

perf/marshalers.list

@@ -1,2 +0,0 @@
-OBJECT:VOID
-VOID:ENUM,OBJECT,DOUBLE