build: use gst-glib-gen.mak to fix the glib build rules. Fixes #598114

The build rules in glib-gen.mak were using pattern rules in a non save way.

diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
index 8ec43e7..a0cabf5 100644 (file)
--- a/gst-libs/gst/app/Makefile.am
+++ b/gst-libs/gst/app/Makefile.am
@@ -2,8 +2,9 @@ lib_LTLIBRARIES = libgstapp-@GST_MAJORMINOR@.la
 
 glib_enum_define = GST_APP
 glib_enum_prefix = __gst_app
+glib_gen_basename = gstapp
 
-include $(top_srcdir)/common/glib-gen.mak
+include $(top_srcdir)/common/gst-glib-gen.mak
 
 built_sources = gstapp-marshal.c
 built_headers = gstapp-marshal.h

diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 1b3ef2f..4ecbf87 100644 (file)
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -3,8 +3,9 @@ glib_enum_headers=              \
        multichannel.h          \
        gstringbuffer.h
 
-glib_enum_define=GST_AUDIO
-glib_enum_prefix=gst_audio
+glib_enum_define = GST_AUDIO
+glib_enum_prefix = gst_audio
+glib_gen_basename = audio
 
 built_sources = audio-enumtypes.c
 built_headers = audio-enumtypes.h
@@ -54,7 +55,7 @@ testchannels_SOURCES = testchannels.c
 testchannels_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 testchannels_LDADD = $(GST_LIBS)
 
-include $(top_srcdir)/common/glib-gen.mak
+include $(top_srcdir)/common/gst-glib-gen.mak
 
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES = GstAudio-@GST_MAJORMINOR@.gir

diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am
index 790b52a..6c891b9 100644 (file)
--- a/gst-libs/gst/interfaces/Makefile.am
+++ b/gst-libs/gst/interfaces/Makefile.am
@@ -18,9 +18,10 @@ headers_interfaces =                 \
        xoverlay.h
 
 # variables used for enum/marshal generation
-glib_enum_headers=$(headers_interfaces)
-glib_enum_define=GST_INTERFACES
-glib_enum_prefix=gst_interfaces
+glib_enum_headers = $(headers_interfaces)
+glib_enum_define = GST_INTERFACES
+glib_enum_prefix = gst_interfaces
+glib_gen_basename = interfaces
 
 built_sources = \
        interfaces-marshal.c \
@@ -67,7 +68,7 @@ EXTRA_DIST = interfaces-marshal.list
 
 CLEANFILES = $(BUILT_SOURCES)
 
-include $(top_srcdir)/common/glib-gen.mak
+include $(top_srcdir)/common/gst-glib-gen.mak
 
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES = GstInterfaces-@GST_MAJORMINOR@.gir

diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
index bdea805..4e2a456 100644 (file)
--- a/gst-libs/gst/pbutils/Makefile.am
+++ b/gst-libs/gst/pbutils/Makefile.am
@@ -7,9 +7,10 @@ headers_pbutils = \
        missing-plugins.h
 
 # variables used for enum/marshal generation
-glib_enum_headers=$(headers_pbutils)
-glib_enum_define=GST_INSTALL
-glib_enum_prefix=gst_install
+glib_enum_headers = $(headers_pbutils)
+glib_enum_define = GST_INSTALL
+glib_enum_prefix = gst_install
+glib_gen_basename = pbutils
 
 built_sources = \
        pbutils-enumtypes.c
@@ -43,7 +44,7 @@ BUILT_SOURCES = \
 CLEANFILES = $(BUILT_SOURCES)
 
 
-include $(top_srcdir)/common/glib-gen.mak
+include $(top_srcdir)/common/gst-glib-gen.mak
 
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES = GstPbutils-@GST_MAJORMINOR@.gir

diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
index 1b515b2..2379770 100644 (file)
--- a/gst-libs/gst/rtsp/Makefile.am
+++ b/gst-libs/gst/rtsp/Makefile.am
@@ -42,11 +42,12 @@ BUILT_SOURCES = $(built_headers) $(built_sources)
 EXTRA_DIST = rtsp-marshal.list
 CLEANFILES = $(BUILT_SOURCES)
 
-glib_enum_prefix=gst_rtsp
-glib_enum_define=gst_rtsp
-glib_enum_headers=gstrtspdefs.h
+glib_enum_prefix = gst_rtsp
+glib_enum_define = gst_rtsp
+glib_enum_headers = gstrtspdefs.h
+glib_gen_basename = gstrtsp
 
-include $(top_srcdir)/common/glib-gen.mak
+include $(top_srcdir)/common/gst-glib-gen.mak
 
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES = GstRtsp-@GST_MAJORMINOR@.gir

diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 7dd93e3..47566f5 100644 (file)
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -1,8 +1,8 @@
 # variables used for enum/marshal generation
-glib_enum_headers= video.h
-
-glib_enum_define=GST_VIDEO
-glib_enum_prefix=gst_video
+glib_enum_headers = video.h
+glib_enum_define = GST_VIDEO
+glib_enum_prefix = gst_video
+glib_gen_basename = video
 
 built_sources = video-enumtypes.c
 built_headers = video-enumtypes.h
@@ -25,7 +25,7 @@ libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS
 libgstvideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
-include $(top_srcdir)/common/glib-gen.mak
+include $(top_srcdir)/common/gst-glib-gen.mak
 
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES = GstVideo-@GST_MAJORMINOR@.gir

diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am
index 89f58ae..dd8bb7e 100644 (file)
--- a/gst/playback/Makefile.am
+++ b/gst/playback/Makefile.am
@@ -1,8 +1,9 @@
-glib_enum_define=GST_PLAY
-glib_enum_prefix=gst_play
+# variables used for enum/marshal generation
+glib_enum_define = GST_PLAY
+glib_enum_prefix = gst_play
+glib_gen_basename = gstplay
 
 built_sources = gstplay-marshal.c
-
 built_headers = gstplay-marshal.h
 
 plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
@@ -98,4 +99,5 @@ EXTRA_DIST = gstplay-marshal.list
 
 CLEANFILES = $(BUILT_SOURCES)
 
-include $(top_srcdir)/common/glib-gen.mak
+include $(top_srcdir)/common/gst-glib-gen.mak
+

diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am
index 5effb07..a34a34e 100644 (file)
--- a/gst/tcp/Makefile.am
+++ b/gst/tcp/Makefile.am
@@ -4,8 +4,9 @@ plugin_LTLIBRARIES = libgsttcp.la
 glib_enum_headers = gsttcp.h
 glib_enum_define = GST_TCP
 glib_enum_prefix = gst_tcp
+glib_gen_basename = gsttcp
 
-include $(top_srcdir)/common/glib-gen.mak
+include $(top_srcdir)/common/gst-glib-gen.mak
 
 built_sources = gsttcp-enumtypes.c gsttcp-marshal.c
 built_headers = gsttcp-enumtypes.h gsttcp-marshal.h