summaryrefslogtreecommitdiff
path: root/common-modified
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2013-02-05 17:25:41 +0100
committerOlivier CrĂȘte <olivier.crete@collabora.com>2013-02-05 17:25:41 +0100
commitf4727622b206f534bf6e6c1a1711d3df9c2e19ec (patch)
tree05967da120179539dff761aad7b2e305e991e94e /common-modified
parent8c05863f85469223192409f7852b2ce19f44fdfc (diff)
downloadfarstream-f4727622b206f534bf6e6c1a1711d3df9c2e19ec.tar.gz
Use the generic marshallers instead of generating them
Diffstat (limited to 'common-modified')
-rw-r--r--common-modified/gst-glib-gen.mak12
1 files changed, 0 insertions, 12 deletions
diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak
index fbb47dc5..02c379f0 100644
--- a/common-modified/gst-glib-gen.mak
+++ b/common-modified/gst-glib-gen.mak
@@ -9,15 +9,6 @@
enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
# these are all the rules generating the relevant files
-$(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
- $(AM_V_GEN)glib-genmarshal --header --prefix=$(glib_gen_prefix)_marshal $^ > $(glib_gen_basename)-marshal.h.tmp && \
- mv $(glib_gen_basename)-marshal.h.tmp $(glib_gen_basename)-marshal.h
-
-$(glib_gen_basename)-marshal.c: $(glib_gen_basename)-marshal.list
- $(AM_V_GEN)echo "#include \"$(glib_gen_basename)-marshal.h\"" >> $(glib_gen_basename)-marshal.c.tmp && \
- glib-genmarshal --body --prefix=$(glib_gen_prefix)_marshal $^ >> $(glib_gen_basename)-marshal.c.tmp && \
- mv $(glib_gen_basename)-marshal.c.tmp $(glib_gen_basename)-marshal.c
-
$(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)
$(AM_V_GEN)glib-mkenums \
--fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
@@ -38,8 +29,5 @@ $(glib_gen_basename)-enumtypes.c: $(glib_enum_headers)
# a hack rule to make sure .Plo files exist because they get include'd
# from Makefile's
-.deps/%-marshal.Plo:
- @touch $@
-
.deps/%-enumtypes.Plo:
@touch $@