diff options
| author | Stefan Kost <ensonic@users.sf.net> | 2009-10-16 11:50:22 +0300 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sf.net> | 2009-10-24 15:14:26 +0300 |
| commit | e1dccb6fd713e4d21f367a552395421bce76d2e6 (patch) | |
| tree | 4f99772e5c6334566eb76bdddb989e605f55d0af | |
| parent | 3333ab473c847812ff208804640f3f0a9dbb45e3 (diff) | |
build: use gst-glib-gen.mak to fix the glib build rules.
The build rules in glib-gen.mak were using pattern rules in a non save way.
| -rw-r--r-- | gst-libs/gst/interfaces/Makefile.am | 5 | ||||
| -rw-r--r-- | gst/camerabin/Makefile.am | 5 | ||||
| -rw-r--r-- | gst/selector/Makefile.am | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index d7ee304b6..33ff81d79 100644 --- a/gst-libs/gst/interfaces/Makefile.am +++ b/gst-libs/gst/interfaces/Makefile.am @@ -8,7 +8,8 @@ headers_photography = \ # variables used for enum/marshal generation glib_enum_headers=$(headers_photography) glib_enum_define=GST_PHOTOGRAPHY -glib_enum_prefix=gst_photography +glib_gen_prefix=gst_photography +glib_gen_basename=photography built_sources = \ photography-enumtypes.c @@ -38,4 +39,4 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) -include $(top_srcdir)/common/glib-gen.mak +include $(top_srcdir)/common/gst-glib-gen.mak diff --git a/gst/camerabin/Makefile.am b/gst/camerabin/Makefile.am index e3fdfae04..746817e33 100644 --- a/gst/camerabin/Makefile.am +++ b/gst/camerabin/Makefile.am @@ -1,6 +1,7 @@ -glib_enum_prefix = __gst_camerabin +glib_gen_prefix = __gst_camerabin +glib_gen_basename = gstcamerabin -include $(top_srcdir)/common/glib-gen.mak +include $(top_srcdir)/common/gst-glib-gen.mak built_sources = gstcamerabin-marshal.c built_headers = gstcamerabin-marshal.h diff --git a/gst/selector/Makefile.am b/gst/selector/Makefile.am index 3196b93f7..0986ef699 100644 --- a/gst/selector/Makefile.am +++ b/gst/selector/Makefile.am @@ -1,6 +1,7 @@ -glib_enum_prefix = gst_selector +glib_gen_prefix = gst_selector +glib_gen_basename = gstselector -include $(top_srcdir)/common/glib-gen.mak +include $(top_srcdir)/common/gst-glib-gen.mak built_sources = gstselector-marshal.c built_headers = gstselector-marshal.h |