mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 07:16:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
The build rules in glib-gen.mak were using pattern rules in a non save way.
This commit is contained in:
Stefan Kost 2009-10-16 10:18:45 +03:00
parent edd822418a
commit a89c1de0ea
8 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst-libs/gst/app/Makefile.am
View file

@ -2,8 +2,9 @@ lib_LTLIBRARIES = libgstapp-@GST_MAJORMINOR@.la
glib_enum_define = GST_APP glib_enum_define = GST_APP
glib_enum_prefix = __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_sources = gstapp-marshal.c
built_headers = gstapp-marshal.h built_headers = gstapp-marshal.h

7
gst-libs/gst/audio/Makefile.am
View file

@ -3,8 +3,9 @@ glib_enum_headers= \
multichannel.h \ multichannel.h \
gstringbuffer.h gstringbuffer.h
glib_enum_define=GST_AUDIO glib_enum_define = GST_AUDIO
glib_enum_prefix=gst_audio glib_enum_prefix = gst_audio
glib_gen_basename = audio
built_sources = audio-enumtypes.c built_sources = audio-enumtypes.c
built_headers = audio-enumtypes.h built_headers = audio-enumtypes.h
@ -54,7 +55,7 @@ testchannels_SOURCES = testchannels.c
testchannels_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) testchannels_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
testchannels_LDADD = $(GST_LIBS) testchannels_LDADD = $(GST_LIBS)
include $(top_srcdir)/common/glib-gen.mak include $(top_srcdir)/common/gst-glib-gen.mak
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
BUILT_GIRSOURCES = GstAudio-@GST_MAJORMINOR@.gir BUILT_GIRSOURCES = GstAudio-@GST_MAJORMINOR@.gir

9
gst-libs/gst/interfaces/Makefile.am
View file

@ -18,9 +18,10 @@ headers_interfaces = \
xoverlay.h xoverlay.h
# variables used for enum/marshal generation # variables used for enum/marshal generation
glib_enum_headers=$(headers_interfaces) glib_enum_headers = $(headers_interfaces)
glib_enum_define=GST_INTERFACES glib_enum_define = GST_INTERFACES
glib_enum_prefix=gst_interfaces glib_enum_prefix = gst_interfaces
glib_gen_basename = interfaces
built_sources = \ built_sources = \
interfaces-marshal.c \ interfaces-marshal.c \
@ -67,7 +68,7 @@ EXTRA_DIST = interfaces-marshal.list
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
include $(top_srcdir)/common/glib-gen.mak include $(top_srcdir)/common/gst-glib-gen.mak
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
BUILT_GIRSOURCES = GstInterfaces-@GST_MAJORMINOR@.gir BUILT_GIRSOURCES = GstInterfaces-@GST_MAJORMINOR@.gir

9
gst-libs/gst/pbutils/Makefile.am
View file

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

9
gst-libs/gst/rtsp/Makefile.am
View file

@ -42,11 +42,12 @@ BUILT_SOURCES = $(built_headers) $(built_sources)
EXTRA_DIST = rtsp-marshal.list EXTRA_DIST = rtsp-marshal.list
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
glib_enum_prefix=gst_rtsp glib_enum_prefix = gst_rtsp
glib_enum_define=gst_rtsp glib_enum_define = gst_rtsp
glib_enum_headers=gstrtspdefs.h 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 if HAVE_INTROSPECTION
BUILT_GIRSOURCES = GstRtsp-@GST_MAJORMINOR@.gir BUILT_GIRSOURCES = GstRtsp-@GST_MAJORMINOR@.gir

10
gst-libs/gst/video/Makefile.am
View file

@ -1,8 +1,8 @@
# variables used for enum/marshal generation # variables used for enum/marshal generation
glib_enum_headers= video.h glib_enum_headers = video.h
glib_enum_define = GST_VIDEO
glib_enum_define=GST_VIDEO glib_enum_prefix = gst_video
glib_enum_prefix=gst_video glib_gen_basename = video
built_sources = video-enumtypes.c built_sources = video-enumtypes.c
built_headers = video-enumtypes.h 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_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) 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 if HAVE_INTROSPECTION
BUILT_GIRSOURCES = GstVideo-@GST_MAJORMINOR@.gir BUILT_GIRSOURCES = GstVideo-@GST_MAJORMINOR@.gir

10
gst/playback/Makefile.am
View file

@ -1,8 +1,9 @@
glib_enum_define=GST_PLAY # variables used for enum/marshal generation
glib_enum_prefix=gst_play glib_enum_define = GST_PLAY
glib_enum_prefix = gst_play
glib_gen_basename = gstplay
built_sources = gstplay-marshal.c built_sources = gstplay-marshal.c
built_headers = gstplay-marshal.h built_headers = gstplay-marshal.h
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
@ -98,4 +99,5 @@ EXTRA_DIST = gstplay-marshal.list
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
include $(top_srcdir)/common/glib-gen.mak include $(top_srcdir)/common/gst-glib-gen.mak

3
gst/tcp/Makefile.am
View file

@ -4,8 +4,9 @@ plugin_LTLIBRARIES = libgsttcp.la
glib_enum_headers = gsttcp.h glib_enum_headers = gsttcp.h
glib_enum_define = GST_TCP glib_enum_define = GST_TCP
glib_enum_prefix = 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_sources = gsttcp-enumtypes.c gsttcp-marshal.c
built_headers = gsttcp-enumtypes.h gsttcp-marshal.h built_headers = gsttcp-enumtypes.h gsttcp-marshal.h