gst: Update versioning

diff --git a/configure.ac b/configure.ac
index 3a8ad0d..2248d20 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,11 +37,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
-GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
-dnl we override it here if we need to for the release candidate of new series
-GST_MAJORMINOR=0.11
-AC_SUBST(GST_MAJORMINOR)
+dnl our libraries and install dirs use GST_API_VERSION in the filename
+dnl to allow side-by-side installation of different API versions
+GST_API_VERSION=1.0
+AC_SUBST(GST_API_VERSION)
+AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION",
+  [GStreamer API Version])
 
 AG_GST_LIBTOOL_PREPARE
 
@@ -69,7 +70,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-good-$GST_MAJORMINOR])
+AG_GST_GETTEXT([gst-plugins-good-$GST_API_VERSION])
 
 dnl *** check for arguments to configure ***
 
@@ -212,14 +213,14 @@ ORC_CHECK([0.4.11])
 
 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_BASE($GST_MAJORMINOR, [$GST_REQ], yes)
-AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_REQ], yes)
-AG_GST_CHECK_GST_NET($GST_MAJORMINOR, [$GST_REQ], yes)
-AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
-AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], yes)
-
-GST_TOOLS_DIR=`$PKG_CONFIG --variable=toolsdir gstreamer-$GST_MAJORMINOR`
+AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ], yes)
+AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ], yes)
+AG_GST_CHECK_GST_CONTROLLER($GST_API_VERSION, [$GST_REQ], yes)
+AG_GST_CHECK_GST_NET($GST_API_VERSION, [$GST_REQ], yes)
+AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no)
+AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ], yes)
+
+GST_TOOLS_DIR=`$PKG_CONFIG --variable=toolsdir gstreamer-$GST_API_VERSION`
 if test -z $GST_TOOLS_DIR; then
   AC_MSG_ERROR([no tools dir defined in GStreamer pkg-config file; core upgrade needed.])
 fi
@@ -232,8 +233,8 @@ AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
 
 dnl Check for documentation xrefs
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
-GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`"
-GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_MAJORMINOR`"
+GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_API_VERSION`"
+GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_API_VERSION`"
 AC_SUBST(GLIB_PREFIX)
 AC_SUBST(GST_PREFIX)
 AC_SUBST(GSTPB_PREFIX)
@@ -1162,7 +1163,7 @@ sed \
     -e 's/.* GST_DATADIR$/#define GST_DATADIR PREFIX "\\\\share"/' \
     -e 's/.* GST_LEVEL_DEFAULT$/#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR/' \
     -e 's/.* GST_LICENSE$/#define GST_LICENSE "'$GST_LICENSE'"/' \
-    -e 's/.* GST_MAJORMINOR$/#define GST_MAJORMINOR "'$GST_MAJORMINOR'"/' \
+    -e 's/.* GST_API_VERSION$/#define GST_API_VERSION "'$GST_API_VERSION'"/' \
     -e "s,.* GST_PACKAGE_NAME$,#define GST_PACKAGE_NAME \"${GST_PACKAGE_NAME}\"," \
     -e 's/.* GST_PACKAGE_ORIGIN$/#define GST_PACKAGE_ORIGIN "Unknown package origin"/' \
     -e "s,.* GST_PACKAGE_RELEASE_DATETIME$,#define GST_PACKAGE_RELEASE_DATETIME \"${GST_PACKAGE_RELEASE_DATETIME}\"," \

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index c396801..61240de 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/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-good
 DOC_MODULE=$(MODULE)-plugins
 

diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index 35a96aa..a539978 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -8,9 +8,9 @@
 
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GStreamer Good Plugins &GST_MAJORMINOR; Plugins Reference Manual</title>
+    <title>GStreamer Good Plugins &GST_API_VERSION; Plugins Reference Manual</title>
     <releaseinfo>
-      for GStreamer Good Plugins &GST_MAJORMINOR; (&GST_VERSION;)
+      for GStreamer Good 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-good/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-good/html/</ulink>.
     </releaseinfo>

diff --git a/docs/version.entities.in b/docs/version.entities.in
index 79a6898..286989f 100644 (file)
--- a/docs/version.entities.in
+++ b/docs/version.entities.in
@@ -1,2 +1,2 @@
-<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@">
+<!ENTITY GST_API_VERSION "@GST_API_VERSION@">
 <!ENTITY GST_VERSION "@VERSION@">

diff --git a/ext/aalib/Makefile.am b/ext/aalib/Makefile.am
index 8941704..c106242 100644 (file)
--- a/ext/aalib/Makefile.am
+++ b/ext/aalib/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstaasink.la
 
 libgstaasink_la_SOURCES = gstaasink.c
 libgstaasink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AALIB_CFLAGS)
-libgstaasink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS) $(AALIB_LIBS)
+libgstaasink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS) $(AALIB_LIBS)
 libgstaasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaasink_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/ext/cairo/Makefile.am b/ext/cairo/Makefile.am
index 7fa8fdc..35c708e 100644 (file)
--- a/ext/cairo/Makefile.am
+++ b/ext/cairo/Makefile.am
@@ -36,7 +36,7 @@ libgstcairo_la_CFLAGS = \
        $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS) $(CAIRO_CFLAGS) $(CAIRO_GOBJECT_CFLAGS)
 libgstcairo_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(CAIRO_LIBS) $(CAIRO_GOBJECT_LIBS) $(LIBM)
 libgstcairo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstcairo_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/dv/Makefile.am b/ext/dv/Makefile.am
index 4091a5e..aa2ae23 100644 (file)
--- a/ext/dv/Makefile.am
+++ b/ext/dv/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstdv.la
 libgstdv_la_SOURCES = gstdv.c gstdvdec.c gstdvdemux.c gstsmptetimecode.c
 libgstdv_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBDV_CFLAGS)
 libgstdv_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBDV_LIBS)
 libgstdv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdv_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/flac/Makefile.am b/ext/flac/Makefile.am
index 89805a3..ba91533 100644 (file)
--- a/ext/flac/Makefile.am
+++ b/ext/flac/Makefile.am
@@ -4,8 +4,8 @@ libgstflac_la_SOURCES = gstflac.c gstflacdec.c gstflacenc.c gstflactag.c
 libgstflac_la_CFLAGS = -DGST_USE_UNSTABLE_API \
        $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(FLAC_CFLAGS)
 libgstflac_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
-       -lgstaudio-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \
+       -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(FLAC_LIBS)
 libgstflac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstflac_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am
index 32a82ef..ad7476d 100644 (file)
--- a/ext/gdk_pixbuf/Makefile.am
+++ b/ext/gdk_pixbuf/Makefile.am
@@ -8,7 +8,7 @@ libgstgdkpixbuf_la_CFLAGS = \
        $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS) $(GDK_PIXBUF_CFLAGS)
 libgstgdkpixbuf_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_CONTROLLER_LIBS) \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) $(GDK_PIXBUF_LIBS)

diff --git a/ext/jack/Makefile.am b/ext/jack/Makefile.am
index cf77899..b9ff9f6 100644 (file)
--- a/ext/jack/Makefile.am
+++ b/ext/jack/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstjack.la
 
 libgstjack_la_SOURCES = gstjackutil.c gstjack.c gstjackaudiosrc.c gstjackaudiosink.c gstjackaudioclient.c
 libgstjack_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(JACK_CFLAGS)
-libgstjack_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(JACK_LIBS)
+libgstjack_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(JACK_LIBS)
 libgstjack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstjack_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/ext/jpeg/Makefile.am b/ext/jpeg/Makefile.am
index eb581e1..2f30617 100644 (file)
--- a/ext/jpeg/Makefile.am
+++ b/ext/jpeg/Makefile.am
@@ -7,7 +7,7 @@ libgstjpeg_la_SOURCES = \
 # deprected gstsmokeenc.c smokecodec.c gstsmokedec.c
 
 libgstjpeg_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstjpeg_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+libgstjpeg_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(JPEG_LIBS) $(LIBM)
 libgstjpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstjpeg_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/libcaca/Makefile.am b/ext/libcaca/Makefile.am
index 9443f84..b96765b 100644 (file)
--- a/ext/libcaca/Makefile.am
+++ b/ext/libcaca/Makefile.am
@@ -7,7 +7,7 @@ libgstcacasink_la_CFLAGS = \
        $(GST_CFLAGS) \
        $(LIBCACA_CFLAGS)
 libgstcacasink_la_LIBADD = \
-       -lgstvideo-$(GST_MAJORMINOR) \
+       -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(LIBCACA_LIBS)

diff --git a/ext/libpng/Makefile.am b/ext/libpng/Makefile.am
index bce5b1a..a214160 100644 (file)
--- a/ext/libpng/Makefile.am
+++ b/ext/libpng/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstpng.la
 
 libgstpng_la_SOURCES = gstpng.c gstpngenc.c gstpngdec.c
 libgstpng_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBPNG_CFLAGS)
-libgstpng_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+libgstpng_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
        $(GST_LIBS) $(LIBPNG_LIBS)
 libgstpng_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstpng_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/pulse/Makefile.am b/ext/pulse/Makefile.am
index 22c880c..693aa16 100644 (file)
--- a/ext/pulse/Makefile.am
+++ b/ext/pulse/Makefile.am
@@ -11,8 +11,8 @@ libgstpulse_la_SOURCES = \
        pulseutil.c
 
 libgstpulse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(PULSE_CFLAGS)
-libgstpulse_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
-       -lgstinterfaces-$(GST_MAJORMINOR) -lgstpbutils-$(GST_MAJORMINOR) \
+libgstpulse_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
+       -lgstinterfaces-$(GST_API_VERSION) -lgstpbutils-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(PULSE_LIBS)
 libgstpulse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstpulse_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/raw1394/Makefile.am b/ext/raw1394/Makefile.am
index ae55f86..c0fb574 100644 (file)
--- a/ext/raw1394/Makefile.am
+++ b/ext/raw1394/Makefile.am
@@ -17,7 +17,7 @@ libgst1394_la_CFLAGS = \
        $(GST_CFLAGS) \
        $(DV1394_CFLAGS)
 libgst1394_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(DV1394_LIBS)

diff --git a/ext/soup/Makefile.am b/ext/soup/Makefile.am
index 6916b17..da2babc 100644 (file)
--- a/ext/soup/Makefile.am
+++ b/ext/soup/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstsouphttpsrc.la
 libgstsouphttpsrc_la_SOURCES = gstsouphttpsrc.c gstsouphttpclientsink.c gstsoup.c
 
 libgstsouphttpsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SOUP_CFLAGS) 
-libgstsouphttpsrc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(SOUP_LIBS)
+libgstsouphttpsrc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ $(GST_BASE_LIBS) $(SOUP_LIBS)
 libgstsouphttpsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsouphttpsrc_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/ext/speex/Makefile.am b/ext/speex/Makefile.am
index fe55237..878e3e9 100644 (file)
--- a/ext/speex/Makefile.am
+++ b/ext/speex/Makefile.am
@@ -8,7 +8,7 @@ libgstspeex_la_CFLAGS = -DGST_USE_UNSTABLE_API \
        $(SPEEX_CFLAGS)
 libgstspeex_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
-       -lgsttag-$(GST_MAJORMINOR) -lgstaudio-$(GST_MAJORMINOR) \
+       -lgsttag-$(GST_API_VERSION) -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(SPEEX_LIBS)

diff --git a/ext/taglib/Makefile.am b/ext/taglib/Makefile.am
index 3b2e94c..b268808 100644 (file)
--- a/ext/taglib/Makefile.am
+++ b/ext/taglib/Makefile.am
@@ -10,7 +10,7 @@ libgsttaglib_la_CXXFLAGS = \
        $(GST_CXXFLAGS) \
        $(TAGLIB_CXXFLAGS)
 libgsttaglib_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \
        $(GST_LIBS) \
        $(TAGLIB_LIBS)
 libgsttaglib_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/ext/wavpack/Makefile.am b/ext/wavpack/Makefile.am
index 7c748da..acde3fb 100644 (file)
--- a/ext/wavpack/Makefile.am
+++ b/ext/wavpack/Makefile.am
@@ -9,7 +9,7 @@ libgstwavpack_la_SOURCES = \
 
 libgstwavpack_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
                                $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(WAVPACK_CFLAGS)
-libgstwavpack_la_LIBADD =  $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+libgstwavpack_la_LIBADD =  $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
                                $(GST_BASE_LIBS) $(GST_LIBS) $(WAVPACK_LIBS)
 libgstwavpack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstwavpack_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst-plugins-good.spec.in b/gst-plugins-good.spec.in
index 400326e..388fef1 100644 (file)
--- a/gst-plugins-good.spec.in
+++ b/gst-plugins-good.spec.in
@@ -1,4 +1,4 @@
-%define majorminor  @GST_MAJORMINOR@
+%define majorminor  @GST_API_VERSION@
 %define gstreamer   gstreamer011
 
 %define gst_minver   0.11.0

diff --git a/gst/alpha/Makefile.am b/gst/alpha/Makefile.am
index b17fb41..5aac7bb 100644 (file)
--- a/gst/alpha/Makefile.am
+++ b/gst/alpha/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstalpha.la libgstalphacolor.la
 libgstalpha_la_SOURCES = gstalpha.c
 libgstalpha_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstalpha_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+libgstalpha_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstalpha_la_LIBTOOLFLAGS = --tag=disable-static
@@ -11,7 +11,7 @@ libgstalpha_la_LIBTOOLFLAGS = --tag=disable-static
 libgstalphacolor_la_SOURCES = gstalphacolor.c
 libgstalphacolor_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstalphacolor_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+libgstalphacolor_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstalphacolor_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstalphacolor_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/apetag/Makefile.am b/gst/apetag/Makefile.am
index 54950f2..714fa72 100644 (file)
--- a/gst/apetag/Makefile.am
+++ b/gst/apetag/Makefile.am
@@ -6,8 +6,8 @@ libgstapetag_la_CFLAGS = \
        $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS)
 libgstapetag_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ \
-       -lgstpbutils-@GST_MAJORMINOR@\
+       $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ \
+       -lgstpbutils-@GST_API_VERSION@\
        $(GST_BASE_LIBS) \
        $(GST_LIBS)
 libgstapetag_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/gst/audiofx/Makefile.am b/gst/audiofx/Makefile.am
index d700b68..0a35314 100644 (file)
--- a/gst/audiofx/Makefile.am
+++ b/gst/audiofx/Makefile.am
@@ -29,8 +29,8 @@ libgstaudiofx_la_CFLAGS = $(GST_CFLAGS) \
 libgstaudiofx_la_LIBADD = $(GST_LIBS) \
        $(GST_BASE_LIBS) \
        $(GST_PLUGINS_BASE_LIBS) \
-       -lgstaudio-$(GST_MAJORMINOR) \
-       -lgstfft-$(GST_MAJORMINOR) \
+       -lgstaudio-$(GST_API_VERSION) \
+       -lgstfft-$(GST_API_VERSION) \
        $(LIBM)
 libgstaudiofx_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudiofx_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/audioparsers/Makefile.am b/gst/audioparsers/Makefile.am
index 4d4d53e..2c5015d 100644 (file)
--- a/gst/audioparsers/Makefile.am
+++ b/gst/audioparsers/Makefile.am
@@ -8,8 +8,8 @@ libgstaudioparsers_la_SOURCES = \
 libgstaudioparsers_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstaudioparsers_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
-       -lgstaudio-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \
+       -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstaudioparsers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudioparsers_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/auparse/Makefile.am b/gst/auparse/Makefile.am
index 3f103b0..3d08bd8 100644 (file)
--- a/gst/auparse/Makefile.am
+++ b/gst/auparse/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstauparse.la
 
 libgstauparse_la_SOURCES = gstauparse.c
 libgstauparse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstauparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR)
+libgstauparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION)
 libgstauparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstauparse_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/avi/Makefile.am b/gst/avi/Makefile.am
index d9d9ba2..a614e26 100644 (file)
--- a/gst/avi/Makefile.am
+++ b/gst/avi/Makefile.am
@@ -17,10 +17,10 @@ libgstavi_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
-       -lgstriff-@GST_MAJORMINOR@ \
-       -lgstaudio-@GST_MAJORMINOR@ \
-       -lgsttag-@GST_MAJORMINOR@ \
-       -lgstvideo-@GST_MAJORMINOR@
+       -lgstriff-@GST_API_VERSION@ \
+       -lgstaudio-@GST_API_VERSION@ \
+       -lgsttag-@GST_API_VERSION@ \
+       -lgstvideo-@GST_API_VERSION@
 
 libgstavi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstavi_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/cutter/Makefile.am b/gst/cutter/Makefile.am
index 7524a0e..9d506af 100644 (file)
--- a/gst/cutter/Makefile.am
+++ b/gst/cutter/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstcutter.la
 
 libgstcutter_la_SOURCES = gstcutter.c
 libgstcutter_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstcutter_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LIBM)
+libgstcutter_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LIBM)
 libgstcutter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstcutter_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/debugutils/Makefile.am b/gst/debugutils/Makefile.am
index e254bb9..91d68d1 100644 (file)
--- a/gst/debugutils/Makefile.am
+++ b/gst/debugutils/Makefile.am
@@ -16,7 +16,7 @@ libgstnavigationtest_la_SOURCES = gstnavigationtest.c
 libgstnavigationtest_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
                                 $(GST_PLUGINS_BASE_CFLAGS)
 libgstnavigationtest_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \
-       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(LIBM)
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(LIBM)
 libgstnavigationtest_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstnavigationtest_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/deinterlace/Makefile.am b/gst/deinterlace/Makefile.am
index fcadae9..5e44add 100644 (file)
--- a/gst/deinterlace/Makefile.am
+++ b/gst/deinterlace/Makefile.am
@@ -21,7 +21,7 @@ nodist_libgstdeinterlace_la_SOURCES = $(ORC_NODIST_SOURCES)
 libgstdeinterlace_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
 libgstdeinterlace_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)
 libgstdeinterlace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdeinterlace_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/effectv/Makefile.am b/gst/effectv/Makefile.am
index fb5d3f2..3fb2802 100644 (file)
--- a/gst/effectv/Makefile.am
+++ b/gst/effectv/Makefile.am
@@ -10,7 +10,7 @@ libgsteffectv_la_CFLAGS = \
        $(GST_CFLAGS) \
        -I$(top_srcdir)/gst/videofilter
 libgsteffectv_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(LIBM)

diff --git a/gst/equalizer/Makefile.am b/gst/equalizer/Makefile.am
index 760698f..015875a 100644 (file)
--- a/gst/equalizer/Makefile.am
+++ b/gst/equalizer/Makefile.am
@@ -9,14 +9,14 @@ libgstequalizer_la_SOURCES = \
 libgstequalizer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS)
 libgstequalizer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-       -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) \
+       -lgstaudio-$(GST_API_VERSION) $(GST_BASE_LIBS) \
        $(GST_LIBS) $(LIBM)
 libgstequalizer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstequalizer_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstiirequalizer.h
 
-presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets
+presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets
 preset_DATA = GstIirEqualizer3Bands.prs GstIirEqualizer10Bands.prs
 
 EXTRA_DIST = $(preset_DATA)

diff --git a/gst/flv/Makefile.am b/gst/flv/Makefile.am
index be7657a..97c2341 100644 (file)
--- a/gst/flv/Makefile.am
+++ b/gst/flv/Makefile.am
@@ -1,7 +1,7 @@
 plugin_LTLIBRARIES = libgstflv.la
 
 libgstflv_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstflv_la_LIBADD = -lgstpbutils-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@\
+libgstflv_la_LIBADD = -lgstpbutils-@GST_API_VERSION@ -lgstaudio-@GST_API_VERSION@\
        $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
 libgstflv_la_LDFLAGS = ${GST_PLUGIN_LDFLAGS}
 libgstflv_la_SOURCES = gstflvdemux.c gstflvmux.c

diff --git a/gst/icydemux/Makefile.am b/gst/icydemux/Makefile.am
index b7f2c66..1da2af4 100644 (file)
--- a/gst/icydemux/Makefile.am
+++ b/gst/icydemux/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgsticydemux.la
 
 libgsticydemux_la_SOURCES = gsticydemux.c
 libgsticydemux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgsticydemux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZLIB_LIBS)
+libgsticydemux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZLIB_LIBS)
 libgsticydemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsticydemux_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/id3demux/Makefile.am b/gst/id3demux/Makefile.am
index cce8035..7dc98af 100644 (file)
--- a/gst/id3demux/Makefile.am
+++ b/gst/id3demux/Makefile.am
@@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstid3demux.la
 
 libgstid3demux_la_SOURCES = gstid3demux.c
 libgstid3demux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) 
-libgstid3demux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ \
-       -lgstpbutils-@GST_MAJORMINOR@ $(GST_BASE_LIBS)
+libgstid3demux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ \
+       -lgstpbutils-@GST_API_VERSION@ $(GST_BASE_LIBS)
 libgstid3demux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstid3demux_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/interleave/Makefile.am b/gst/interleave/Makefile.am
index 0a2d2d8..75066a6 100644 (file)
--- a/gst/interleave/Makefile.am
+++ b/gst/interleave/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstinterleave.la
 
 libgstinterleave_la_SOURCES = plugin.c interleave.c deinterleave.c
 libgstinterleave_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstinterleave_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS)
+libgstinterleave_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS)
 libgstinterleave_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstinterleave_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/isomp4/Makefile.am b/gst/isomp4/Makefile.am
index f3f3718..4260b82 100644 (file)
--- a/gst/isomp4/Makefile.am
+++ b/gst/isomp4/Makefile.am
@@ -4,12 +4,12 @@ plugin_LTLIBRARIES = libgstisomp4.la
 libgstisomp4_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstisomp4_la_LIBADD = \
     $(GST_PLUGINS_BASE_LIBS) \
-    -lgstriff-@GST_MAJORMINOR@ \
-    -lgstaudio-@GST_MAJORMINOR@ \
-    -lgstvideo-@GST_MAJORMINOR@ \
-    -lgstrtp-@GST_MAJORMINOR@ \
-    -lgsttag-@GST_MAJORMINOR@ \
-    -lgstpbutils-@GST_MAJORMINOR@ \
+    -lgstriff-@GST_API_VERSION@ \
+    -lgstaudio-@GST_API_VERSION@ \
+    -lgstvideo-@GST_API_VERSION@ \
+    -lgstrtp-@GST_API_VERSION@ \
+    -lgsttag-@GST_API_VERSION@ \
+    -lgstpbutils-@GST_API_VERSION@ \
     $(GST_BASE_LIBS) $(GST_LIBS) $(ZLIB_LIBS)
 libgstisomp4_la_LDFLAGS = ${GST_PLUGIN_LDFLAGS}
 libgstisomp4_la_SOURCES = isomp4-plugin.c gstrtpxqtdepay.c \

diff --git a/gst/law/Makefile.am b/gst/law/Makefile.am
index b6bb5b4..addd3e3 100644 (file)
--- a/gst/law/Makefile.am
+++ b/gst/law/Makefile.am
@@ -2,14 +2,14 @@ plugin_LTLIBRARIES = libgstalaw.la libgstmulaw.la
 
 libgstalaw_la_SOURCES = alaw-encode.c alaw-decode.c alaw.c
 libgstalaw_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstalaw_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+libgstalaw_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstalaw_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstalaw_la_LIBTOOLFLAGS = --tag=disable-static
 
 libgstmulaw_la_SOURCES = mulaw-encode.c mulaw-conversion.c mulaw-decode.c mulaw.c
 libgstmulaw_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstmulaw_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+libgstmulaw_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstmulaw_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmulaw_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/level/Makefile.am b/gst/level/Makefile.am
index 63cdfae..dfebf4c 100644 (file)
--- a/gst/level/Makefile.am
+++ b/gst/level/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstlevel.la
 
 libgstlevel_la_SOURCES = gstlevel.c
 libgstlevel_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstlevel_la_LIBADD = $(GST_BASE_LIBS) $(LIBM) -lgstaudio-$(GST_MAJORMINOR)
+libgstlevel_la_LIBADD = $(GST_BASE_LIBS) $(LIBM) -lgstaudio-$(GST_API_VERSION)
 libgstlevel_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstlevel_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/matroska/Makefile.am b/gst/matroska/Makefile.am
index 7d56973..7e01bb7 100644 (file)
--- a/gst/matroska/Makefile.am
+++ b/gst/matroska/Makefile.am
@@ -30,10 +30,10 @@ libgstmatroska_la_CFLAGS = \
        $(GST_CFLAGS)
 libgstmatroska_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
-       -lgstriff-@GST_MAJORMINOR@ \
-       -lgstaudio-@GST_MAJORMINOR@ \
-       -lgsttag-@GST_MAJORMINOR@ \
-       -lgstpbutils-@GST_MAJORMINOR@ \
+       -lgstriff-@GST_API_VERSION@ \
+       -lgstaudio-@GST_API_VERSION@ \
+       -lgsttag-@GST_API_VERSION@ \
+       -lgstpbutils-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(ZLIB_LIBS) \

diff --git a/gst/multifile/Makefile.am b/gst/multifile/Makefile.am
index 3c9e316..00fb35d 100644 (file)
--- a/gst/multifile/Makefile.am
+++ b/gst/multifile/Makefile.am
@@ -8,7 +8,7 @@ libgstmultifile_la_SOURCES = \
        gstsplitfilesrc.c    \
        patternspec.c
 libgstmultifile_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
-libgstmultifile_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS)
+libgstmultifile_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS)
 libgstmultifile_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmultifile_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/replaygain/Makefile.am b/gst/replaygain/Makefile.am
index b7e9487..628b319 100644 (file)
--- a/gst/replaygain/Makefile.am
+++ b/gst/replaygain/Makefile.am
@@ -9,7 +9,7 @@ libgstreplaygain_la_SOURCES = \
 libgstreplaygain_la_CFLAGS  = \
        $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstreplaygain_la_LIBADD  = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_MAJORMINOR) -lgstaudio-$(GST_MAJORMINOR)\
+       $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) -lgstaudio-$(GST_API_VERSION)\
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstreplaygain_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstreplaygain_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am
index c26ab6c..1437518 100644 (file)
--- a/gst/rtp/Makefile.am
+++ b/gst/rtp/Makefile.am
@@ -75,11 +75,11 @@ libgstrtp_la_SOURCES = \
 
 libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-               -lgstaudio-@GST_MAJORMINOR@ \
-               -lgstvideo-@GST_MAJORMINOR@ \
-                -lgsttag-@GST_MAJORMINOR@ \
-                -lgstrtp-@GST_MAJORMINOR@ \
-                -lgstpbutils-@GST_MAJORMINOR@ \
+               -lgstaudio-@GST_API_VERSION@ \
+               -lgstvideo-@GST_API_VERSION@ \
+                -lgsttag-@GST_API_VERSION@ \
+                -lgstrtp-@GST_API_VERSION@ \
+                -lgstpbutils-@GST_API_VERSION@ \
                $(GST_BASE_LIBS) $(GST_LIBS) \
                $(LIBM)
 libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 

diff --git a/gst/rtpmanager/Makefile.am b/gst/rtpmanager/Makefile.am
index bdaf24b..683ca76 100644 (file)
--- a/gst/rtpmanager/Makefile.am
+++ b/gst/rtpmanager/Makefile.am
@@ -41,7 +41,7 @@ noinst_HEADERS = gstrtpbin.h \
 libgstrtpmanager_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
        $(GST_NET_CFLAGS) $(WARNING_CFLAGS) $(ERROR_CFLAGS)
 libgstrtpmanager_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-       $(GST_NET_LIBS) -lgstrtp-@GST_MAJORMINOR@ \
+       $(GST_NET_LIBS) -lgstrtp-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) $(GST_LIBS_LIBS)
 libgstrtpmanager_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstrtpmanager_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/rtsp/Makefile.am b/gst/rtsp/Makefile.am
index 212b2cc..76896cc 100644 (file)
--- a/gst/rtsp/Makefile.am
+++ b/gst/rtsp/Makefile.am
@@ -5,9 +5,9 @@ libgstrtsp_la_SOURCES = gstrtsp.c gstrtspsrc.c \
 
 libgstrtsp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstrtsp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
-                      -lgstinterfaces-@GST_MAJORMINOR@ \
-                      -lgstrtp-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ \
-                      -lgstsdp-@GST_MAJORMINOR@ $(GST_LIBS)
+                      -lgstinterfaces-@GST_API_VERSION@ \
+                      -lgstrtp-@GST_API_VERSION@ -lgstrtsp-@GST_API_VERSION@ \
+                      -lgstsdp-@GST_API_VERSION@ $(GST_LIBS)
 libgstrtsp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstrtsp_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/shapewipe/Makefile.am b/gst/shapewipe/Makefile.am
index 8634597..ed29db7 100644 (file)
--- a/gst/shapewipe/Makefile.am
+++ b/gst/shapewipe/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstshapewipe.la
 libgstshapewipe_la_SOURCES = gstshapewipe.c
 
 libgstshapewipe_la_CFLAGS = $(GIO_CFLAGS) $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstshapewipe_la_LIBADD = $(GIO_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@
+libgstshapewipe_la_LIBADD = $(GIO_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@
 libgstshapewipe_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstshapewipe_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/smpte/Makefile.am b/gst/smpte/Makefile.am
index cb517e6..0462a5c 100644 (file)
--- a/gst/smpte/Makefile.am
+++ b/gst/smpte/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = gstsmpte.h gstmask.h paint.h gstsmptealpha.h
 
 libgstsmpte_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstsmpte_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(LIBM) \
-                       -lgstvideo-$(GST_MAJORMINOR) 
+                       -lgstvideo-$(GST_API_VERSION) 
 libgstsmpte_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsmpte_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/spectrum/Makefile.am b/gst/spectrum/Makefile.am
index 99c4384..b194909 100644 (file)
--- a/gst/spectrum/Makefile.am
+++ b/gst/spectrum/Makefile.am
@@ -4,7 +4,7 @@ libgstspectrum_la_SOURCES = gstspectrum.c
 libgstspectrum_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS)
 libgstspectrum_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-       -lgstfft-$(GST_MAJORMINOR) -lgstaudio-$(GST_MAJORMINOR) \
+       -lgstfft-$(GST_API_VERSION) -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstspectrum_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstspectrum_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/videobox/Makefile.am b/gst/videobox/Makefile.am
index 21f04a0..a852706 100644 (file)
--- a/gst/videobox/Makefile.am
+++ b/gst/videobox/Makefile.am
@@ -13,7 +13,7 @@ libgstvideobox_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
                           $(GST_BASE_LIBS) \
                           $(GST_LIBS) \
                           $(ORC_LIBS) \
-                          -lgstvideo-@GST_MAJORMINOR@
+                          -lgstvideo-@GST_API_VERSION@
 libgstvideobox_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideobox_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/videocrop/Makefile.am b/gst/videocrop/Makefile.am
index 9341cfd..a678dd0 100644 (file)
--- a/gst/videocrop/Makefile.am
+++ b/gst/videocrop/Makefile.am
@@ -6,7 +6,7 @@ plugin_LTLIBRARIES = libgstvideocrop.la
 libgstvideocrop_la_SOURCES = gstvideocrop.c gstaspectratiocrop.c
 libgstvideocrop_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS)
-libgstvideocrop_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR)
+libgstvideocrop_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_API_VERSION)
 libgstvideocrop_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideocrop_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am
index 6013f59..4a7b9d9 100644 (file)
--- a/gst/videofilter/Makefile.am
+++ b/gst/videofilter/Makefile.am
@@ -13,7 +13,7 @@ libgstvideofilter_la_CFLAGS = $(GST_CFLAGS) \
                        $(GST_BASE_CFLAGS) \
                        $(GST_PLUGINS_BASE_CFLAGS)
 libgstvideofilter_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-                       -lgstvideo-@GST_MAJORMINOR@ \
+                       -lgstvideo-@GST_API_VERSION@ \
                        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstvideofilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM)
 libgstvideofilter_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/videomixer/Makefile.am b/gst/videomixer/Makefile.am
index ad6d2e1..f944759 100644 (file)
--- a/gst/videomixer/Makefile.am
+++ b/gst/videomixer/Makefile.am
@@ -11,7 +11,7 @@ nodist_libgstvideomixer_la_SOURCES = $(ORC_NODIST_SOURCES)
 libgstvideomixer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
 libgstvideomixer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-       -lgstvideo-@GST_MAJORMINOR@ \
+       -lgstvideo-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)
 libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideomixer_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/wavenc/Makefile.am b/gst/wavenc/Makefile.am
index 53ef62d..320c8fd 100644 (file)
--- a/gst/wavenc/Makefile.am
+++ b/gst/wavenc/Makefile.am
@@ -6,8 +6,8 @@ libgstwavenc_la_CFLAGS =  \
        $(GST_CFLAGS)
 libgstwavenc_la_LIBADD =       \
        $(GST_PLUGINS_BASE_LIBS) \
-       -lgstaudio-@GST_MAJORMINOR@ \
-       -lgstriff-@GST_MAJORMINOR@ \
+       -lgstaudio-@GST_API_VERSION@ \
+       -lgstriff-@GST_API_VERSION@ \
        $(GST_LIBS)
 libgstwavenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstwavenc_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/wavparse/Makefile.am b/gst/wavparse/Makefile.am
index 24d3896..039b6a6 100644 (file)
--- a/gst/wavparse/Makefile.am
+++ b/gst/wavparse/Makefile.am
@@ -7,9 +7,9 @@ libgstwavparse_la_CFLAGS = \
        $(GST_CFLAGS)
 libgstwavparse_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
-       -lgstriff-@GST_MAJORMINOR@ \
-       -lgstaudio-@GST_MAJORMINOR@ \
-       -lgsttag-@GST_MAJORMINOR@ \
+       -lgstriff-@GST_API_VERSION@ \
+       -lgstaudio-@GST_API_VERSION@ \
+       -lgsttag-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(LIBM)

diff --git a/gst/y4m/Makefile.am b/gst/y4m/Makefile.am
index c81703a..0079392 100644 (file)
--- a/gst/y4m/Makefile.am
+++ b/gst/y4m/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgsty4menc.la
 
 libgsty4menc_la_SOURCES = gsty4mencode.c
 libgsty4menc_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgsty4menc_la_LIBADD = $(GST_LIBS) -lgstvideo-$(GST_MAJORMINOR)
+libgsty4menc_la_LIBADD = $(GST_LIBS) -lgstvideo-$(GST_API_VERSION)
 libgsty4menc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsty4menc_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 1d26798..2d7917b 100644 (file)
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -1,8 +1,8 @@
 ### all of the standard pc files we need to generate
 pcverfiles =  \
-       gstreamer-plugins-good-@GST_MAJORMINOR@.pc
+       gstreamer-plugins-good-@GST_API_VERSION@.pc
 pcverfiles_uninstalled = \
-       gstreamer-plugins-good-@GST_MAJORMINOR@-uninstalled.pc
+       gstreamer-plugins-good-@GST_API_VERSION@-uninstalled.pc
 
 ### all-local: $(pcverfiles) $(pcverfiles_uninstalled)
 all-local: $(pcverfiles_uninstalled)
@@ -12,9 +12,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)cp $< $@
-%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
+%-@GST_API_VERSION@-uninstalled.pc: %-uninstalled.pc
        $(cp_verbose)cp $< $@
 
 # do not install for now

diff --git a/pkgconfig/gstreamer-plugins-good-uninstalled.pc.in b/pkgconfig/gstreamer-plugins-good-uninstalled.pc.in
index 7294834..727a32b 100644 (file)
--- a/pkgconfig/gstreamer-plugins-good-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-plugins-good-uninstalled.pc.in
@@ -7,7 +7,7 @@ pluginsdir=@abs_top_builddir@
 Name: GStreamer Good Plugins, Uninstalled
 Description: Streaming media framework, good plugins, uninstalled
 Version: @VERSION@
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-plugins-base-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-plugins-base-@GST_API_VERSION@
 
 Libs: 
 Cflags: 

diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am
index 8227905..ff02203 100644 (file)
--- a/sys/directsound/Makefile.am
+++ b/sys/directsound/Makefile.am
@@ -8,7 +8,7 @@ libgstdirectsoundsink_la_CFLAGS = \
        $(DIRECTSOUND_CFLAGS)
 libgstdirectsoundsink_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) \
        $(DIRECTSOUND_LIBS)

diff --git a/sys/oss/Makefile.am b/sys/oss/Makefile.am
index c42dfea..30e615e 100644 (file)
--- a/sys/oss/Makefile.am
+++ b/sys/oss/Makefile.am
@@ -11,8 +11,8 @@ libgstossaudio_la_SOURCES = gstossaudio.c      \
 libgstossaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstossaudio_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
-        -lgstinterfaces-$(GST_MAJORMINOR) \
-       -lgstaudio-$(GST_MAJORMINOR) \
+        -lgstinterfaces-$(GST_API_VERSION) \
+       -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) \
        $(GST_LIBS)
 libgstossaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 

diff --git a/sys/oss4/Makefile.am b/sys/oss4/Makefile.am
index 955e903..8f8793c 100644 (file)
--- a/sys/oss4/Makefile.am
+++ b/sys/oss4/Makefile.am
@@ -13,8 +13,8 @@ libgstoss4audio_la_SOURCES = \
 libgstoss4audio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstoss4audio_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
-        -lgstinterfaces-$(GST_MAJORMINOR) \
-       -lgstaudio-$(GST_MAJORMINOR) \
+        -lgstinterfaces-$(GST_API_VERSION) \
+       -lgstaudio-$(GST_API_VERSION) \
        $(GST_LIBS)
 libgstoss4audio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
 libgstoss4audio_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/sys/osxaudio/Makefile.am b/sys/osxaudio/Makefile.am
index cfd0c4d..8c1c3f7 100644 (file)
--- a/sys/osxaudio/Makefile.am
+++ b/sys/osxaudio/Makefile.am
@@ -9,8 +9,8 @@ libgstosxaudio_la_SOURCES = gstosxringbuffer.c   \
 libgstosxaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
     -Wno-deprecated-declarations
 libgstosxaudio_la_LIBADD =                       \
-    -lgstinterfaces-@GST_MAJORMINOR@  \
-    -lgstaudio-@GST_MAJORMINOR@       \
+    -lgstinterfaces-@GST_API_VERSION@  \
+    -lgstaudio-@GST_API_VERSION@       \
     $(GST_PLUGINS_BASE_LIBS)          \
     $(GST_BASE_LIBS)                  \
     $(GST_LIBS)

diff --git a/sys/osxvideo/Makefile.am b/sys/osxvideo/Makefile.am
index 8893c2e..0ff6c0c 100644 (file)
--- a/sys/osxvideo/Makefile.am
+++ b/sys/osxvideo/Makefile.am
@@ -8,8 +8,8 @@ libgstosxvideosink_la_LIBADD =  \
        $(GST_LIBS) \
        $(GST_BASE_LIBS) \
     $(GST_PLUGINS_BASE_LIBS) \
-    -lgstvideo-$(GST_MAJORMINOR) \
-       -lgstinterfaces-$(GST_MAJORMINOR)
+    -lgstvideo-$(GST_API_VERSION) \
+       -lgstinterfaces-$(GST_API_VERSION)
 
 libgstosxvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -Wl,-framework -Wl,Cocoa -Wl,-framework -Wl,QuickTime -Wl,-framework -Wl,OpenGL
 libgstosxvideosink_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/sys/sunaudio/Makefile.am b/sys/sunaudio/Makefile.am
index e106ce3..7305468 100644 (file)
--- a/sys/sunaudio/Makefile.am
+++ b/sys/sunaudio/Makefile.am
@@ -10,8 +10,8 @@ libgstsunaudio_la_SOURCES = gstsunaudio.c \
 
 libgstsunaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstsunaudio_la_LIBADD = \
-        -lgstinterfaces-@GST_MAJORMINOR@ \
-        -lgstaudio-@GST_MAJORMINOR@ \
+        -lgstinterfaces-@GST_API_VERSION@ \
+        -lgstaudio-@GST_API_VERSION@ \
         $(GST_PLUGINS_BASE_LIBS) \
         $(GST_LIBS)
 libgstsunaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/sys/v4l2/Makefile.am b/sys/v4l2/Makefile.am
index 86f4fd2..89b6fe1 100644 (file)
--- a/sys/v4l2/Makefile.am
+++ b/sys/v4l2/Makefile.am
@@ -33,8 +33,8 @@ libgstvideo4linux2_la_LIBTOOLFLAGS = --tag=disable-static
 libgstvideo4linux2_la_LIBADD =   $(GST_PLUGINS_BASE_LIBS) \
                                 $(GST_BASE_LIBS) \
                                 $(GST_PLUGINS_BASE_LIBS) \
-                                -lgstvideo-$(GST_MAJORMINOR) \
-                                -lgstinterfaces-$(GST_MAJORMINOR) \
+                                -lgstvideo-$(GST_API_VERSION) \
+                                -lgstinterfaces-$(GST_API_VERSION) \
                                 $(GST_LIBS) \
                                 $(xv_libs) \
                                 $(LIBV4L2_LIBS) \

diff --git a/sys/waveform/Makefile.am b/sys/waveform/Makefile.am
index 9a9fac3..9196dfa 100644 (file)
--- a/sys/waveform/Makefile.am
+++ b/sys/waveform/Makefile.am
@@ -5,7 +5,7 @@ libgstwaveformsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
         $(GST_PLUGINS_BASE_CFLAGS)
 libgstwaveformsink_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) \
        -lwinmm

diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am
index 553226e..e8e11f0 100644 (file)
--- a/sys/ximage/Makefile.am
+++ b/sys/ximage/Makefile.am
@@ -7,7 +7,7 @@ libgstximagesrc_la_CFLAGS = \
        $(GST_CFLAGS) \
        $(X_CFLAGS) $(XFIXES_CFLAGS) $(XDAMAGE_CFLAGS)
 libgstximagesrc_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) \
        $(X_LIBS) $(XSHM_LIBS) $(XFIXES_LIBS) $(XDAMAGE_LIBS) 
 libgstximagesrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 8bf8f2b..a22d8ab 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -203,25 +203,25 @@ elements_aspectratiocrop_LDADD = $(LDADD)
 elements_aspectratiocrop_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
 
 elements_audioamplify_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_audioamplify_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_audioamplify_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_audiochebband_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_audiochebband_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_audiochebband_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_audiocheblimit_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_audiocheblimit_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_audiocheblimit_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_audiodynamic_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_audiodynamic_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_audiodynamic_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_audioecho_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_audioecho_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_audioecho_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_audioinvert_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_audioinvert_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_audioinvert_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_audiopanorama_LDADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(GST_BASE_LIBS) \
        $(GST_CONTROLLER_LIBS) $(LDADD)
 
 elements_audiopanorama_CFLAGS = \
@@ -229,23 +229,23 @@ elements_audiopanorama_CFLAGS = \
        $(CFLAGS) $(AM_CFLAGS)
 
 elements_audiowsincband_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_audiowsincband_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_audiowsincband_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_audiowsinclimit_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_audiowsinclimit_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_audiowsinclimit_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_equalizer_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_equalizer_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_equalizer_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_rganalysis_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_rganalysis_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_rganalysis_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 elements_rglimiter_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_rglimiter_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_rglimiter_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 elements_rgvolume_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_rgvolume_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_rgvolume_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_spectrum_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_spectrum_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_spectrum_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_cmmldec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
 elements_cmmlenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
@@ -253,37 +253,37 @@ elements_cmmlenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
 elements_alphacolor_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
 
 elements_deinterlace_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_deinterlace_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(LDADD)
+elements_deinterlace_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(LDADD)
 
 elements_deinterleave_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_deinterleave_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_deinterleave_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 elements_interleave_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_interleave_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_interleave_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_level_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_level_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_level_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_imagefreeze_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
-elements_imagefreeze_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LDADD)
+elements_imagefreeze_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LDADD)
 
 elements_jpegenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
-elements_jpegenc_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstapp-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LDADD)
+elements_jpegenc_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstapp-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LDADD)
 
 elements_level_LDADD = $(LDADD) $(LIBM)
 
 elements_matroskamux_LDADD = $(GST_BASE_LIBS) $(LDADD) $(LIBM)
 
 elements_multifile_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
-elements_multifile_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(GST_LIBS) $(LDADD) $(LIBM)
+elements_multifile_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS) $(LDADD) $(LIBM)
 
 elements_qtmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
-elements_qtmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-@GST_MAJORMINOR@ \
+elements_qtmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-@GST_API_VERSION@ \
              $(GST_BASE_LIBS) $(GST_LIBS) $(GST_CHECK_LIBS)
 
 elements_rtpbin_buffer_list_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
        $(WARNING_CFLAGS) $(ERROR_CFLAGS) $(GST_CHECK_CFLAGS) $(AM_CFLAGS)
 elements_rtpbin_buffer_list_LDADD = $(GST_PLUGINS_BASE_LIBS) \
-             -lgstrtp-@GST_MAJORMINOR@ \
+             -lgstrtp-@GST_API_VERSION@ \
              $(GST_BASE_LIBS) $(GST_LIBS) $(GST_CHECK_LIBS)
 elements_rtpbin_buffer_list_SOURCES = elements/rtpbin_buffer_list.c
 
@@ -294,17 +294,17 @@ elements_sunaudio_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) \
        $(AM_CFLAGS)
 elements_sunaudio_LDADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ \
+       $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_API_VERSION@ \
        $(LDADD)
 
 elements_udpsrc_CFLAGS = $(AM_CFLAGS) $(GIO_CFLAGS)
 elements_udpsrc_LDADD = $(LDADD) $(GIO_LIBS)
 
-elements_videocrop_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(LDADD)
+elements_videocrop_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(LDADD)
 elements_videocrop_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
 
 elements_videofilter_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-elements_videofilter_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(LDADD)
+elements_videofilter_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(LDADD)
 
 # FIXME: configure should check for gdk-pixbuf not gtk
 # only need video.h header, not the lib
@@ -315,10 +315,10 @@ elements_gdkpixbufsink_LDADD = \
 
 
 pipelines_flacdec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-pipelines_flacdec_LDADD  = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+pipelines_flacdec_LDADD  = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 pipelines_wavenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-pipelines_wavenc_LDADD  = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+pipelines_wavenc_LDADD  = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 pipelines_wavpack_LDADD = $(LDADD) $(GST_BASE_LIBS)
 pipelines_wavpack_CFLAGS = $(GST_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)

diff --git a/tests/examples/audiofx/Makefile.am b/tests/examples/audiofx/Makefile.am
index 4441fb5..e3c42c9 100644 (file)
--- a/tests/examples/audiofx/Makefile.am
+++ b/tests/examples/audiofx/Makefile.am
@@ -4,7 +4,7 @@ noinst_PROGRAMS = firfilter-example iirfilter-example
 ERROR_CFLAGS=
 
 firfilter_example_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-firfilter_example_LDADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstfft-@GST_MAJORMINOR@ $(LIBM)
+firfilter_example_LDADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstfft-@GST_API_VERSION@ $(LIBM)
 
 iirfilter_example_CFLAGS = $(GST_CFLAGS)
 iirfilter_example_LDADD = $(GST_LIBS) $(LIBM)

diff --git a/tests/examples/cairo/Makefile.am b/tests/examples/cairo/Makefile.am
index 3a5eb58..9bc4717 100644 (file)
--- a/tests/examples/cairo/Makefile.am
+++ b/tests/examples/cairo/Makefile.am
@@ -4,4 +4,4 @@ endif
 
 cairo_overlay_SOURCES = cairo_overlay.c
 cairo_overlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(CAIRO_CFLAGS)
-cairo_overlay_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(GST_LIBS) $(CAIRO_LIBS)
+cairo_overlay_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS) $(CAIRO_LIBS)

diff --git a/tests/examples/pulse/Makefile.am b/tests/examples/pulse/Makefile.am
index e9a2d96..e02a877 100644 (file)
--- a/tests/examples/pulse/Makefile.am
+++ b/tests/examples/pulse/Makefile.am
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = pulse
 pulse_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-pulse_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS)
+pulse_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS)
 
 

diff --git a/tests/examples/spectrum/Makefile.am b/tests/examples/spectrum/Makefile.am
index 4fc796e..9ced5ea 100644 (file)
--- a/tests/examples/spectrum/Makefile.am
+++ b/tests/examples/spectrum/Makefile.am
@@ -9,7 +9,7 @@ demo_osssrc_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
 demo_audiotest_SOURCES = demo-audiotest.c
 demo_audiotest_CFLAGS  = $(GST_PLUGINS_BASE_CFLAGS) \
    $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
-demo_audiotest_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstfft-$(GST_MAJORMINOR) \
+demo_audiotest_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstfft-$(GST_API_VERSION) \
    $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
 
 spectrum_example_SOURCES = spectrum-example.c

diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index 5678294..86b85f4 100644 (file)
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -13,8 +13,8 @@ V4L2_TESTS = v4l2src-test
 v4l2src_test_SOURCES = v4l2src-test.c
 v4l2src_test_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 v4l2src_test_LDADD = $(GST_PLUGINS_BASE_LIBS) \
-                    -lgstvideo-$(GST_MAJORMINOR) \
-                    -lgstinterfaces-$(GST_MAJORMINOR) $(GST_LIBS)
+                    -lgstvideo-$(GST_API_VERSION) \
+                    -lgstinterfaces-$(GST_API_VERSION) $(GST_LIBS)
 
 else
 V4L2_TESTS =
@@ -25,7 +25,7 @@ OSS4_TESTS=test-oss4
 
 test_oss4_SOURCES = test-oss4.c
 test_oss4_CFLAGS  = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-test_oss4_LDADD   = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) $(GST_LIBS)
+test_oss4_LDADD   = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) $(GST_LIBS)
 test_oss4_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 else
 OSS4_TESTS=