mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

build: fix previous commit to fully accomodate the glib-gen.mak changes

Browse source 
I also renamed glib_enum_prefix to glib_gen_prefix as we also use that for the
marshallers. Also rename the rtsp-marshal.list to work with the unified prefix.
This commit is contained in:
Stefan Kost 2009-10-16 10:56:56 +03:00
parent a89c1de0ea
commit f1c32d0fbb
10 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
lib_LTLIBRARIES = libgstapp-@GST_MAJORMINOR@.la lib_LTLIBRARIES = libgstapp-@GST_MAJORMINOR@.la
glib_enum_define = GST_APP glib_enum_define = GST_APP
glib_enum_prefix = __gst_app glib_gen_prefix = __gst_app
glib_gen_basename = gstapp glib_gen_basename = gstapp
include $(top_srcdir)/common/gst-glib-gen.mak include $(top_srcdir)/common/gst-glib-gen.mak

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

@ -4,7 +4,7 @@ glib_enum_headers= \
gstringbuffer.h gstringbuffer.h
glib_enum_define = GST_AUDIO glib_enum_define = GST_AUDIO
glib_enum_prefix = gst_audio glib_gen_prefix = gst_audio
glib_gen_basename = audio glib_gen_basename = audio
built_sources = audio-enumtypes.c built_sources = audio-enumtypes.c

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

@ -20,7 +20,7 @@ headers_interfaces = \
# 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_gen_prefix = gst_interfaces
glib_gen_basename = interfaces glib_gen_basename = interfaces
built_sources = \ built_sources = \

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

@ -9,7 +9,7 @@ headers_pbutils = \
# 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_gen_prefix = gst_install
glib_gen_basename = pbutils glib_gen_basename = pbutils
built_sources = \ built_sources = \

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

@ -14,8 +14,8 @@ libgstrtspinclude_HEADERS = gstrtspbase64.h \
lib_LTLIBRARIES = libgstrtsp-@GST_MAJORMINOR@.la lib_LTLIBRARIES = libgstrtsp-@GST_MAJORMINOR@.la
built_sources = rtsp-marshal.c gstrtsp-enumtypes.c built_sources = gstrtsp-marshal.c gstrtsp-enumtypes.c
built_headers = rtsp-marshal.h gstrtsp-enumtypes.h built_headers = gstrtsp-marshal.h gstrtsp-enumtypes.h
libgstrtsp_@GST_MAJORMINOR@_la_SOURCES = gstrtspbase64.c \ libgstrtsp_@GST_MAJORMINOR@_la_SOURCES = gstrtspbase64.c \
gstrtsptransport.c \ gstrtsptransport.c \
@ -39,10 +39,10 @@ libgstrtsp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(WIN32_LIBS) $(HSTRERROR_LI
libgstrtsp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstrtsp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
BUILT_SOURCES = $(built_headers) $(built_sources) BUILT_SOURCES = $(built_headers) $(built_sources)
EXTRA_DIST = rtsp-marshal.list EXTRA_DIST = gstrtsp-marshal.list
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
glib_enum_prefix = gst_rtsp glib_gen_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 glib_gen_basename = gstrtsp

0
gst-libs/gst/rtsp/rtsp-marshal.list → gst-libs/gst/rtsp/gstrtsp-marshal.list
View file

2
gst-libs/gst/rtsp/gstrtspextension.c
View file

@ -35,7 +35,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include "rtsp-marshal.h" #include "gstrtsp-marshal.h"
#include "gstrtsp-enumtypes.h" #include "gstrtsp-enumtypes.h"
#include "gstrtspextension.h" #include "gstrtspextension.h"

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

@ -1,7 +1,7 @@
# 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_gen_prefix = gst_video
glib_gen_basename = video glib_gen_basename = video
built_sources = video-enumtypes.c built_sources = video-enumtypes.c

2
gst/playback/Makefile.am
View file

@ -1,6 +1,6 @@
# variables used for enum/marshal generation # variables used for enum/marshal generation
glib_enum_define = GST_PLAY glib_enum_define = GST_PLAY
glib_enum_prefix = gst_play glib_gen_prefix = gst_play
glib_gen_basename = gstplay glib_gen_basename = gstplay
built_sources = gstplay-marshal.c built_sources = gstplay-marshal.c

2
gst/tcp/Makefile.am
View file

@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgsttcp.la
# variables used for enum/marshal generation # variables used for enum/marshal generation
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_gen_prefix = gst_tcp
glib_gen_basename = gsttcp glib_gen_basename = gsttcp
include $(top_srcdir)/common/gst-glib-gen.mak include $(top_srcdir)/common/gst-glib-gen.mak