[cheese] Remove marshaller generation rules

[David King <davidk src gnome org>]

commit 729939473c4f33b53b574eb970ce52781277b5c2
Author: David King <amigadave amigadave com>
Date:   Mon Nov 21 20:42:50 2011 +0100

    Remove marshaller generation rules
    
    The generic marshallers, supplied by GLib, are used instead.

 .gitignore                               |    1 -
 Makefile.am                              |   14 --------------
 configure.ac                             |    7 -------
 libcheese/cheese-camera-device-monitor.c |    1 -
 4 files changed, 0 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d110e14..234ef44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,6 @@ Makefile.in*
 /help/*/*.page
 !/help/C
 /libcheese/cheese-enums.*
-/libcheese/cheese-marshal.*
 /m4/
 /po/*.mo
 /po/.intltool-merge-cache
diff --git a/Makefile.am b/Makefile.am
index ceb8737..698e558 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,16 +2,6 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = po help
 
-marshal_data = \
-	libcheese/cheese-marshal.c \
-	libcheese/cheese-marshal.h
-
-libcheese/cheese-marshal.h: libcheese/cheese-marshal.list
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=cheese_marshal $< > $@
-
-libcheese/cheese-marshal.c: libcheese/cheese-marshal.list libcheese/cheese-marshal.h
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --body --prefix=cheese_marshal $< > $@
-
 enum_data = \
 	libcheese/cheese-enums.c \
 	libcheese/cheese-enums.h
@@ -135,7 +125,6 @@ libcheese_la_LDFLAGS = \
 
 libcheese_la_SOURCES = \
 	libcheese/cheese-enums.c \
-	libcheese/cheese-marshal.c \
 	libcheese/cheese-camera.c \
 	libcheese/cheese-camera-device.c \
 	libcheese/cheese-camera-device-monitor.c \
@@ -173,7 +162,6 @@ Cheese_3_0_gir_CFLAGS = \
 	$(CHEESE_CFLAGS)
 Cheese_3_0_gir_FILES = \
 	$(libcheese_la_SOURCES) \
-	libcheese/cheese-marshal.h \
 	libcheese/cheese-enums.h
 Cheese_3_0_gir_INCLUDES = \
 	GObject-2.0 \
@@ -425,7 +413,6 @@ dist_noinst_DATA = \
 	$(noinst_libcheese_headers) \
 	$(noinst_libcheese_gtk_headers) \
 	libcheese/cheese-gtk.symbols \
-	libcheese/cheese-marshal.list \
 	m4/introspection.m4 \
 	src/vapi/cheese-common.deps \
 	src/vapi/cheese-common.vapi \
@@ -440,7 +427,6 @@ CLEANFILES = \
 	$(desktop_DATA) \
 	$(gsettings_SCHEMAS) \
 	$(pkgconfig_DATA) \
-	$(marshal_data) \
 	$(enum_data) \
 	$(gir_DATA) \
 	$(typelib_DATA)
diff --git a/configure.ac b/configure.ac
index 8525199..ebb0b75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,13 +145,6 @@ AS_IF([test "x$GST_INSPECT" = "xnotfound"],
         AC_MSG_WARN([$gst_runtime_plugin was not found. It needs to be installed before Cheese is run])])
    done])
 
-AC_MSG_CHECKING([for glib-genmarshal script])
-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-AS_IF([test "x$GLIB_GENMARSHAL" = "x"],
-  [AC_MSG_ERROR([glib-genmarshal not listed in glib-2.0 pkg-config file])],
-  [AC_SUBST([GLIB_GENMARSHAL])
-    AC_MSG_RESULT([$GLIB_GENMARSHAL])])
-
 AC_MSG_CHECKING([for glib-mkenums script])
 GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
 AS_IF([test "x$GLIB_MKENUMS" = "x"],
diff --git a/libcheese/cheese-camera-device-monitor.c b/libcheese/cheese-camera-device-monitor.c
index 81cd6ef..e84b47a 100644
--- a/libcheese/cheese-camera-device-monitor.c
+++ b/libcheese/cheese-camera-device-monitor.c
@@ -43,7 +43,6 @@
 #endif
 
 #include "cheese-camera-device-monitor.h"
-#include "cheese-marshal.h"
 
 /**
  * SECTION:cheese-camera-device-monitor