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.

diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
index a0cabf5e73a270c16156f1d8dad25fa8670ece37..1671baf35f95fba2be4b45e492be661502eead35 100644 (file)
--- 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
 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
 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 4ecbf8716300d056a41c123553881fc95f742147..555c9691eb777dd7c59bd7aa3aaf4ec83498069a 100644 (file)
--- 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
        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
 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 6c891b9d7677dbdb087f9b3707e5ca73868bf994..64943cba71b76183890398fb23ffd83e73774c9c 100644 (file)
--- 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
 # 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 = \
 glib_gen_basename = interfaces
 
 built_sources = \

diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
index 4e2a456fd8ee74525a58008622e4182c25a58217..fbcd1f60beab0da927bcdf126e04e40db66bdfd9 100644 (file)
--- 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
 # 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 = \
 glib_gen_basename = pbutils
 
 built_sources = \

diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
index 2379770d58def69c6edcc920f19ed9db55133a53..902c031183804a7b2a225582c7ac8d27ce33a26e 100644 (file)
--- 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
 
 
 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 \
 
 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)
 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)
 
 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
 glib_enum_define = gst_rtsp
 glib_enum_headers = gstrtspdefs.h
 glib_gen_basename = gstrtsp

diff --git a/gst-libs/gst/rtsp/gstrtsp-marshal.list b/gst-libs/gst/rtsp/gstrtsp-marshal.list
new file mode 100644 (file)
index 0000000..246d37e
--- /dev/null
+++ b/gst-libs/gst/rtsp/gstrtsp-marshal.list
@@ -0,0 +1 @@
+ENUM:POINTER,POINTER

diff --git a/gst-libs/gst/rtsp/gstrtspextension.c b/gst-libs/gst/rtsp/gstrtspextension.c
index d02878aede4faf0dc4112ceb1d7494061cd59ae9..140f82fc1a8f4ecadda549a8a24d14b1d91da7a3 100644 (file)
--- a/gst-libs/gst/rtsp/gstrtspextension.c
+++ b/gst-libs/gst/rtsp/gstrtspextension.c
@@ -35,7 +35,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "rtsp-marshal.h"
+#include "gstrtsp-marshal.h"

 #include "gstrtsp-enumtypes.h"
 #include "gstrtspextension.h"
 
 #include "gstrtsp-enumtypes.h"
 #include "gstrtspextension.h"
 

diff --git a/gst-libs/gst/rtsp/rtsp-marshal.list b/gst-libs/gst/rtsp/rtsp-marshal.list
deleted file mode 100644 (file)
index 246d37e..0000000
--- a/gst-libs/gst/rtsp/rtsp-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-ENUM:POINTER,POINTER

diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 47566f5af79c499a5e468af056b4d5851634e012..612f9275257d5322b163d63609d982473bfc2362 100644 (file)
--- 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
 # 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
 glib_gen_basename = video
 
 built_sources = video-enumtypes.c

diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am
index dd8bb7ec1042cce3ba0ecadaad6b929a5192c4ea..c0df96913866385f3e6d42bf42fb620721dbf33e 100644 (file)
--- 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
 # 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
 glib_gen_basename = gstplay
 
 built_sources = gstplay-marshal.c

diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am
index a34a34e13e26b251d2ebf6f9b44620495ed56400..02bc526cd6a1ef41bcd10f6333891c8e23c8817c 100644 (file)
--- 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
 # 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
 glib_gen_basename = gsttcp
 
 include $(top_srcdir)/common/gst-glib-gen.mak