gst: Update versioning

diff --git a/configure.ac b/configure.ac
index d516870c6e4a032542ac86d1e65edb9af9389ed4..fa748efdc991b8816951107a68616a9ba2c3bc5c 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])
 
 dnl FIXME: this macro doesn't actually work;
 dnl the generated libtool script has no support for the listed tags.
@@ -67,7 +68,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-ugly-$GST_MAJORMINOR])
+AG_GST_GETTEXT([gst-plugins-ugly-$GST_API_VERSION])
 
 dnl *** check for arguments to configure ***
 
@@ -161,16 +162,16 @@ ORC_CHECK([0.4.6])
 
 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_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
-AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], yes)
+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_CHECK($GST_API_VERSION, [$GST_REQ], no)
+AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ], yes)
 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)
@@ -483,7 +484,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 d574585c629a07d0e7038cbe776e05d25fd9f055..0c8bff1242b6e92abde9b8710d2f216b4d90d2af 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-ugly
 DOC_MODULE=$(MODULE)-plugins
 

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

diff --git a/docs/version.entities.in b/docs/version.entities.in
index 79a68981d5103feb4348f47e32e5638d37c5c37f..286989f56e602e5e96a095d55c2f8d81ea90abcd 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/a52dec/Makefile.am b/ext/a52dec/Makefile.am
index bf56cc99331f5d797ebac4c320949ea969d8fc8e..65c4d266053f341ebf5658679ce3bdb30b153767 100644 (file)
--- a/ext/a52dec/Makefile.am
+++ b/ext/a52dec/Makefile.am
@@ -11,7 +11,7 @@ libgsta52dec_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
         $(GST_BASE_LIBS) \
         $(GST_LIBS) \
-        -lgstaudio-$(GST_MAJORMINOR) \
+        -lgstaudio-$(GST_API_VERSION) \
        $(ORC_LIBS) \
        $(A52DEC_LIBS)
 libgsta52dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/ext/amrnb/Makefile.am b/ext/amrnb/Makefile.am
index 4e528dc18b11ef071ec8e0b03b446eff9deb8458..93793967bab6dfee644c67f0b4ea41b3c7f4104f 100644 (file)
--- a/ext/amrnb/Makefile.am
+++ b/ext/amrnb/Makefile.am
@@ -8,7 +8,7 @@ libgstamrnb_la_SOURCES = \
 libgstamrnb_la_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRNB_CFLAGS)
 libgstamrnb_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-        -lgstaudio-@GST_MAJORMINOR@ \
+        -lgstaudio-@GST_API_VERSION@ \
         $(GST_BASE_LIBS) $(GST_LIBS) $(AMRNB_LIBS)
 libgstamrnb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstamrnb_la_LIBTOOLFLAGS = --tag=disable-static
@@ -17,7 +17,7 @@ noinst_HEADERS = \
        amrnbdec.h \
        amrnbenc.h
 
-presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets
+presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets
 preset_DATA = GstAmrnbEnc.prs
 
 EXTRA_DIST = $(preset_DATA)

diff --git a/ext/amrwbdec/Makefile.am b/ext/amrwbdec/Makefile.am
index e65d340f18d78858d9ac92a9feebd20961797900..64b6e6ada2c6f19418da25455476f7698c55a649 100644 (file)
--- a/ext/amrwbdec/Makefile.am
+++ b/ext/amrwbdec/Makefile.am
@@ -8,7 +8,7 @@ libgstamrwbdec_la_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRWB_CFLAGS)
 libgstamrwbdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
        $(GST_BASE_LIBS) \
-       -lgstaudio-@GST_MAJORMINOR@ \
+       -lgstaudio-@GST_API_VERSION@ \
        $(GST_LIBS) $(AMRWB_LIBS)
 libgstamrwbdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstamrwbdec_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/cdio/Makefile.am b/ext/cdio/Makefile.am
index ae17c1c1c730285493cb479fef5eaae99ed04870..8ad13c3f12533e9a7538ce0d4d7a3ac56573b2bc 100644 (file)
--- a/ext/cdio/Makefile.am
+++ b/ext/cdio/Makefile.am
@@ -11,7 +11,7 @@ libgstcdio_la_CFLAGS = \
        $(CDIO_CFLAGS)
 
 libgstcdio_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) \
        $(CDIO_LIBS)
 

diff --git a/ext/lame/Makefile.am b/ext/lame/Makefile.am
index 53b22b35fcb86821ffb8adeaa13c5323a199ab55..d3a70c3a68d003d387cb6e193cefb751ee43e0a0 100644 (file)
--- a/ext/lame/Makefile.am
+++ b/ext/lame/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstlame.la
 libgstlame_la_SOURCES = gstlamemp3enc.c plugin.c
 libgstlame_la_CFLAGS = -DGST_USE_UNSTABLE_API \
         $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LAME_CFLAGS)
-libgstlame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+libgstlame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LAME_LIBS)
 libgstlame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstlame_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/mad/Makefile.am b/ext/mad/Makefile.am
index dfd25274dae4dbd79395cef5575fb63417d847df..097b864a8ad22e320c277ed2c8217bf920211ecc 100644 (file)
--- a/ext/mad/Makefile.am
+++ b/ext/mad/Makefile.am
@@ -6,7 +6,7 @@ libgstmad_la_CFLAGS = \
         $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) \
        $(MAD_CFLAGS)
 libgstmad_la_LIBADD = \
-        $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+        $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(MAD_LIBS)
 libgstmad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmad_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/mpeg2dec/Makefile.am b/ext/mpeg2dec/Makefile.am
index ab2aed30dcd49228b777238c3a263e24069d76a9..bf0a4ea2db8d812f3372a6413664ee88ac65b70e 100644 (file)
--- a/ext/mpeg2dec/Makefile.am
+++ b/ext/mpeg2dec/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstmpeg2dec.la
 libgstmpeg2dec_la_SOURCES = gstmpeg2dec.c
 libgstmpeg2dec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_CFLAGS) $(MPEG2DEC_CFLAGS)
-libgstmpeg2dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+libgstmpeg2dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_LIBS) $(MPEG2DEC_LIBS)
 libgstmpeg2dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmpeg2dec_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/sidplay/Makefile.am b/ext/sidplay/Makefile.am
index 60d503071cdab7a48fcc00d68ed7b584ce08b220..47e51ee4dd0c110d97a58b72d5cfa07ab9d3c2de 100644 (file)
--- a/ext/sidplay/Makefile.am
+++ b/ext/sidplay/Makefile.am
@@ -4,7 +4,7 @@ libgstsid_la_SOURCES = gstsiddec.cc
 libgstsid_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
        $(GST_CXXFLAGS) $(SIDPLAY_CFLAGS)
 libgstsid_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(SIDPLAY_LIBS) \
-                     -lgstaudio-$(GST_MAJORMINOR)
+                     -lgstaudio-$(GST_API_VERSION)
 libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsid_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/ext/twolame/Makefile.am b/ext/twolame/Makefile.am
index ff048e50da1568c8d759a7cb46c3caa495b021e4..785fd8f8d1051fa7e6c575fe577e9a0efd74ab2e 100644 (file)
--- a/ext/twolame/Makefile.am
+++ b/ext/twolame/Makefile.am
@@ -4,7 +4,7 @@ libgsttwolame_la_SOURCES = gsttwolamemp2enc.c
 libgsttwolame_la_CFLAGS = -DGST_USE_UNSTABLE_API \
        $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TWOLAME_CFLAGS)
 libgsttwolame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-       -lgstaudio-@GST_MAJORMINOR@ -lgstpbutils-@GST_MAJORMINOR@ \
+       -lgstaudio-@GST_API_VERSION@ -lgstpbutils-@GST_API_VERSION@ \
        $(GST_LIBS) $(TWOLAME_LIBS)
 libgsttwolame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsttwolame_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/x264/Makefile.am b/ext/x264/Makefile.am
index 92691d15354ea09df1fb72ea4eb5af779b8742bc..f69c9b13e398eaedbe5fdf5294d992309508a0fa 100644 (file)
--- a/ext/x264/Makefile.am
+++ b/ext/x264/Makefile.am
@@ -7,8 +7,8 @@ libgstx264_la_CFLAGS = \
        $(X264_CFLAGS)
 libgstx264_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
-       -lgstvideo-$(GST_MAJORMINOR) \
-       -lgstpbutils-$(GST_MAJORMINOR) \
+       -lgstvideo-$(GST_API_VERSION) \
+       -lgstpbutils-$(GST_API_VERSION) \
        $(GST_LIBS) \
        $(X264_LIBS)
 libgstx264_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
@@ -16,7 +16,7 @@ libgstx264_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstx264enc.h
 
-presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets
+presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets
 preset_DATA = GstX264Enc.prs
 
 EXTRA_DIST = $(preset_DATA)

diff --git a/gst-plugins-ugly.spec.in b/gst-plugins-ugly.spec.in
index a9087a1e305e84e2cd8313e8ea724ea5127754c2..7ff6aa5011bf684a781ccb9b1670362bc08b10c8 100644 (file)
--- a/gst-plugins-ugly.spec.in
+++ b/gst-plugins-ugly.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/asfdemux/Makefile.am b/gst/asfdemux/Makefile.am
index c4e03b35eb6b2931bfecff59403afe743c43a627..2b3bc27f92e6e142eaa88cd7aef6561498702979 100644 (file)
--- a/gst/asfdemux/Makefile.am
+++ b/gst/asfdemux/Makefile.am
@@ -3,8 +3,8 @@ plugin_LTLIBRARIES = libgstasf.la
 libgstasf_la_SOURCES = gstasfdemux.c gstasf.c asfheaders.c asfpacket.c gstrtpasfdepay.c gstrtspwms.c
 libgstasf_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstasf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-               -lgstriff-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ -lgstsdp-@GST_MAJORMINOR@ \
-               -lgstrtp-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ -lgsttag-@GST_MAJORMINOR@ \
+               -lgstriff-@GST_API_VERSION@ -lgstrtsp-@GST_API_VERSION@ -lgstsdp-@GST_API_VERSION@ \
+               -lgstrtp-@GST_API_VERSION@ -lgstaudio-@GST_API_VERSION@ -lgsttag-@GST_API_VERSION@ \
                $(GST_BASE_LIBS) $(GST_LIBS) \
                $(WIN32_LIBS)
 libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/gst/dvdlpcmdec/Makefile.am b/gst/dvdlpcmdec/Makefile.am
index 1e4367b38adfcc020858008a424bdcb00aa7b159..7809536140bd6e0e47709840ae8e53d651c6e324 100644 (file)
--- a/gst/dvdlpcmdec/Makefile.am
+++ b/gst/dvdlpcmdec/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstdvdlpcmdec.la
 
 libgstdvdlpcmdec_la_SOURCES = gstdvdlpcmdec.c
 libgstdvdlpcmdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstdvdlpcmdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ $(GST_LIBS)
+libgstdvdlpcmdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ $(GST_LIBS)
 libgstdvdlpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdvdlpcmdec_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/dvdsub/Makefile.am b/gst/dvdsub/Makefile.am
index ba0f71472ea9a0c905db6ec76d3bbf82020a9317..68b16c5ccc4ac3da96b011d824236c99e2f72b91 100644 (file)
--- a/gst/dvdsub/Makefile.am
+++ b/gst/dvdsub/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstdvdsub.la
 libgstdvdsub_la_SOURCES = gstdvdsubdec.c gstdvdsubparse.c
 libgstdvdsub_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstdvdsub_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+libgstdvdsub_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstdvdsub_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdvdsub_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/realmedia/Makefile.am b/gst/realmedia/Makefile.am
index c17d8f1699962f55b2e1fbe3ee7f8846b9071fd6..4db7e7d26e1b7709efe45febc5fb0818fc09eda3 100644 (file)
--- a/gst/realmedia/Makefile.am
+++ b/gst/realmedia/Makefile.am
@@ -9,9 +9,9 @@ libgstrmdemux_la_SOURCES = rademux.c rmdemux.c  \
 
 libgstrmdemux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstrmdemux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-                               -lgstrtsp-@GST_MAJORMINOR@ \
-                               -lgstsdp-@GST_MAJORMINOR@ \
-                               -lgstpbutils-@GST_MAJORMINOR@ \
+                               -lgstrtsp-@GST_API_VERSION@ \
+                               -lgstsdp-@GST_API_VERSION@ \
+                               -lgstpbutils-@GST_API_VERSION@ \
                                $(GST_BASE_LIBS) $(GST_LIBS)
 libgstrmdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstrmdemux_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 29c395af3a59a2d7aa73d827a012b38440d4e43b..b7089b7ff2f809b905e09417777133f0acf1094f 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-ugly-@GST_MAJORMINOR@.pc
+       gstreamer-plugins-ugly-@GST_API_VERSION@.pc
 pcverfiles_uninstalled = \
-       gstreamer-plugins-ugly-@GST_MAJORMINOR@-uninstalled.pc
+       gstreamer-plugins-ugly-@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-ugly-uninstalled.pc.in b/pkgconfig/gstreamer-plugins-ugly-uninstalled.pc.in
index 2a9ee09a56b9c753b773ee91507705f0d1ed4b51..6aefd7a01fac8903e59e570c18dcd93e43eb9f23 100644 (file)
--- a/pkgconfig/gstreamer-plugins-ugly-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-plugins-ugly-uninstalled.pc.in
@@ -7,7 +7,7 @@ pluginsdir=@abs_top_builddir@
 Name: GStreamer Ugly Plugins, Uninstalled
 Description: Streaming media framework, ugly 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/tests/check/Makefile.am b/tests/check/Makefile.am
index def216ac963f82e6a9c1eebb02cf71a22de3ea63..7ec7e6777044e82b790ff973ab85c2c326a2b3f7 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -69,7 +69,7 @@ VALGRIND_TESTS_DISABLE = \
 SUPPRESSIONS = $(top_srcdir)/common/gst.supp $(srcdir)/gst-plugins-ugly.supp
 
 elements_amrnbenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)
-elements_amrnbenc_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_amrnbenc_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
 
 elements_cmmldec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)
 elements_cmmlenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)