diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-03-02 11:05:48 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-03-02 11:05:48 +0100 |
| commit | cfe71423f00461e238ec6b121a539cdc73578dce (patch) | |
| tree | 150bef34dd514a64d66ea7e81cecdfb3050f7e8f /gst/Makefile.am | |
| parent | 441402f9d54414950eaca3ff782c74f221123675 (diff) | |
gst: Remove gstmarshal.[ch] completely and use the generic marshaller
Fixes bug #671130.
Diffstat (limited to 'gst/Makefile.am')
| -rw-r--r-- | gst/Makefile.am | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/gst/Makefile.am b/gst/Makefile.am index c8dbd4a6a..d691c87a1 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -35,11 +35,10 @@ DIST_SUBDIRS = parse built_header_configure = gstconfig.h gstversion.h built_header_make = gstenumtypes.h -built_header_make_noinst = gstmarshal.h -built_source_make = gstenumtypes.c gstmarshal.c +built_source_make = gstenumtypes.c EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \ - gstmarshal.list gsttrace.c \ + gsttrace.c \ gstregistrybinary.c @@ -111,10 +110,9 @@ nodist_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = $(built_source_make) BUILT_SOURCES = \ $(built_header_configure) \ $(built_header_make) \ - $(built_header_make_noinst) \ $(built_source_make) # CLEANFILES is for files generated by make -CLEANFILES = $(built_header_make) $(built_header_make_noinst) $(built_source_make) $(as_dll_cleanfiles) *.gcno *.gcda *.gcov *.gcov.out +CLEANFILES = $(built_header_make) $(built_source_make) $(as_dll_cleanfiles) *.gcno *.gcda *.gcov *.gcov.out # DISTCLEANFILES is for files generated by configure DISTCLEANFILES = $(built_header_configure) @@ -211,19 +209,7 @@ noinst_HEADERS = \ gstregistrybinary.h \ gstregistrychunks.h \ gsttrace.h \ - gst_private.h \ - $(built_header_make_noinst) - -gstmarshal.h: gstmarshal.list - $(AM_V_GEN)glib-genmarshal --header --prefix=gst_marshal $(srcdir)/gstmarshal.list > gstmarshal.h.tmp && \ - mv gstmarshal.h.tmp gstmarshal.h - -gstmarshal.c: gstmarshal.list gst_private.h - $(AM_V_GEN)echo "#include \"gst_private.h\"" > gstmarshal.c.tmp && \ - echo "#include \"glib-object.h\"" >> gstmarshal.c.tmp && \ - echo "#include \"gstmarshal.h\"" >> gstmarshal.c.tmp && \ - glib-genmarshal --body --prefix=gst_marshal $(srcdir)/gstmarshal.list >> gstmarshal.c.tmp && \ - mv gstmarshal.c.tmp gstmarshal.c + gst_private.h gstenumtypes.h: $(gst_headers) $(AM_V_GEN)glib-mkenums \ |