diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-06-08 10:14:50 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-06-08 10:14:50 +0000 |
| commit | c8df96ea93d1ef6c863894433972313ea45bccd9 (patch) | |
| tree | 8abb5327f073dbce87c1da9bec8a56ed1e87dfaf /gst | |
| parent | 8638019c7ff0807b7fcb8cefa004a1ee91c50c49 (diff) | |
clean up marshal generation
Original commit message from CVS:
clean up marshal generation
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/level/Makefile.am | 35 | ||||
| -rw-r--r-- | gst/level/gstlevel.c | 2 |
2 files changed, 15 insertions, 22 deletions
diff --git a/gst/level/Makefile.am b/gst/level/Makefile.am index 6413c32c..d8114013 100644 --- a/gst/level/Makefile.am +++ b/gst/level/Makefile.am @@ -1,8 +1,18 @@ - plugin_LTLIBRARIES = libgstlevel.la +# variables used for enum/marshal generation +glib_enum_define = GST_LEVEL +glib_enum_prefix = gst_level + +include $(top_srcdir)/common/glib-gen.mak + +built_sources = gstlevel-marshal.c +built_headers = gstlevel-marshal.h + +BUILT_SOURCES = $(built_sources) $(built_headers) + libgstlevel_la_SOURCES = gstlevel.c -nodist_libgstlevel_la_SOURCES = gstlevel-marshal.c gstlevel-marshal.h +nodist_libgstlevel_la_SOURCES = $(built_sources) libgstlevel_la_CFLAGS = $(GST_CFLAGS) libgstlevel_la_LIBADD = libgstlevel_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) @@ -21,23 +31,6 @@ endif EXTRA_libgstlevel_la_SOURCES = gstlevel-marshal.list -BUILT_SOURCES = \ - gstlevel-marshal.c \ - gstlevel-marshal.h -CLEANFILES = \ - gstlevel-marshal.c \ - gstlevel-marshal.h - - -gstlevel-marshal.h: gstlevel-marshal.list - glib-genmarshal --header --prefix=gstlevel_cclosure_marshal $(srcdir)/gstlevel-marshal.list > gstlevel-marshal.h.tmp - mv gstlevel-marshal.h.tmp gstlevel-marshal.h - -gstlevel-marshal.c: gstlevel-marshal.list - echo "#include \"glib.h\"" > gstlevel-marshal.c.tmp - echo "#include \"glib-object.h\"" >> gstlevel-marshal.c.tmp - echo "#include \"gstlevel-marshal.h\"" >> gstlevel-marshal.c.tmp - glib-genmarshal --body --prefix=gstlevel_cclosure_marshal $(srcdir)/gstlevel-marshal.list >> gstlevel-marshal.c.tmp - mv gstlevel-marshal.c.tmp gstlevel-marshal.c - +CLEANFILES = $(BUILT_SOURCES) + EXTRA_DIST = README diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c index 7323da92..ade700bd 100644 --- a/gst/level/gstlevel.c +++ b/gst/level/gstlevel.c @@ -406,7 +406,7 @@ gst_level_class_init (GstLevelClass * klass) gst_filter_signals[SIGNAL_LEVEL] = g_signal_new ("level", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstLevelClass, level), NULL, NULL, - gstlevel_cclosure_marshal_VOID__DOUBLE_INT_DOUBLE_DOUBLE_DOUBLE, + gst_level_marshal_VOID__DOUBLE_INT_DOUBLE_DOUBLE_DOUBLE, G_TYPE_NONE, 5, G_TYPE_DOUBLE, G_TYPE_INT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_DOUBLE); } |