gst: Update versioning

configure.ac

@@ -35,11 +35,12 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
   [AM_DEFAULT_VERBOSITY=1
    AC_SUBST(AM_DEFAULT_VERBOSITY)])
 
-dnl our libraries and install dirs use major.minor as a version
+dnl our libraries and install dirs use GST_API_VERSION in the filename
-GST_MAJORMINOR=$GST_PLUGINS_BAD_VERSION_MAJOR.$GST_PLUGINS_BAD_VERSION_MINOR
+dnl to allow side-by-side installation of different API versions
-dnl we override it here if we need to for the release candidate of new series
+GST_API_VERSION=1.0
-GST_MAJORMINOR=0.11
+AC_SUBST(GST_API_VERSION)
-AC_SUBST(GST_MAJORMINOR)
+AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION",
+  [GStreamer API Version])
 
 dnl CURRENT, REVISION, AGE
 dnl - library source changed -> increment REVISION
@@ -47,7 +48,7 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
 dnl - interfaces added -> increment AGE
 dnl - interfaces removed -> AGE = 0
 dnl sets GST_LT_LDFLAGS
-AS_LIBTOOL(GST, 24, 0, 0)
+AS_LIBTOOL(GST, 0, 0, 0)
 
 AG_GST_LIBTOOL_PREPARE
 
@@ -75,7 +76,7 @@ dnl set up gettext
 dnl the version check needs to stay here because autopoint greps for it
 AM_GNU_GETTEXT_VERSION([0.17])
 AM_GNU_GETTEXT([external])
-AG_GST_GETTEXT([gst-plugins-bad-$GST_MAJORMINOR])
+AG_GST_GETTEXT([gst-plugins-bad-$GST_API_VERSION])
 
 dnl *** check for arguments to configure ***
 
@@ -195,25 +196,25 @@ AG_GST_GLIB_CHECK([$GLIB_REQ])
 
 dnl checks for gstreamer
 dnl uninstalled is selected preferentially -- see pkg-config(1)
-AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ], yes)
+AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ], yes)
-AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ], yes)
+AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ], yes)
-AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
+AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no)
-AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_REQ], yes)
+AG_GST_CHECK_GST_CONTROLLER($GST_API_VERSION, [$GST_REQ], yes)
 AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
 
-AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], yes)
+AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ], yes)
 
 dnl check for uninstalled plugin directories for unit tests
 AG_GST_CHECK_UNINSTALLED_SETUP([
-  AG_GST_CHECK_GST_PLUGINS_GOOD($GST_MAJORMINOR, [0.11.0])
+  AG_GST_CHECK_GST_PLUGINS_GOOD($GST_API_VERSION, [0.11.0])
-  AG_GST_CHECK_GST_PLUGINS_UGLY($GST_MAJORMINOR, [0.11.0])
+  AG_GST_CHECK_GST_PLUGINS_UGLY($GST_API_VERSION, [0.11.0])
-  AG_GST_CHECK_GST_PLUGINS_FFMPEG($GST_MAJORMINOR, [0.11.0])
+  AG_GST_CHECK_GST_PLUGINS_FFMPEG($GST_API_VERSION, [0.11.0])
 ])
 
 dnl Check for documentation xrefs
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
-GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`"
+GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_API_VERSION`"
-GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_MAJORMINOR`"
+GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_API_VERSION`"
 AC_SUBST(GLIB_PREFIX)
 AC_SUBST(GST_PREFIX)
 AC_SUBST(GSTPB_PREFIX)

docs/libs/Makefile.am

@@ -4,7 +4,7 @@
 DOCS_ARE_INCOMPLETE_PLEASE_FIXME=yespleasedo
 
 # The name of the module, e.g. 'glib'.
-#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@
+#DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@
 DOC_MODULE=gst-plugins-bad-libs
 
 # for upload-doc.mak
@@ -51,11 +51,11 @@ extra_files =
 # contains GtkObjects/GObjects and you want to document signals and properties.
 GTKDOC_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
 GTKDOC_LIBS = \
-	$(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la \
-	$(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_API_VERSION@.la \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \
-	$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la \
-	$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \
   $(GST_BASE_LIBS)
 
 GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)

docs/libs/compiling.sgml

@@ -30,10 +30,10 @@ find the header files and libraries. This is done with the
 The following interactive shell session demonstrates how
 <application>pkg-config</application> is used:
 <programlisting>
-$ pkg-config --cflags gstreamer-plugins-bad-&GST_MAJORMINOR;
+$ pkg-config --cflags gstreamer-plugins-bad-&GST_API_VERSION;
--D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pthread -I/usr/include/gstreamer-&GST_MAJORMINOR; -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2
+-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pthread -I/usr/include/gstreamer-&GST_API_VERSION; -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2
-$ pkg-config --libs gstreamer-plugins-bad-&GST_MAJORMINOR;
+$ pkg-config --libs gstreamer-plugins-bad-&GST_API_VERSION;
--Wl,--export-dynamic -pthread -lgstreamer-&GST_MAJORMINOR; -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lxml2 -lpthread -lz -lm -lglib-2.0
+-Wl,--export-dynamic -pthread -lgstreamer-&GST_API_VERSION; -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lxml2 -lpthread -lz -lm -lglib-2.0
 </programlisting>
 </para>
 

docs/libs/gst-plugins-bad-libs-docs.sgml

@@ -6,9 +6,9 @@
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GStreamer Bad Plugins &GST_MAJORMINOR; Library Reference Manual</title>
+    <title>GStreamer Bad Plugins &GST_API_VERSION; Library Reference Manual</title>
     <releaseinfo>
-      for GStreamer Bad Library &GST_MAJORMINOR; (&GST_VERSION;)
+      for GStreamer Bad Library &GST_API_VERSION; (&GST_VERSION;)
       <ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad-libs/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad-libs/html/</ulink>.
     </releaseinfo>
   </bookinfo>
@@ -25,8 +25,8 @@
       <title>Bitstream parsing Library</title>
       <para>
         This library should be linked to by getting cflags and libs from
-        <filename>gstreamer-plugins-bad-&GST_MAJORMINOR;.pc</filename> and adding
+        <filename>gstreamer-plugins-bad-&GST_API_VERSION;.pc</filename> and adding
-        <filename>-lgscodeparsers-&GST_MAJORMINOR;</filename> to the library flags.
+        <filename>-lgscodeparsers-&GST_API_VERSION;</filename> to the library flags.
       </para>
       <xi:include href="xml/gsth264parser.xml" />
       <xi:include href="xml/gstmpegvideoparser.xml" />

docs/plugins/Makefile.am

@@ -3,7 +3,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj
 ## Process this file with automake to produce Makefile.in
 
 # The name of the module, e.g. 'glib'.
-#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@
+#DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@
 MODULE=gst-plugins-bad
 DOC_MODULE=$(MODULE)-plugins
 
@@ -191,7 +191,7 @@ extra_files =
 # contains GtkObjects/GObjects and you want to document signals and properties.
 GTKDOC_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BAD_CFLAGS) $(GST_BASE_CFLAGS) -I$(top_builddir)
 GTKDOC_LIBS = \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \
 	$(GST_BASE_LIBS)
 
 GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)

docs/plugins/gst-plugins-bad-plugins-docs.sgml

@@ -7,9 +7,9 @@
 
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GStreamer Bad Plugins &GST_MAJORMINOR; Plugins Reference Manual</title>
+    <title>GStreamer Bad Plugins &GST_API_VERSION; Plugins Reference Manual</title>
     <releaseinfo>
-      for GStreamer Bad Plugins &GST_MAJORMINOR; (&GST_VERSION;)
+      for GStreamer Bad Plugins &GST_API_VERSION; (&GST_VERSION;)
       The latest version of this documentation can be found on-line at
       <ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad/html/</ulink>.
     </releaseinfo>

docs/version.entities.in

@@ -1,2 +1,2 @@
-<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@">
+<!ENTITY GST_API_VERSION "@GST_API_VERSION@">
 <!ENTITY GST_VERSION "@VERSION@">

ext/apexsink/Makefile.am

@@ -4,7 +4,7 @@ libgstapexsink_la_SOURCES = gstapexplugin.c gstapexraop.c gstapexsink.c
 libgstapexsink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(APEXSINK_CFLAGS)
 libgstapexsink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-	-lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \
+	-lgstaudio-$(GST_API_VERSION) -lgstinterfaces-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(APEXSINK_LIBS)
 libgstapexsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstapexsink_la_LIBTOOLFLAGS = --tag=disable-static

ext/assrender/Makefile.am

@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstassrender.la
 
 libgstassrender_la_SOURCES = gstassrender.c
 libgstassrender_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ASSRENDER_CFLAGS)
-libgstassrender_la_LIBADD = $(ASSRENDER_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_MAJORMINOR@
+libgstassrender_la_LIBADD = $(ASSRENDER_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_API_VERSION@
 libgstassrender_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstassrender_la_LIBTOOLFLAGS = --tag=disable-static
 

ext/celt/Makefile.am

@@ -7,7 +7,7 @@ libgstcelt_la_CFLAGS = -DGST_USE_UNSTABLE_API \
 	$(CELT_CFLAGS)
 libgstcelt_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) \
-	-lgstaudio-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR) \
+	-lgstaudio-$(GST_API_VERSION) -lgsttag-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(CELT_LIBS)

ext/chromaprint/Makefile.am

@@ -6,7 +6,7 @@ libgstchromaprint_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
 	$(CHROMAPRINT_CFLAGS)
 libgstchromaprint_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_LIBS) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(GST_LIBS) \
 	$(CHROMAPRINT_LIBS)
 libgstchromaprint_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstchromaprint_la_LIBTOOLFLAGS = --tag=disable-static

ext/cog/Makefile.am

@@ -12,7 +12,7 @@ libgstcog_la_CFLAGS = \
 	$(ORC_CFLAGS) \
 	$(COG_CFLAGS)
 libgstcog_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(ORC_LIBS) \

ext/dirac/Makefile.am

@@ -11,7 +11,7 @@ libgstdirac_la_CXXFLAGS = \
 	$(DIRAC_CFLAGS) \
 	-DGST_USE_UNSTABLE_API
 libgstdirac_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \
         $(GST_PLUGINS_BASE_LIBS) \
         $(GST_BASE_LIBS) $(GST_LIBS) \
 	$(DIRAC_LIBS) -lz $(LIBM)

ext/directfb/Makefile.am

@@ -5,8 +5,8 @@ libgstdfbvideosink_la_SOURCES =  dfbvideosink.c
 libgstdfbvideosink_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
 			       $(DIRECTFB_CFLAGS)
 libgstdfbvideosink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-			       -lgstvideo-$(GST_MAJORMINOR) \
+			       -lgstvideo-$(GST_API_VERSION) \
-			       -lgstinterfaces-$(GST_MAJORMINOR) \
+			       -lgstinterfaces-$(GST_API_VERSION) \
 			       $(DIRECTFB_LIBS) $(LIBOIL_LIBS)
 libgstdfbvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdfbvideosink_la_LIBTOOLFLAGS = --tag=disable-static

ext/dts/Makefile.am

@@ -4,7 +4,7 @@ libgstdtsdec_la_SOURCES = gstdtsdec.c
 libgstdtsdec_la_CFLAGS = -DGST_USE_UNSTABLE_API \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
 libgstdtsdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
-	-lgstaudio-@GST_MAJORMINOR@ \
+	-lgstaudio-@GST_API_VERSION@ \
 	$(DTS_LIBS) $(ORC_LIBS)
 libgstdtsdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdtsdec_la_LIBTOOLFLAGS = --tag=disable-static

ext/faac/Makefile.am

@@ -5,7 +5,7 @@ libgstfaac_la_CFLAGS = -DGST_USE_UNSTABLE_API \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS) $(FAAC_CFLAGS)
 libgstfaac_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-	-lgstaudio-@GST_MAJORMINOR@ -lgstpbutils-@GST_MAJORMINOR@ \
+	-lgstaudio-@GST_API_VERSION@ -lgstpbutils-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(FAAC_LIBS)
 libgstfaac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstfaac_la_LIBTOOLFLAGS = --tag=disable-static

ext/faad/Makefile.am

@@ -4,7 +4,7 @@ libgstfaad_la_SOURCES = gstfaad.c
 libgstfaad_la_CFLAGS = -DGST_USE_UNSTABLE_API \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(FAAD_CFLAGS)
-libgstfaad_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
+libgstfaad_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(FAAD_LIBS)
 libgstfaad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstfaad_la_LIBTOOLFLAGS = --tag=disable-static

ext/flite/Makefile.am

@@ -7,7 +7,7 @@ libgstflite_la_CFLAGS = \
 	$(FLITE_CFLAGS)
 libgstflite_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) \
-	-lgstaudio-@GST_MAJORMINOR@ \
+	-lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(FLITE_LIBS)

ext/gsettings/Makefile.am

@@ -1,7 +1,7 @@
-gsettings_SCHEMAS = org.freedesktop.gstreamer-@GST_MAJORMINOR@.default-elements.gschema.xml
+gsettings_SCHEMAS = org.freedesktop.gstreamer-@GST_API_VERSION@.default-elements.gschema.xml
 
-org.freedesktop.gstreamer-@GST_MAJORMINOR@.default-elements.gschema.xml: org.freedesktop.gstreamer.default-elements.gschema.xml
+org.freedesktop.gstreamer-@GST_API_VERSION@.default-elements.gschema.xml: org.freedesktop.gstreamer.default-elements.gschema.xml
-	cp org.freedesktop.gstreamer.default-elements.gschema.xml org.freedesktop.gstreamer-@GST_MAJORMINOR@.default-elements.gschema.xml
+	cp org.freedesktop.gstreamer.default-elements.gschema.xml org.freedesktop.gstreamer-@GST_API_VERSION@.default-elements.gschema.xml
 
 if USE_GSETTINGS
 @GSETTINGS_RULES@

ext/gsettings/org.freedesktop.gstreamer.default-elements.gschema.xml.in

@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.freedesktop.gstreamer-@GST_MAJORMINOR@.default-elements" path="/desktop/gstreamer/@GST_MAJORMINOR@/default-elements/" gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.freedesktop.gstreamer-@GST_API_VERSION@.default-elements" path="/desktop/gstreamer/@GST_API_VERSION@/default-elements/" gettext-domain="@GETTEXT_PACKAGE@">
     <key name="sounds-audiosink" type="s">
       <default>"@DEFAULT_AUDIOSINK@"</default>
       <summary>default GStreamer sound events audiosink</summary>

ext/gsm/Makefile.am

@@ -7,7 +7,7 @@ libgstgsm_la_CFLAGS = \
 	$(GST_BASE_CFLAGS)
 libgstgsm_la_LIBADD = \
 	$(GSM_LIBS) \
-	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
+	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS)
 libgstgsm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstgsm_la_LIBTOOLFLAGS = --tag=disable-static

ext/jp2k/Makefile.am

@@ -4,7 +4,7 @@ libgstjp2k_la_SOURCES = gstjasperdec.c gstjasperenc.c gstjp2k.c
 libgstjp2k_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(JP2K_CFLAGS)
 libgstjp2k_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
 	$(GST_LIBS) $(JP2K_LIBS)
 libgstjp2k_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstjp2k_la_LIBTOOLFLAGS = --tag=disable-static

ext/kate/Makefile.am

@@ -10,7 +10,7 @@ endif
 
 # flags used to compile this plugin
 libgstkate_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TIGER_CFLAGS) $(KATE_CFLAGS)
-libgstkate_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR) $(GST_LIBS) $(TIGER_LIBS) $(KATE_LIBS)
+libgstkate_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) -lgsttag-$(GST_API_VERSION) $(GST_LIBS) $(TIGER_LIBS) $(KATE_LIBS)
 libgstkate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstkate_la_LIBTOOLFLAGS = --tag=disable-static
 

ext/ladspa/Makefile.am

@@ -6,8 +6,8 @@ libgstladspa_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_CFLAGS) $(LRDF_CFLAGS)
 libgstladspa_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la \
-	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
 	$(LIBM) $(LRDF_LIBS)
 libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstladspa_la_LIBTOOLFLAGS = --tag=disable-static

ext/lv2/Makefile.am

@@ -6,8 +6,8 @@ libgstlv2_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_CFLAGS) $(SLV2_CFLAGS)
 libgstlv2_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la \
-	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
 	$(LIBM) $(SLV2_LIBS)
 libgstlv2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstlv2_la_LIBTOOLFLAGS = --tag=disable-static

ext/mpeg2enc/Makefile.am

@@ -10,7 +10,7 @@ libgstmpeg2enc_la_SOURCES = \
 libgstmpeg2enc_la_CXXFLAGS = \
 	$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPEG2ENC_CFLAGS)
 libgstmpeg2enc_la_LIBADD = \
-        $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+        $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
         $(GST_LIBS) $(MPEG2ENC_LIBS)
 libgstmpeg2enc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmpeg2enc_la_LIBTOOLFLAGS = --tag=disable-static

ext/mplex/Makefile.am

@@ -9,7 +9,7 @@ libgstmplex_la_SOURCES = \
 libgstmplex_la_CXXFLAGS = \
 	$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPLEX_CFLAGS)
 libgstmplex_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
 	$(GST_LIBS) $(MPLEX_LIBS) 
 libgstmplex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(MPLEX_LDFLAGS)
 libgstmplex_la_LIBTOOLFLAGS = --tag=disable-static

ext/musicbrainz/Makefile.am

@@ -5,7 +5,7 @@ noinst_HEADERS = gsttrm.h
 libgsttrm_la_SOURCES = gsttrm.c
 libgsttrm_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(MUSICBRAINZ_CFLAGS)
 libgsttrm_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(MUSICBRAINZ_LIBS) \
-	-lgsttag-@GST_MAJORMINOR@
+	-lgsttag-@GST_API_VERSION@
 libgsttrm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsttrm_la_LIBTOOLFLAGS = --tag=disable-static
 

ext/nas/Makefile.am

@@ -4,7 +4,7 @@ libgstnassink_la_SOURCES = nassink.c
 libgstnassink_la_CFLAGS = \
 	$(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(NAS_CFLAGS)
 libgstnassink_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(NAS_LIBS)
+	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(NAS_LIBS)
 libgstnassink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstnassink_la_LIBTOOLFLAGS = --tag=disable-static
 

ext/ofa/Makefile.am

@@ -8,7 +8,7 @@ libgstofa_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 	$(OFA_CFLAGS) 
 
 libgstofa_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-        -lgstaudio-$(GST_MAJORMINOR) \
+        -lgstaudio-$(GST_API_VERSION) \
         $(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(OFA_LIBS)

ext/openal/Makefile.am

@@ -7,7 +7,7 @@ libgstopenal_la_SOURCES = gstopenal.c gstopenalsink.c gstopenalsrc.c
 
 # compiler and linker flags used to compile this plugin, set in configure.ac
 libgstopenal_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(OPENAL_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS)
-libgstopenal_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(OPENAL_LIBS)
+libgstopenal_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(OPENAL_LIBS)
 libgstopenal_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstopenal_la_LIBTOOLFLAGS = --tag=disable-static
 

ext/opencv/Makefile.am

@@ -33,7 +33,7 @@ libgstopencv_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(OPENCV_CFLAGS) \
 	-DCV_NO_BACKWARD_COMPATIBILITY
 
 libgstopencv_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(OPENCV_LIBS) \
-			$(GSTPB_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR)
+			$(GSTPB_BASE_LIBS) -lgstvideo-$(GST_API_VERSION)
 
 libgstopencv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstopencv_la_LIBTOOLFLAGS = --tag=disable-static

ext/opus/Makefile.am

@@ -8,8 +8,8 @@ libgstopus_la_CFLAGS = \
 	$(GST_CFLAGS) \
 	$(OPUS_CFLAGS)
 libgstopus_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
-	-lgsttag-$(GST_MAJORMINOR) -lgstrtp-$(GST_MAJORMINOR) \
+	-lgsttag-$(GST_API_VERSION) -lgstrtp-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(OPUS_LIBS)

ext/resindvd/Makefile.am

@@ -19,8 +19,8 @@ libresindvd_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
 $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
 $(GST_CFLAGS) $(DVDNAV_CFLAGS)
 libresindvd_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
--lgstinterfaces-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) \
+-lgstinterfaces-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
--lgstpbutils-$(GST_MAJORMINOR) \
+-lgstpbutils-$(GST_API_VERSION) \
 $(GST_BASE_LIBS) $(GST_LIBS) $(DVDNAV_LIBS)
 libresindvd_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libresindvd_la_LIBTOOLFLAGS = --tag=disable-static

ext/rsvg/Makefile.am

@@ -6,7 +6,7 @@ libgstrsvg_la_CFLAGS = \
 	$(GST_CFLAGS) \
 	$(RSVG_CFLAGS)
 libgstrsvg_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(RSVG_LIBS)

ext/schroedinger/Makefile.am

@@ -17,8 +17,8 @@ libgstschro_la_CFLAGS = \
 	-DGST_USE_UNSTABLE_API \
 	$(SCHRO_CFLAGS)
 libgstschro_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
         $(GST_BASE_LIBS) $(GST_LIBS) \
 	$(SCHRO_LIBS)
 libgstschro_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

ext/sdl/Makefile.am

@@ -7,9 +7,9 @@ libgstsdl_la_SOURCES = \
 
 libgstsdl_la_CFLAGS =  $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(SDL_CFLAGS)
 libgstsdl_la_LIBADD =  $(GST_PLUGINS_BASE_LIBS) \
-				-lgstvideo-$(GST_MAJORMINOR) \
+				-lgstvideo-$(GST_API_VERSION) \
-				-lgstaudio-$(GST_MAJORMINOR) \
+				-lgstaudio-$(GST_API_VERSION) \
-				-lgstinterfaces-$(GST_MAJORMINOR) \
+				-lgstinterfaces-$(GST_API_VERSION) \
 				$(SDL_LIBS)
 libgstsdl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
 libgstsdl_la_LIBTOOLFLAGS = --tag=disable-static

ext/soundtouch/Makefile.am

@@ -7,7 +7,7 @@ libgstsoundtouch_la_SOURCES = \
 
 libgstsoundtouch_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SOUNDTOUCH_CFLAGS)
 libgstsoundtouch_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(SOUNDTOUCH_CFLAGS)
-libgstsoundtouch_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS) $(SOUNDTOUCH_LIBS) $(LIBM)
+libgstsoundtouch_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS) $(SOUNDTOUCH_LIBS) $(LIBM)
 libgstsoundtouch_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsoundtouch_la_LIBTOOLFLAGS = --tag=disable-static
 

ext/voaacenc/Makefile.am

@@ -11,8 +11,8 @@ libgstvoaacenc_la_CFLAGS = -DGST_USE_UNSTABLE_API \
 	$(VOAACENC_CFLAGS)
 libgstvoaacenc_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) \
-	-lgstaudio-$(GST_MAJORMINOR) \
+	-lgstaudio-$(GST_API_VERSION) \
-	-lgstpbutils-$(GST_MAJORMINOR) \
+	-lgstpbutils-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(VOAACENC_LIBS)
@@ -22,6 +22,6 @@ libgstvoaacenc_la_LIBTOOLFLAGS = --tag=disable-static
 noinst_HEADERS = \
 	gstvoaacenc.h
 
-presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets
+presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets
 
 EXTRA_DIST = $(preset_DATA)

ext/voamrwbenc/Makefile.am

@@ -7,14 +7,14 @@ libgstvoamrwbenc_la_SOURCES = 	\
 libgstvoamrwbenc_la_CFLAGS = -DGST_USE_UNSTABLE_API \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(VOAMRWBENC_CFLAGS)
 libgstvoamrwbenc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-	-lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(VOAMRWBENC_LIBS)
+	-lgstaudio-$(GST_API_VERSION) $(GST_BASE_LIBS) $(VOAMRWBENC_LIBS)
 libgstvoamrwbenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvoamrwbenc_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS =	\
 	gstvoamrwbenc.h
 
-presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets
+presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets
 preset_DATA = GstVoAmrwbEnc.prs
 
 EXTRA_DIST = $(preset_DATA)

ext/vp8/Makefile.am

@@ -14,8 +14,8 @@ libgstvp8_la_CFLAGS = \
 	$(GST_CFLAGS) \
 	-DGST_USE_UNSTABLE_API
 libgstvp8_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \
-	$(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ -lgstvideo-@GST_MAJORMINOR@ \
+	$(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ -lgstvideo-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(VPX_LIBS)
 libgstvp8_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvp8_la_LIBTOOLFLAGS = --tag=disable-static
@@ -25,7 +25,7 @@ noinst_HEADERS = \
 	gstvp8enc.h \
 	gstvp8utils.h
 
-presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets
+presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets
 preset_DATA = GstVP8Enc.prs
 
 EXTRA_DIST = $(preset_DATA)

ext/wayland/Makefile.am

@@ -4,8 +4,8 @@ libgstwaylandsink_la_SOURCES =  gstwaylandsink.c
 libgstwaylandsink_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
                                $(WAYLAND_CFLAGS)
 libgstwaylandsink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-                               -lgstvideo-$(GST_MAJORMINOR) \
+                               -lgstvideo-$(GST_API_VERSION) \
-                               -lgstinterfaces-$(GST_MAJORMINOR) \
+                               -lgstinterfaces-$(GST_API_VERSION) \
                                $(WAYLAND_LIBS) $(LIBOIL_LIBS)
 libgstwaylandsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstwaylandsink_la_LIBTOOLFLAGS = --tag=disable-static

ext/zbar/Makefile.am

@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstzbar.la
 libgstzbar_la_SOURCES = gstzbar.c
 
 libgstzbar_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ZBAR_CFLAGS)
-libgstzbar_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZBAR_LIBS)
+libgstzbar_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZBAR_LIBS)
 libgstzbar_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstzbar_la_LIBTOOLFLAGS = --tag=disable-static
 

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_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/basecamerabinsrc
-libgstbasecamerabinsrc_@GST_MAJORMINOR@include_HEADERS = \
+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 = \
+libgstbasecamerabinsrc_@GST_API_VERSION@_la_LIBADD = \
-	-lgstapp-$(GST_MAJORMINOR) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
+	-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) \
+	 -:SOURCES $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_CFLAGS) \
+	 -:CFLAGS $(DEFS) $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LDFLAGS) \
+	 -:LDFLAGS $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LIBADD) \
+	           $(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 \
 	> $@

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 = \
+libgstcodecparsers_@GST_API_VERSION@includedir = \
-	$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/codecparsers
+	$(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) \
+	 -:CFLAGS $(DEFS) $(libgstcodecparsers_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstcodecparsers_@GST_MAJORMINOR@_la_LDFLAGS) \
+	 -:LDFLAGS $(libgstcodecparsers_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstcodecparsers@GST_MAJORMINOR@_la_LIBADD) \
+	           $(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 \

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_API_VERSION@_la_LIBADD = $(GST_LIBS) 
-libgstphotography_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+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) \
+	 -:CFLAGS $(DEFS) $(libgstphotography_@GST_API_VERSION@_la_CFLAGS) \
-	 -:LDFLAGS $(libgstphotography_@GST_MAJORMINOR@_la_LDFLAGS) \
+	 -:LDFLAGS $(libgstphotography_@GST_API_VERSION@_la_LDFLAGS) \
-	           $(libgstphotography_@GST_MAJORMINOR@_la_LIBADD) \
+	           $(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 \

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_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/signalprocessor
-libgstsignalprocessor_@GST_MAJORMINOR@include_HEADERS = gstsignalprocessor.h
+libgstsignalprocessor_@GST_API_VERSION@include_HEADERS = gstsignalprocessor.h
 
-libgstsignalprocessor_@GST_MAJORMINOR@_la_SOURCES = gstsignalprocessor.c
+libgstsignalprocessor_@GST_API_VERSION@_la_SOURCES = gstsignalprocessor.c
-libgstsignalprocessor_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstsignalprocessor_@GST_API_VERSION@_la_CFLAGS = \
     $(GST_PLUGINS_BAD_CFLAGS) \
     $(GST_PLUGINS_BASE_CFLAGS) \
     $(GST_CFLAGS)
-libgstsignalprocessor_@GST_MAJORMINOR@_la_LIBADD = \
+libgstsignalprocessor_@GST_API_VERSION@_la_LIBADD = \
-    $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
+    $(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)
 

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_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/video
-libgstbasevideo_@GST_MAJORMINOR@include_HEADERS = \
+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_API_VERSION@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_API_VERSION@
-libgstbasevideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+libgstbasevideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 

gst-plugins-bad.spec.in

@@ -1,4 +1,4 @@
-%define majorminor   @GST_MAJORMINOR@
+%define majorminor   @GST_API_VERSION@
 %define gstreamer    gstreamer
 
 %define gst_minver   0.10.30

gst/adpcmdec/Makefile.am

@@ -7,7 +7,7 @@ libgstadpcmdec_la_SOURCES = adpcmdec.c
 # add other _CFLAGS and _LIBS as needed
 libgstadpcmdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstadpcmdec_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
+	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstadpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstadpcmdec_la_LIBTOOLFLAGS = --tag=disable-static

gst/adpcmenc/Makefile.am

@@ -6,7 +6,7 @@ libgstadpcmenc_la_SOURCES = adpcmenc.c
 # flags used to compile this plugin
 # add other _CFLAGS and _LIBS as needed
 libgstadpcmenc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstadpcmenc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
+libgstadpcmenc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_LIBS)
 libgstadpcmenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstadpcmenc_la_LIBTOOLFLAGS = --tag=disable-static

gst/aiff/Makefile.am

@@ -7,7 +7,7 @@ libgstaiff_la_CFLAGS = \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
 libgstaiff_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) \
 	$(LIBM)
 libgstaiff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

gst/asfmux/Makefile.am

@@ -13,7 +13,7 @@ libgstasfmux_la_SOURCES = gstasfmux.c \
 # add other _CFLAGS and _LIBS as needed
 libgstasfmux_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) 
 libgstasfmux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-                         -lgstrtp-@GST_MAJORMINOR@
+                         -lgstrtp-@GST_API_VERSION@
 libgstasfmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstasfmux_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/audiobuffer/Makefile.am

@@ -4,7 +4,7 @@ libgstaudiobuffer_la_SOURCES = gstaudioringbuffer.c
 libgstaudiobuffer_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
     $(GST_CFLAGS) 
 libgstaudiobuffer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
-			   -lgstaudio-$(GST_MAJORMINOR)
+			   -lgstaudio-$(GST_API_VERSION)
 
 libgstaudiobuffer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudiobuffer_la_LIBTOOLFLAGS = --tag=disable-static

gst/audiovisualizers/Makefile.am

@@ -11,8 +11,8 @@ libgstaudiovisualizers_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
 libgstaudiovisualizers_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
-	-lgstvideo-$(GST_MAJORMINOR) -lgstfft-$(GST_MAJORMINOR) \
+	-lgstvideo-$(GST_API_VERSION) -lgstfft-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS)  $(GST_LIBS) $(LIBM)
 libgstaudiovisualizers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudiovisualizers_la_LIBTOOLFLAGS = --tag=disable-static

gst/bayer/Makefile.am

@@ -14,7 +14,7 @@ libgstbayer_la_SOURCES = \
 libgstbayer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
     $(ORC_CFLAGS) \
     $(GST_CFLAGS)
-libgstbayer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+libgstbayer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
     $(ORC_LIBS) \
     $(GST_BASE_LIBS)
 libgstbayer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

gst/camerabin/Makefile.am

@@ -29,9 +29,9 @@ libgstcamerabin_la_CFLAGS = \
 	$(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
 	-DGST_USE_UNSTABLE_API
 libgstcamerabin_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_API_VERSION).la \
 	$(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-	-lgstinterfaces-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR)
+	-lgstinterfaces-$(GST_API_VERSION) -lgsttag-$(GST_API_VERSION)
 
 libgstcamerabin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstcamerabin_la_LIBTOOLFLAGS = --tag=disable-static
@@ -56,8 +56,8 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
 	 -:LDFLAGS $(libgstcamerabin_la_LDFLAGS) \
 	           $(libgstcamerabin_la_LIBADD) \
 	           -ldl \
-	 -:LIBFILTER_STATIC gstphotography-@GST_MAJORMINOR@ \
+	 -:LIBFILTER_STATIC gstphotography-@GST_API_VERSION@ \
-	          gstbasecamerabinsrc-@GST_MAJORMINOR@ \
+	          gstbasecamerabinsrc-@GST_API_VERSION@ \
 	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
 		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
 	> $@

gst/camerabin2/Makefile.am

@@ -13,9 +13,9 @@ libgstcamerabin2_la_CFLAGS = \
 	-DGST_USE_UNSTABLE_API
 
 libgstcamerabin2_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_API_VERSION).la \
-	$(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-$(GST_API_VERSION).la \
-	$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR) -lgstapp-$(GST_MAJORMINOR) -lgstpbutils-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) -lgsttag-$(GST_API_VERSION) -lgstapp-$(GST_API_VERSION) -lgstpbutils-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 
 libgstcamerabin2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
@@ -36,8 +36,8 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
 	 -:LDFLAGS $(libgstcamerabin2_la_LDFLAGS) \
 	           $(libgstcamerabin2_la_LIBADD) \
 	           -ldl \
-	 -:LIBFILTER_STATIC gstphotography-@GST_MAJORMINOR@ \
+	 -:LIBFILTER_STATIC gstphotography-@GST_API_VERSION@ \
-	          gstbasecamerabinsrc-@GST_MAJORMINOR@ \
+	          gstbasecamerabinsrc-@GST_API_VERSION@ \
 	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
 		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
 	> $@

gst/cdxaparse/Makefile.am

@@ -18,7 +18,7 @@ libgstcdxaparse_la_LIBADD = \
 	$(GST_LIBS) \
 	$(GST_BASE_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
-	-lgstriff-@GST_MAJORMINOR@
+	-lgstriff-@GST_API_VERSION@
 
 libgstcdxaparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstcdxaparse_la_LIBTOOLFLAGS = --tag=disable-static

gst/coloreffects/Makefile.am

@@ -9,7 +9,7 @@ libgstcoloreffects_la_CFLAGS = \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
 libgstcoloreffects_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS)
 libgstcoloreffects_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

gst/debugutils/Makefile.am

@@ -29,8 +29,8 @@ libgstdebugutilsbad_la_SOURCES = \
 nodist_libgstdebugutilsbad_la_SOURCES = $(BUILT_SOURCES)
 libgstdebugutilsbad_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
 libgstdebugutilsbad_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-	-lgstvideo-$(GST_MAJORMINOR) \
+	-lgstvideo-$(GST_API_VERSION) \
-	-lgstinterfaces-$(GST_MAJORMINOR) $(GST_LIBS)
+	-lgstinterfaces-$(GST_API_VERSION) $(GST_LIBS)
 libgstdebugutilsbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdebugutilsbad_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/dtmf/Makefile.am

@@ -16,7 +16,7 @@ noinst_HEADERS = gstdtmfsrc.h \
 
 libgstdtmf_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
 	-DEXTERN_BUF -DRTP_SUPPORT
-libgstdtmf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \
+libgstdtmf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstdtmf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdtmf_la_LIBTOOLFLAGS = --tag=disable-static

gst/dvbsuboverlay/Makefile.am

@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstdvbsuboverlay.la
 libgstdvbsuboverlay_la_SOURCES = dvb-sub.c gstdvbsuboverlay.c
 
 libgstdvbsuboverlay_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstdvbsuboverlay_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_LIBS)
+libgstdvbsuboverlay_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS)
 libgstdvbsuboverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdvbsuboverlay_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/dvdspu/Makefile.am

@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstdvdspu.la
 libgstdvdspu_la_SOURCES = gstdvdspu.c gstdvdspu-render.c gstspu-vobsub.c gstspu-vobsub-render.c gstspu-pgs.c
 
 libgstdvdspu_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstdvdspu_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+libgstdvdspu_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
      $(GST_LIBS)
 libgstdvdspu_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdvdspu_la_LIBTOOLFLAGS = --tag=disable-static

gst/faceoverlay/Makefile.am

@@ -5,7 +5,7 @@ libgstfaceoverlay_la_SOURCES = gstfaceoverlay.c
 
 # compiler and linker flags used to compile this plugin, set in configure.ac
 libgstfaceoverlay_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstfaceoverlay_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_LIBS)
+libgstfaceoverlay_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS)
 libgstfaceoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstfaceoverlay_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/fieldanalysis/Makefile.am

@@ -14,8 +14,8 @@ libgstfieldanalysis_la_CFLAGS = \
 	$(ORC_CFLAGS)
 
 libgstfieldanalysis_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(ORC_LIBS)

gst/frei0r/Makefile.am

@@ -8,7 +8,7 @@ libgstfrei0r_la_SOURCES = \
 
 libgstfrei0r_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstfrei0r_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
-	-lgstvideo-@GST_MAJORMINOR@
+	-lgstvideo-@GST_API_VERSION@
 libgstfrei0r_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstfrei0r_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/gaudieffects/Makefile.am

@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstgaudieffects.la
 libgstgaudieffects_la_SOURCES = gstburn.c gstchromium.c gstdilate.c \
         gstdodge.c gstexclusion.c gstgaussblur.c gstsolarize.c gstplugin.c
 libgstgaudieffects_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstgaudieffects_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_LIBS) $(LIBM)
+libgstgaudieffects_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS) $(LIBM)
 libgstgaudieffects_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstgaudieffects_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/geometrictransform/Makefile.am

@@ -23,8 +23,8 @@ libgstgeometrictransform_la_SOURCES = plugin.c \
 libgstgeometrictransform_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
 			    $(GST_PLUGINS_BASE_CFLAGS)
 libgstgeometrictransform_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-                            -lgstvideo-@GST_MAJORMINOR@ \
+                            -lgstvideo-@GST_API_VERSION@ \
-                            -lgstinterfaces-@GST_MAJORMINOR@ \
+                            -lgstinterfaces-@GST_API_VERSION@ \
                             $(GST_BASE_LIBS) \
                             $(GST_LIBS) $(LIBM)
 libgstgeometrictransform_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

gst/id3tag/Makefile.am

@@ -9,7 +9,7 @@ libgstid3tag_la_CFLAGS = \
 	$(GST_CFLAGS)
 
 libgstid3tag_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \
 	$(GST_LIBS)
 
 libgstid3tag_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

gst/inter/Makefile.am

@@ -28,7 +28,7 @@ libgstinter_la_CFLAGS = \
 	$(GST_CFLAGS)
 
 libgstinter_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(LIBM)

gst/interlace/Makefile.am

@@ -9,7 +9,7 @@ libgstinterlace_la_CFLAGS = \
 
 libgstinterlace_la_LIBADD = \
 	$(GST_LIBS) \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
 	$(LIBM)
 
 libgstinterlace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

gst/jpegformat/Makefile.am

@@ -5,8 +5,8 @@ libgstjpegformat_la_CFLAGS = \
     $(GST_PLUGINS_BASE_CFLAGS) \
     $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstjpegformat_la_LIBADD = \
-    $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ \
+    $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_API_VERSION@ \
-    -lgsttag-@GST_MAJORMINOR@ $(GST_LIBS) $(GST_BASE_LIBS)
+    -lgsttag-@GST_API_VERSION@ $(GST_LIBS) $(GST_BASE_LIBS)
 libgstjpegformat_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstjpegformat_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/liveadder/Makefile.am

@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstliveadder.la
 libgstliveadder_la_SOURCES = liveadder.c
 libgstliveadder_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstliveadder_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
+	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstliveadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstliveadder_la_LIBTOOLFLAGS = --tag=disable-static

gst/mpegdemux/Makefile.am

@@ -17,7 +17,7 @@ libgstmpegdemux_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstmpegdemux_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstmpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmpegdemux_la_LIBTOOLFLAGS = --tag=disable-static

gst/mpegtsdemux/Makefile.am

@@ -13,7 +13,7 @@ libgstmpegtsdemux_la_CFLAGS = \
 	$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstmpegtsdemux_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstmpegtsdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmpegtsdemux_la_LIBTOOLFLAGS = --tag=disable-static

gst/mpegtsmux/Makefile.am

@@ -9,7 +9,7 @@ libgstmpegtsmux_la_SOURCES = \
 
 libgstmpegtsmux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstmpegtsmux_la_LIBADD = $(top_builddir)/gst/mpegtsmux/tsmux/libtsmux.la \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS)
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS)
 libgstmpegtsmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmpegtsmux_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/mxf/Makefile.am

@@ -21,7 +21,7 @@ libgstmxf_la_SOURCES = \
 
 libgstmxf_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
 libgstmxf_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-	-lgstvideo-@GST_MAJORMINOR@
+	-lgstvideo-@GST_API_VERSION@
 libgstmxf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmxf_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/patchdetect/Makefile.am

@@ -9,7 +9,7 @@ libgstpatchdetect_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_CFLAGS)
 libgstpatchdetect_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(LIBM)

gst/pnm/Makefile.am

@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstpnm.la
 
 libgstpnm_la_SOURCES = gstpnmutils.c gstpnm.c gstpnmdec.c gstpnmenc.c
 libgstpnm_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstpnm_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_MAJORMINOR@
+libgstpnm_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_API_VERSION@
 libgstpnm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstpnm_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/rawparse/Makefile.am

@@ -12,7 +12,7 @@ libgstrawparse_la_CFLAGS = \
 		$(GST_CFLAGS)
 libgstrawparse_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) \
-	-lgstvideo-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ \
+	-lgstvideo-@GST_API_VERSION@ -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS)
 libgstrawparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

gst/real/Makefile.am

@@ -10,7 +10,7 @@ libgstreal_la_CFLAGS = \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
 libgstreal_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
+	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS)
 libgstreal_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstreal_la_LIBTOOLFLAGS = --tag=disable-static

gst/rtpmux/Makefile.am

@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstrtpmux.la
 libgstrtpmux_la_SOURCES = gstrtpmuxer.c gstrtpmux.c gstrtpdtmfmux.c
 
 libgstrtpmux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstrtpmux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \
+libgstrtpmux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstrtpmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstrtpmux_la_LIBTOOLFLAGS = --tag=disable-static
@@ -21,5 +21,5 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
 	           $(libgstrtpmux_la_LIBADD) \
 	           -ldl \
 	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.11' \
+		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-@GST_API_VERSION@' \
 	> $@

gst/rtpvp8/Makefile.am

@@ -11,7 +11,7 @@ noinst_HEADERS = gstrtpvp8depay.h \
 
 libgstrtpvp8_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstrtpvp8_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \
+libgstrtpvp8_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstrtpvp8_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstrtpvp8_la_LIBTOOLFLAGS = --tag=disable-static
@@ -27,5 +27,5 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
 	           $(libgstrtpvp8_la_LIBADD) \
 	           -ldl \
 	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.11' \
+		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-@GST_API_VERSION@' \
 	> $@

gst/scaletempo/Makefile.am

@@ -6,7 +6,7 @@ libgstscaletempoplugin_la_SOURCES = gstscaletempoplugin.c gstscaletempo.c
 # flags used to compile this plugin
 # add other _CFLAGS and _LIBS as needed
 libgstscaletempoplugin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstscaletempoplugin_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
+libgstscaletempoplugin_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_LIBS) $(GST_BASE_LIBS)
 libgstscaletempoplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstscaletempoplugin_la_LIBTOOLFLAGS = --tag=disable-static

gst/sdp/Makefile.am

@@ -4,8 +4,8 @@ libgstsdpelem_la_SOURCES = gstsdpelem.c gstsdpdemux.h gstsdpdemux.c
 
 libgstsdpelem_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
 libgstsdpelem_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GIO_LIBS) \
-		       -lgstinterfaces-@GST_MAJORMINOR@ \
+		       -lgstinterfaces-@GST_API_VERSION@ \
-		       -lgstrtp-@GST_MAJORMINOR@ -lgstsdp-@GST_MAJORMINOR@ \
+		       -lgstrtp-@GST_API_VERSION@ -lgstsdp-@GST_API_VERSION@ \
 		       $(GST_LIBS) $(WIN32_LIBS)
 libgstsdpelem_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsdpelem_la_LIBTOOLFLAGS = --tag=disable-static

gst/segmentclip/Makefile.am

@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstsegmentclip.la
 libgstsegmentclip_la_SOURCES = gstsegmentclip.c gstaudiosegmentclip.c gstvideosegmentclip.c plugin.c
 
 libgstsegmentclip_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstsegmentclip_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-@GST_MAJORMINOR@
+libgstsegmentclip_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-@GST_API_VERSION@
 libgstsegmentclip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsegmentclip_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/siren/Makefile.am

@@ -10,7 +10,7 @@ libgstsiren_la_SOURCES = gstsiren.c \
 
 libgstsiren_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
-libgstsiren_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
+libgstsiren_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstsiren_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsiren_la_LIBTOOLFLAGS = --tag=disable-static

gst/smooth/Makefile.am

@@ -7,7 +7,7 @@ libgstsmooth_la_CFLAGS = \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
 libgstsmooth_la_LIBADD =  \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS)
 libgstsmooth_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

gst/stereo/Makefile.am

@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgststereo.la
 
 libgststereo_la_SOURCES = gststereo.c
 libgststereo_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
-libgststereo_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR)
+libgststereo_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION)
 libgststereo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgststereo_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/videofilters/Makefile.am

@@ -15,7 +15,7 @@ libgstvideofiltersbad_la_CFLAGS = \
 	$(GST_CFLAGS) \
 	$(ORC_CFLAGS)
 libgstvideofiltersbad_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
 	$(ORC_LIBS) \

gst/videomeasure/Makefile.am

@@ -13,7 +13,7 @@ libgstvideomeasure_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
     $(GST_BASE_CFLAGS) \
     $(GST_CFLAGS)
 libgstvideomeasure_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-    -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
+    -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstvideomeasure_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideomeasure_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/videoparsers/Makefile.am

@@ -11,8 +11,8 @@ libgstvideoparsersbad_la_CFLAGS = \
 	-DGST_USE_UNSTABLE_API \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstvideoparsersbad_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-$(GST_API_VERSION).la \
-	$(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstvideoparsersbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideoparsersbad_la_LIBTOOLFLAGS = --tag=disable-static
@@ -32,8 +32,8 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
 	 -:LDFLAGS $(libgstvideoparsersbad_la_LDFLAGS) \
 	           $(libgstvideoparsersbad_la_LIBADD) \
 	           -ldl \
-	 -:LIBFILTER_STATIC gstbaseparse-@GST_MAJORMINOR@ \
+	 -:LIBFILTER_STATIC gstbaseparse-@GST_API_VERSION@ \
-	                    gstcodecparsers-@GST_MAJORMINOR@ \
+	                    gstcodecparsers-@GST_API_VERSION@ \
 	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
 		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
 	> $@

gst/videosignal/Makefile.am

@@ -9,7 +9,7 @@ libgstvideosignal_la_SOURCES = gstvideosignal.c   \
 
 libgstvideosignal_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
 			    $(GST_PLUGINS_BASE_CFLAGS)
-libgstvideosignal_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS)
+libgstvideosignal_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS)
 libgstvideosignal_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideosignal_la_LIBTOOLFLAGS = --tag=disable-static
 

gst/y4m/Makefile.am

@@ -4,8 +4,8 @@ plugin_LTLIBRARIES = libgsty4mdec.la
 libgsty4mdec_la_SOURCES = gsty4mdec.c
 libgsty4mdec_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
 libgsty4mdec_la_LIBADD = \
-	$(GST_BASE_PLUGINS_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+	$(GST_BASE_PLUGINS_LIBS) -lgstvideo-@GST_API_VERSION@ \
-	$(GST_BASE_LIBS) -lgstbase-@GST_MAJORMINOR@ \
+	$(GST_BASE_LIBS) -lgstbase-@GST_API_VERSION@ \
 	$(GST_LIBS)
 libgsty4mdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsty4mdec_la_LIBTOOLFLAGS = --tag=disable-static

pkgconfig/Makefile.am

@@ -1,13 +1,13 @@
 ### all of the standard pc files we need to generate
 pcverfiles =  \
-	gstreamer-plugins-bad-@GST_MAJORMINOR@.pc \
+	gstreamer-plugins-bad-@GST_API_VERSION@.pc \
-	gstreamer-codecparsers-@GST_MAJORMINOR@.pc \
+	gstreamer-codecparsers-@GST_API_VERSION@.pc \
-	gstreamer-basevideo-@GST_MAJORMINOR@.pc
+	gstreamer-basevideo-@GST_API_VERSION@.pc
 
 pcverfiles_uninstalled = \
-	gstreamer-plugins-bad-@GST_MAJORMINOR@-uninstalled.pc \
+	gstreamer-plugins-bad-@GST_API_VERSION@-uninstalled.pc \
-	gstreamer-codecparsers-@GST_MAJORMINOR@-uninstalled.pc \
+	gstreamer-codecparsers-@GST_API_VERSION@-uninstalled.pc \
-	gstreamer-basevideo-@GST_MAJORMINOR@-uninstalled.pc
+	gstreamer-basevideo-@GST_API_VERSION@-uninstalled.pc
 
 all-local: $(pcverfiles) $(pcverfiles_uninstalled)
 
@@ -16,9 +16,9 @@ cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY))
 cp_verbose_0 = @echo "  CP     $@";
 
 ### how to generate versioned .pc files from .pc files in this dir
-%-@GST_MAJORMINOR@.pc: %.pc
+%-@GST_API_VERSION@.pc: %.pc
 	$(cp_verbose_0)cp $< $@
-%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
+%-@GST_API_VERSION@-uninstalled.pc: %-uninstalled.pc
 	$(cp_verbose_0)cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig

pkgconfig/gstreamer-basevideo-uninstalled.pc.in

@@ -5,8 +5,8 @@ includedir=${pcfiledir}/../gst-libs
 
 Name: GStreamer base video, Uninstalled
 Description: Base class, interface and utilities for video elements, Uninstalled
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
 Version: @VERSION@
-Libs: -L${libdir} ${libdir}/libgstbasevideo-@GST_MAJORMINOR@.la
+Libs: -L${libdir} ${libdir}/libgstbasevideo-@GST_API_VERSION@.la
 Cflags: -I${includedir}
 

pkgconfig/gstreamer-basevideo.pc.in

@@ -1,12 +1,12 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+includedir=@includedir@/gstreamer-@GST_API_VERSION@
 
 Name: GStreamer base video
 Description: Base class, interface and utilities for video elements
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
 Version: @VERSION@
-Libs: -L${libdir} -lgstbasevideo-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstbasevideo-@GST_API_VERSION@
 Cflags: -I${includedir}
 

pkgconfig/gstreamer-codecparsers-uninstalled.pc.in

@@ -5,8 +5,8 @@ includedir=${pcfiledir}/../gst-libs
 
 Name: GStreamer codec parsers, Uninstalled
 Description: Bitstream parsers for GStreamer elements, uninstalled
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
 Version: @VERSION@
-Libs: -L${libdir} ${libdir}/libgstcodecparsers-@GST_MAJORMINOR@.la
+Libs: -L${libdir} ${libdir}/libgstcodecparsers-@GST_API_VERSION@.la
 Cflags: -I${includedir}
 

pkgconfig/gstreamer-codecparsers.pc.in

@@ -1,12 +1,12 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+includedir=@includedir@/gstreamer-@GST_API_VERSION@
 
 Name: GStreamer codec parsers
 Description: Bitstream parsers for GStreamer elements
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
 Version: @VERSION@
-Libs: -L${libdir} -lgstcodecparsers-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstcodecparsers-@GST_API_VERSION@
 Cflags: -I${includedir}