gst: Update versioning

5 files changed, 56 insertions, 56 deletions

diff --git a/gst-libs/gst/basecamerabinsrc/Makefile.am b/gst-libs/gst/basecamerabinsrc/Makefile.am
index 2f6408086..51f10bae3 100644
--- a/gst-libs/gst/basecamerabinsrc/Makefile.am
+++ b/gst-libs/gst/basecamerabinsrc/Makefile.am
@@ -1,39 +1,39 @@
 
-lib_LTLIBRARIES = libgstbasecamerabinsrc-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstbasecamerabinsrc-@GST_API_VERSION@.la
 
 CLEANFILES = $(BUILT_SOURCES)
 
-libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_SOURCES = \
+libgstbasecamerabinsrc_@GST_API_VERSION@_la_SOURCES = \
         gstcamerabin-enum.c \
         gstcamerabinpreview.c \
 	gstbasecamerasrc.c
 
-libgstbasecamerabinsrc_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/basecamerabinsrc
-libgstbasecamerabinsrc_@GST_MAJORMINOR@include_HEADERS = \
+libgstbasecamerabinsrc_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/basecamerabinsrc
+libgstbasecamerabinsrc_@GST_API_VERSION@include_HEADERS = \
 	gstcamerabin-enum.h \
 	gstcamerabinpreview.h \
 	gstbasecamerasrc.h
 
-libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstbasecamerabinsrc_@GST_API_VERSION@_la_CFLAGS = \
 	$(GST_PLUGINS_BAD_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	-DGST_USE_UNSTABLE_API \
 	$(GST_CFLAGS)
-libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LIBADD = \
-	-lgstapp-$(GST_MAJORMINOR) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
+libgstbasecamerabinsrc_@GST_API_VERSION@_la_LIBADD = \
+	-lgstapp-$(GST_API_VERSION) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
 
-libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+libgstbasecamerabinsrc_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 Android.mk: Makefile.am
-	androgenizer -:PROJECT libgstbasecamerabinsrc -:STATIC libgstbasecamerabinsrc-@GST_MAJORMINOR@ \
+	androgenizer -:PROJECT libgstbasecamerabinsrc -:STATIC libgstbasecamerabinsrc-@GST_API_VERSION@ \
 	 -:TAGS eng debug \
          -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LDFLAGS) \
-	           $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LIBADD) \
+	 -:SOURCES $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_SOURCES) \
+	 -:CFLAGS $(DEFS) $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_CFLAGS) \
+	 -:LDFLAGS $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_LDFLAGS) \
+	           $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_LIBADD) \
 	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/basecamerabinsrc \
+	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/basecamerabinsrc \
 	 -:HEADERS $(libgstbasecamerabinsrcinclude_HEADERS) \
 	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
 	> $@
diff --git a/gst-libs/gst/codecparsers/Makefile.am b/gst-libs/gst/codecparsers/Makefile.am
index 2593f85c5..f6d592630 100644
--- a/gst-libs/gst/codecparsers/Makefile.am
+++ b/gst-libs/gst/codecparsers/Makefile.am
@@ -1,42 +1,42 @@
-lib_LTLIBRARIES = libgstcodecparsers-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstcodecparsers-@GST_API_VERSION@.la
 
-libgstcodecparsers_@GST_MAJORMINOR@_la_SOURCES = \
+libgstcodecparsers_@GST_API_VERSION@_la_SOURCES = \
 	gstmpegvideoparser.c gsth264parser.c gstvc1parser.c gstmpeg4parser.c \
 	parserutils.c
 
-libgstcodecparsers_@GST_MAJORMINOR@includedir = \
-	$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/codecparsers
+libgstcodecparsers_@GST_API_VERSION@includedir = \
+	$(includedir)/gstreamer-@GST_API_VERSION@/gst/codecparsers
 
 noinst_HEADERS = parserutils.h
 
-libgstcodecparsers_@GST_MAJORMINOR@include_HEADERS = \
+libgstcodecparsers_@GST_API_VERSION@include_HEADERS = \
 	gstmpegvideoparser.h gsth264parser.h gstvc1parser.h gstmpeg4parser.h
 
-libgstcodecparsers_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstcodecparsers_@GST_API_VERSION@_la_CFLAGS = \
 	$(GST_PLUGINS_BAD_CFLAGS) \
 	-DGST_USE_UNSTABLE_API \
 	$(GST_CFLAGS)
 
-libgstcodecparsers_@GST_MAJORMINOR@_la_LIBADD = \
+libgstcodecparsers_@GST_API_VERSION@_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS)
 
-libgstcodecparsers_@GST_MAJORMINOR@_la_LDFLAGS = \
+libgstcodecparsers_@GST_API_VERSION@_la_LDFLAGS = \
 	$(GST_LIB_LDFLAGS) \
 	$(GST_ALL_LDFLAGS) \
 	$(GST_LT_LDFLAGS)
 
 Android.mk:  $(BUILT_SOURCES) Makefile.am
-	androgenizer -:PROJECT libgstcodecparsers -:STATIC libgstcodecparsers-@GST_MAJORMINOR@ \
+	androgenizer -:PROJECT libgstcodecparsers -:STATIC libgstcodecparsers-@GST_API_VERSION@ \
 	 -:TAGS eng debug \
          -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstcodecparsers_@GST_MAJORMINOR@_la_SOURCES) \
+	 -:SOURCES $(libgstcodecparsers_@GST_API_VERSION@_la_SOURCES) \
          $(built_sources) \
-	 -:CFLAGS $(DEFS) $(libgstcodecparsers_@GST_MAJORMINOR@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstcodecparsers_@GST_MAJORMINOR@_la_LDFLAGS) \
-	           $(libgstcodecparsers@GST_MAJORMINOR@_la_LIBADD) \
+	 -:CFLAGS $(DEFS) $(libgstcodecparsers_@GST_API_VERSION@_la_CFLAGS) \
+	 -:LDFLAGS $(libgstcodecparsers_@GST_API_VERSION@_la_LDFLAGS) \
+	           $(libgstcodecparsers@GST_API_VERSION@_la_LIBADD) \
 	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/codecparsers \
+	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/codecparsers \
 	 -:HEADERS $(libgstcodecparsersinclude_HEADERS) \
          $(built_headers) \
 	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am
index e6fb630ad..6401a83f5 100644
--- a/gst-libs/gst/interfaces/Makefile.am
+++ b/gst-libs/gst/interfaces/Makefile.am
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libgstphotography-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstphotography-@GST_API_VERSION@.la
 libgstphotographyincludedir = \
-        $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/interfaces
+        $(includedir)/gstreamer-@GST_API_VERSION@/gst/interfaces
 
 headers_photography = 		\
 	photography.h
@@ -23,18 +23,18 @@ libgstphotographyinclude_HEADERS = \
 nodist_libgstphotographyinclude_HEADERS = \
 	photography-enumtypes.h
 
-libgstphotography_@GST_MAJORMINOR@_la_SOURCES = \
+libgstphotography_@GST_API_VERSION@_la_SOURCES = \
 	photography.c
 
-nodist_libgstphotography_@GST_MAJORMINOR@_la_SOURCES = 	\
+nodist_libgstphotography_@GST_API_VERSION@_la_SOURCES = 	\
 	$(built_sources)
 
-libgstphotography_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstphotography_@GST_API_VERSION@_la_CFLAGS = \
 	-DGST_USE_UNSTABLE_API \
 	$(GST_PLUGINS_BAD_CFLAGS) \
 	$(GST_CFLAGS)
-libgstphotography_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) 
-libgstphotography_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+libgstphotography_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) 
+libgstphotography_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 BUILT_SOURCES = \
 	$(built_sources) \
@@ -45,16 +45,16 @@ CLEANFILES = $(BUILT_SOURCES)
 include $(top_srcdir)/common/gst-glib-gen.mak
 
 Android.mk:  $(BUILT_SOURCES) Makefile.am
-	androgenizer -:PROJECT libgstphotography -:STATIC libgstphotography-@GST_MAJORMINOR@ \
+	androgenizer -:PROJECT libgstphotography -:STATIC libgstphotography-@GST_API_VERSION@ \
 	 -:TAGS eng debug \
          -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libgstphotography_@GST_MAJORMINOR@_la_SOURCES) \
+	 -:SOURCES $(libgstphotography_@GST_API_VERSION@_la_SOURCES) \
          $(built_sources) \
-	 -:CFLAGS $(DEFS) $(libgstphotography_@GST_MAJORMINOR@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstphotography_@GST_MAJORMINOR@_la_LDFLAGS) \
-	           $(libgstphotography_@GST_MAJORMINOR@_la_LIBADD) \
+	 -:CFLAGS $(DEFS) $(libgstphotography_@GST_API_VERSION@_la_CFLAGS) \
+	 -:LDFLAGS $(libgstphotography_@GST_API_VERSION@_la_LDFLAGS) \
+	           $(libgstphotography_@GST_API_VERSION@_la_LIBADD) \
 	           -ldl \
-	 -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/photography \
+	 -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/photography \
 	 -:HEADERS $(libgstphotographyinclude_HEADERS) \
          $(built_headers) \
 	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
diff --git a/gst-libs/gst/signalprocessor/Makefile.am b/gst-libs/gst/signalprocessor/Makefile.am
index 9172685fb..c1c6fb152 100644
--- a/gst-libs/gst/signalprocessor/Makefile.am
+++ b/gst-libs/gst/signalprocessor/Makefile.am
@@ -1,16 +1,16 @@
-lib_LTLIBRARIES = libgstsignalprocessor-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstsignalprocessor-@GST_API_VERSION@.la
 
-libgstsignalprocessor_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/signalprocessor
-libgstsignalprocessor_@GST_MAJORMINOR@include_HEADERS = gstsignalprocessor.h
+libgstsignalprocessor_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/signalprocessor
+libgstsignalprocessor_@GST_API_VERSION@include_HEADERS = gstsignalprocessor.h
 
-libgstsignalprocessor_@GST_MAJORMINOR@_la_SOURCES = gstsignalprocessor.c
-libgstsignalprocessor_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstsignalprocessor_@GST_API_VERSION@_la_SOURCES = gstsignalprocessor.c
+libgstsignalprocessor_@GST_API_VERSION@_la_CFLAGS = \
     $(GST_PLUGINS_BAD_CFLAGS) \
     $(GST_PLUGINS_BASE_CFLAGS) \
     $(GST_CFLAGS)
-libgstsignalprocessor_@GST_MAJORMINOR@_la_LIBADD = \
-    $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
+libgstsignalprocessor_@GST_API_VERSION@_la_LIBADD = \
+    $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
     $(GST_LIBS)
-libgstsignalprocessor_@GST_MAJORMINOR@_la_LDFLAGS = \
+libgstsignalprocessor_@GST_API_VERSION@_la_LDFLAGS = \
     $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 56f2572b3..52abc1df1 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -1,9 +1,9 @@
 
-lib_LTLIBRARIES = libgstbasevideo-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstbasevideo-@GST_API_VERSION@.la
 
 CLEANFILES = $(BUILT_SOURCES)
 
-libgstbasevideo_@GST_MAJORMINOR@_la_SOURCES = \
+libgstbasevideo_@GST_API_VERSION@_la_SOURCES = \
 	gstbasevideocodec.c \
 	gstbasevideoutils.c \
 	gstbasevideodecoder.c \
@@ -12,8 +12,8 @@ libgstbasevideo_@GST_MAJORMINOR@_la_SOURCES = \
 	gstsurfaceconverter.c \
 	videocontext.c
 
-libgstbasevideo_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
-libgstbasevideo_@GST_MAJORMINOR@include_HEADERS = \
+libgstbasevideo_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/video
+libgstbasevideo_@GST_API_VERSION@include_HEADERS = \
 	gstbasevideocodec.h \
 	gstbasevideoutils.h \
 	gstbasevideodecoder.h \
@@ -22,11 +22,11 @@ libgstbasevideo_@GST_MAJORMINOR@include_HEADERS = \
 	gstsurfaceconverter.h \
 	videocontext.h
 
-libgstbasevideo_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstbasevideo_@GST_API_VERSION@_la_CFLAGS = \
 	$(GST_PLUGINS_BAD_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	-DGST_USE_UNSTABLE_API \
 	$(GST_CFLAGS)
-libgstbasevideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_MAJORMINOR@
-libgstbasevideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+libgstbasevideo_@GST_API_VERSION@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_API_VERSION@
+libgstbasevideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)