From f1c32d0fbb925a221bcb7c28cc2e8ac7afc78614 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Fri, 16 Oct 2009 10:56:56 +0300 Subject: [PATCH] build: fix previous commit to fully accomodate the glib-gen.mak changes 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. --- gst-libs/gst/app/Makefile.am | 2 +- gst-libs/gst/audio/Makefile.am | 2 +- gst-libs/gst/interfaces/Makefile.am | 2 +- gst-libs/gst/pbutils/Makefile.am | 2 +- gst-libs/gst/rtsp/Makefile.am | 8 ++++---- gst-libs/gst/rtsp/{rtsp-marshal.list => gstrtsp-marshal.list} | 0 gst-libs/gst/rtsp/gstrtspextension.c | 2 +- gst-libs/gst/video/Makefile.am | 2 +- gst/playback/Makefile.am | 2 +- gst/tcp/Makefile.am | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename gst-libs/gst/rtsp/{rtsp-marshal.list => gstrtsp-marshal.list} (100%) diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am index a0cabf5..1671baf 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am @@ -1,7 +1,7 @@ lib_LTLIBRARIES = libgstapp-@GST_MAJORMINOR@.la glib_enum_define = GST_APP -glib_enum_prefix = __gst_app +glib_gen_prefix = __gst_app glib_gen_basename = gstapp include $(top_srcdir)/common/gst-glib-gen.mak diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index 4ecbf87..555c969 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -4,7 +4,7 @@ glib_enum_headers= \ gstringbuffer.h glib_enum_define = GST_AUDIO -glib_enum_prefix = gst_audio +glib_gen_prefix = gst_audio glib_gen_basename = audio built_sources = audio-enumtypes.c diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index 6c891b9..64943cb 100644 --- a/gst-libs/gst/interfaces/Makefile.am +++ b/gst-libs/gst/interfaces/Makefile.am @@ -20,7 +20,7 @@ headers_interfaces = \ # variables used for enum/marshal generation glib_enum_headers = $(headers_interfaces) glib_enum_define = GST_INTERFACES -glib_enum_prefix = gst_interfaces +glib_gen_prefix = gst_interfaces glib_gen_basename = interfaces built_sources = \ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am index 4e2a456..fbcd1f6 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am @@ -9,7 +9,7 @@ headers_pbutils = \ # variables used for enum/marshal generation glib_enum_headers = $(headers_pbutils) glib_enum_define = GST_INSTALL -glib_enum_prefix = gst_install +glib_gen_prefix = gst_install glib_gen_basename = pbutils built_sources = \ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am index 2379770..902c031 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am @@ -14,8 +14,8 @@ libgstrtspinclude_HEADERS = gstrtspbase64.h \ lib_LTLIBRARIES = libgstrtsp-@GST_MAJORMINOR@.la -built_sources = rtsp-marshal.c gstrtsp-enumtypes.c -built_headers = rtsp-marshal.h gstrtsp-enumtypes.h +built_sources = gstrtsp-marshal.c gstrtsp-enumtypes.c +built_headers = gstrtsp-marshal.h gstrtsp-enumtypes.h libgstrtsp_@GST_MAJORMINOR@_la_SOURCES = gstrtspbase64.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) BUILT_SOURCES = $(built_headers) $(built_sources) -EXTRA_DIST = rtsp-marshal.list +EXTRA_DIST = gstrtsp-marshal.list CLEANFILES = $(BUILT_SOURCES) -glib_enum_prefix = gst_rtsp +glib_gen_prefix = gst_rtsp glib_enum_define = gst_rtsp glib_enum_headers = gstrtspdefs.h glib_gen_basename = gstrtsp diff --git a/gst-libs/gst/rtsp/rtsp-marshal.list b/gst-libs/gst/rtsp/gstrtsp-marshal.list similarity index 100% rename from gst-libs/gst/rtsp/rtsp-marshal.list rename to gst-libs/gst/rtsp/gstrtsp-marshal.list diff --git a/gst-libs/gst/rtsp/gstrtspextension.c b/gst-libs/gst/rtsp/gstrtspextension.c index d02878a..140f82f 100644 --- a/gst-libs/gst/rtsp/gstrtspextension.c +++ b/gst-libs/gst/rtsp/gstrtspextension.c @@ -35,7 +35,7 @@ #include "config.h" #endif -#include "rtsp-marshal.h" +#include "gstrtsp-marshal.h" #include "gstrtsp-enumtypes.h" #include "gstrtspextension.h" diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 47566f5..612f927 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -1,7 +1,7 @@ # variables used for enum/marshal generation glib_enum_headers = video.h glib_enum_define = GST_VIDEO -glib_enum_prefix = gst_video +glib_gen_prefix = gst_video glib_gen_basename = video built_sources = video-enumtypes.c diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am index dd8bb7e..c0df969 100644 --- a/gst/playback/Makefile.am +++ b/gst/playback/Makefile.am @@ -1,6 +1,6 @@ # variables used for enum/marshal generation glib_enum_define = GST_PLAY -glib_enum_prefix = gst_play +glib_gen_prefix = gst_play glib_gen_basename = gstplay built_sources = gstplay-marshal.c diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am index a34a34e..02bc526 100644 --- a/gst/tcp/Makefile.am +++ b/gst/tcp/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgsttcp.la # variables used for enum/marshal generation glib_enum_headers = gsttcp.h glib_enum_define = GST_TCP -glib_enum_prefix = gst_tcp +glib_gen_prefix = gst_tcp glib_gen_basename = gsttcp include $(top_srcdir)/common/gst-glib-gen.mak -- 2.7.4