gst: Update versioning
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 4 Apr 2012 12:41:22 +0000 (14:41 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 4 Apr 2012 12:44:34 +0000 (14:44 +0200)
122 files changed:
configure.ac
docs/libs/Makefile.am
docs/libs/compiling.sgml
docs/libs/gst-plugins-bad-libs-docs.sgml
docs/plugins/Makefile.am
docs/plugins/gst-plugins-bad-plugins-docs.sgml
docs/version.entities.in
ext/apexsink/Makefile.am
ext/assrender/Makefile.am
ext/celt/Makefile.am
ext/chromaprint/Makefile.am
ext/cog/Makefile.am
ext/dirac/Makefile.am
ext/directfb/Makefile.am
ext/dts/Makefile.am
ext/faac/Makefile.am
ext/faad/Makefile.am
ext/flite/Makefile.am
ext/gsettings/Makefile.am
ext/gsettings/org.freedesktop.gstreamer.default-elements.gschema.xml.in
ext/gsm/Makefile.am
ext/jp2k/Makefile.am
ext/kate/Makefile.am
ext/ladspa/Makefile.am
ext/lv2/Makefile.am
ext/mpeg2enc/Makefile.am
ext/mplex/Makefile.am
ext/musicbrainz/Makefile.am
ext/nas/Makefile.am
ext/ofa/Makefile.am
ext/openal/Makefile.am
ext/opencv/Makefile.am
ext/opus/Makefile.am
ext/resindvd/Makefile.am
ext/rsvg/Makefile.am
ext/schroedinger/Makefile.am
ext/sdl/Makefile.am
ext/soundtouch/Makefile.am
ext/voaacenc/Makefile.am
ext/voamrwbenc/Makefile.am
ext/vp8/Makefile.am
ext/wayland/Makefile.am
ext/zbar/Makefile.am
gst-libs/gst/basecamerabinsrc/Makefile.am
gst-libs/gst/codecparsers/Makefile.am
gst-libs/gst/interfaces/Makefile.am
gst-libs/gst/signalprocessor/Makefile.am
gst-libs/gst/video/Makefile.am
gst-plugins-bad.spec.in
gst/adpcmdec/Makefile.am
gst/adpcmenc/Makefile.am
gst/aiff/Makefile.am
gst/asfmux/Makefile.am
gst/audiobuffer/Makefile.am
gst/audiovisualizers/Makefile.am
gst/bayer/Makefile.am
gst/camerabin/Makefile.am
gst/camerabin2/Makefile.am
gst/cdxaparse/Makefile.am
gst/coloreffects/Makefile.am
gst/debugutils/Makefile.am
gst/dtmf/Makefile.am
gst/dvbsuboverlay/Makefile.am
gst/dvdspu/Makefile.am
gst/faceoverlay/Makefile.am
gst/fieldanalysis/Makefile.am
gst/frei0r/Makefile.am
gst/gaudieffects/Makefile.am
gst/geometrictransform/Makefile.am
gst/id3tag/Makefile.am
gst/inter/Makefile.am
gst/interlace/Makefile.am
gst/jpegformat/Makefile.am
gst/liveadder/Makefile.am
gst/mpegdemux/Makefile.am
gst/mpegtsdemux/Makefile.am
gst/mpegtsmux/Makefile.am
gst/mxf/Makefile.am
gst/patchdetect/Makefile.am
gst/pnm/Makefile.am
gst/rawparse/Makefile.am
gst/real/Makefile.am
gst/rtpmux/Makefile.am
gst/rtpvp8/Makefile.am
gst/scaletempo/Makefile.am
gst/sdp/Makefile.am
gst/segmentclip/Makefile.am
gst/siren/Makefile.am
gst/smooth/Makefile.am
gst/stereo/Makefile.am
gst/videofilters/Makefile.am
gst/videomeasure/Makefile.am
gst/videoparsers/Makefile.am
gst/videosignal/Makefile.am
gst/y4m/Makefile.am
pkgconfig/Makefile.am
pkgconfig/gstreamer-basevideo-uninstalled.pc.in
pkgconfig/gstreamer-basevideo.pc.in
pkgconfig/gstreamer-codecparsers-uninstalled.pc.in
pkgconfig/gstreamer-codecparsers.pc.in
pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in
pkgconfig/gstreamer-plugins-bad.pc.in
sys/acmenc/Makefile.am
sys/acmmp3dec/Makefile.am
sys/applemedia/Makefile.am
sys/avc/Makefile.am
sys/d3dvideosink/Makefile.am
sys/decklink/Makefile.am
sys/directdraw/Makefile.am
sys/directsound/Makefile.am
sys/dshowdecwrapper/Makefile.am
sys/osxvideo/Makefile.am
sys/pvr2d/Makefile.am
sys/vdpau/Makefile.am
sys/vdpau/basevideodecoder/Makefile.am
sys/vdpau/gstvdp/Makefile.am
tests/check/Makefile.am
tests/examples/camerabin/Makefile.am
tests/examples/camerabin2/Makefile.am
tests/examples/gstplay/Makefile.am
tests/examples/scaletempo/Makefile.am
win32/common/config.h

index 22fe31b..0de43b3 100644 (file)
@@ -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
-GST_MAJORMINOR=$GST_PLUGINS_BAD_VERSION_MAJOR.$GST_PLUGINS_BAD_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 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_BASE($GST_MAJORMINOR, [$GST_REQ], yes)
-AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
-AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_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_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_UGLY($GST_MAJORMINOR, [0.11.0])
-  AG_GST_CHECK_GST_PLUGINS_FFMPEG($GST_MAJORMINOR, [0.11.0])
+  AG_GST_CHECK_GST_PLUGINS_GOOD($GST_API_VERSION, [0.11.0])
+  AG_GST_CHECK_GST_PLUGINS_UGLY($GST_API_VERSION, [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`"
-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)
index 016b843..7e9b966 100644 (file)
@@ -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/basecamerabinsrc/libgstbasecamerabinsrc-@GST_MAJORMINOR@.la \
-       $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
-       $(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_MAJORMINOR@.la \
-       $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la \
+       $(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_API_VERSION@.la \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \
+       $(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la \
+       $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \
   $(GST_BASE_LIBS)
 
 GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
index 949209a..e6f8662 100644 (file)
@@ -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;
--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
-$ pkg-config --libs gstreamer-plugins-bad-&GST_MAJORMINOR;
--Wl,--export-dynamic -pthread -lgstreamer-&GST_MAJORMINOR; -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lxml2 -lpthread -lz -lm -lglib-2.0
+$ pkg-config --cflags gstreamer-plugins-bad-&GST_API_VERSION;
+-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_API_VERSION;
+-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>
 
index cf6885b..3384e9f 100644 (file)
@@ -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>-lgscodeparsers-&GST_MAJORMINOR;</filename> to the library flags.
+        <filename>gstreamer-plugins-bad-&GST_API_VERSION;.pc</filename> and adding
+        <filename>-lgscodeparsers-&GST_API_VERSION;</filename> to the library flags.
       </para>
       <xi:include href="xml/gsth264parser.xml" />
       <xi:include href="xml/gstmpegvideoparser.xml" />
index 4b72e5d..0dbff8d 100644 (file)
@@ -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)
index 6fb475d..606c8ea 100644 (file)
@@ -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>
index 79a6898..286989f 100644 (file)
@@ -1,2 +1,2 @@
-<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@">
+<!ENTITY GST_API_VERSION "@GST_API_VERSION@">
 <!ENTITY GST_VERSION "@VERSION@">
index 0bd41ca..a288ccd 100644 (file)
@@ -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
index 44e6309..b9b32a7 100644 (file)
@@ -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
 
index 01153b1..0013980 100644 (file)
@@ -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)
index 115d8c2..2ced007 100644 (file)
@@ -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
index bbed6fe..6ea839a 100644 (file)
@@ -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) \
index c93a3d4..3defb7a 100644 (file)
@@ -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)
index 05e79ac..32b99ad 100644 (file)
@@ -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) \
-                              -lgstinterfaces-$(GST_MAJORMINOR) \
+                              -lgstvideo-$(GST_API_VERSION) \
+                              -lgstinterfaces-$(GST_API_VERSION) \
                               $(DIRECTFB_LIBS) $(LIBOIL_LIBS)
 libgstdfbvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdfbvideosink_la_LIBTOOLFLAGS = --tag=disable-static
index 97a8385..467e30c 100644 (file)
@@ -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
index 2aafa02..eb230dc 100644 (file)
@@ -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
index cc7636d..1f863f0 100644 (file)
@@ -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
index 84d87de..c807aad 100644 (file)
@@ -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)
index 6cef006..99b8b41 100644 (file)
@@ -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
-       cp org.freedesktop.gstreamer.default-elements.gschema.xml org.freedesktop.gstreamer-@GST_MAJORMINOR@.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_API_VERSION@.default-elements.gschema.xml
 
 if USE_GSETTINGS
 @GSETTINGS_RULES@
index f10e44b..58f1b33 100644 (file)
@@ -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>
index cd2f0df..8a98b55 100644 (file)
@@ -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
index 79aef3a..c5a9dc6 100644 (file)
@@ -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
index 4e310d9..b3c395f 100644 (file)
@@ -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
 
index 3d96953..c1f14e9 100644 (file)
@@ -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 \
-       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+       $(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la \
+       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
        $(LIBM) $(LRDF_LIBS)
 libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstladspa_la_LIBTOOLFLAGS = --tag=disable-static
index 76333e7..d1c33af 100644 (file)
@@ -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 \
-       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+       $(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la \
+       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
        $(LIBM) $(SLV2_LIBS)
 libgstlv2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstlv2_la_LIBTOOLFLAGS = --tag=disable-static
index 9b79185..f5f8b28 100644 (file)
@@ -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
index 84243ff..4154181 100644 (file)
@@ -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
index ab536c6..f0d838b 100644 (file)
@@ -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
 
index ef1dbba..ceeb72a 100644 (file)
@@ -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
 
index 9a674e0..48ecaa8 100644 (file)
@@ -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)
index b5e4e5b..6a6781c 100644 (file)
@@ -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
 
index d466bbb..c02037b 100644 (file)
@@ -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
index 48a7ead..13ae8a2 100644 (file)
@@ -8,8 +8,8 @@ libgstopus_la_CFLAGS = \
        $(GST_CFLAGS) \
        $(OPUS_CFLAGS)
 libgstopus_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
-       -lgsttag-$(GST_MAJORMINOR) -lgstrtp-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
+       -lgsttag-$(GST_API_VERSION) -lgstrtp-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(OPUS_LIBS)
index e9ef5ab..365fcb3 100644 (file)
@@ -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) \
--lgstpbutils-$(GST_MAJORMINOR) \
+-lgstinterfaces-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
+-lgstpbutils-$(GST_API_VERSION) \
 $(GST_BASE_LIBS) $(GST_LIBS) $(DVDNAV_LIBS)
 libresindvd_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libresindvd_la_LIBTOOLFLAGS = --tag=disable-static
index d1b04b9..7cdfbd6 100644 (file)
@@ -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)
index 66b2e1e..62c049f 100644 (file)
@@ -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 \
-       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+       $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
         $(GST_BASE_LIBS) $(GST_LIBS) \
        $(SCHRO_LIBS)
 libgstschro_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
index 6bc4264..5715ce6 100644 (file)
@@ -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) \
-                               -lgstaudio-$(GST_MAJORMINOR) \
-                               -lgstinterfaces-$(GST_MAJORMINOR) \
+                               -lgstvideo-$(GST_API_VERSION) \
+                               -lgstaudio-$(GST_API_VERSION) \
+                               -lgstinterfaces-$(GST_API_VERSION) \
                                $(SDL_LIBS)
 libgstsdl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
 libgstsdl_la_LIBTOOLFLAGS = --tag=disable-static
index 07832a7..34365f6 100644 (file)
@@ -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
 
index 8f58c20..2e1f28f 100644 (file)
@@ -11,8 +11,8 @@ libgstvoaacenc_la_CFLAGS = -DGST_USE_UNSTABLE_API \
        $(VOAACENC_CFLAGS)
 libgstvoaacenc_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
-       -lgstaudio-$(GST_MAJORMINOR) \
-       -lgstpbutils-$(GST_MAJORMINOR) \
+       -lgstaudio-$(GST_API_VERSION) \
+       -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)
index b962390..64c6ae7 100644 (file)
@@ -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)
index 312966c..5985b0b 100644 (file)
@@ -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 \
-       $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ -lgstvideo-@GST_MAJORMINOR@ \
+       $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \
+       $(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)
index 122e8f0..c2dea73 100644 (file)
@@ -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) \
-                               -lgstinterfaces-$(GST_MAJORMINOR) \
+                               -lgstvideo-$(GST_API_VERSION) \
+                               -lgstinterfaces-$(GST_API_VERSION) \
                                $(WAYLAND_LIBS) $(LIBOIL_LIBS)
 libgstwaylandsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstwaylandsink_la_LIBTOOLFLAGS = --tag=disable-static
index 2b1f370..566e2bd 100644 (file)
@@ -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
 
index 2f64080..51f10ba 100644 (file)
@@ -1,39 +1,39 @@
 
-lib_LTLIBRARIES = libgstbasecamerabinsrc-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstbasecamerabinsrc-@GST_API_VERSION@.la
 
 CLEANFILES = $(BUILT_SOURCES)
 
-libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_SOURCES = \
+libgstbasecamerabinsrc_@GST_API_VERSION@_la_SOURCES = \
         gstcamerabin-enum.c \
         gstcamerabinpreview.c \
        gstbasecamerasrc.c
 
-libgstbasecamerabinsrc_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/basecamerabinsrc
-libgstbasecamerabinsrc_@GST_MAJORMINOR@include_HEADERS = \
+libgstbasecamerabinsrc_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/basecamerabinsrc
+libgstbasecamerabinsrc_@GST_API_VERSION@include_HEADERS = \
        gstcamerabin-enum.h \
        gstcamerabinpreview.h \
        gstbasecamerasrc.h
 
-libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstbasecamerabinsrc_@GST_API_VERSION@_la_CFLAGS = \
        $(GST_PLUGINS_BAD_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) \
        -DGST_USE_UNSTABLE_API \
        $(GST_CFLAGS)
-libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LIBADD = \
-       -lgstapp-$(GST_MAJORMINOR) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
+libgstbasecamerabinsrc_@GST_API_VERSION@_la_LIBADD = \
+       -lgstapp-$(GST_API_VERSION) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
 
-libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+libgstbasecamerabinsrc_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 Android.mk: Makefile.am
-       androgenizer -:PROJECT libgstbasecamerabinsrc -:STATIC libgstbasecamerabinsrc-@GST_MAJORMINOR@ \
+       androgenizer -:PROJECT libgstbasecamerabinsrc -:STATIC libgstbasecamerabinsrc-@GST_API_VERSION@ \
         -:TAGS eng debug \
          -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_CFLAGS) \
-        -:LDFLAGS $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LDFLAGS) \
-                  $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LIBADD) \
+        -:SOURCES $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_CFLAGS) \
+        -:LDFLAGS $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_LDFLAGS) \
+                  $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_LIBADD) \
                   -ldl \
-        -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/basecamerabinsrc \
+        -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/basecamerabinsrc \
         -:HEADERS $(libgstbasecamerabinsrcinclude_HEADERS) \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
        > $@
index 2593f85..f6d5926 100644 (file)
@@ -1,42 +1,42 @@
-lib_LTLIBRARIES = libgstcodecparsers-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstcodecparsers-@GST_API_VERSION@.la
 
-libgstcodecparsers_@GST_MAJORMINOR@_la_SOURCES = \
+libgstcodecparsers_@GST_API_VERSION@_la_SOURCES = \
        gstmpegvideoparser.c gsth264parser.c gstvc1parser.c gstmpeg4parser.c \
        parserutils.c
 
-libgstcodecparsers_@GST_MAJORMINOR@includedir = \
-       $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/codecparsers
+libgstcodecparsers_@GST_API_VERSION@includedir = \
+       $(includedir)/gstreamer-@GST_API_VERSION@/gst/codecparsers
 
 noinst_HEADERS = parserutils.h
 
-libgstcodecparsers_@GST_MAJORMINOR@include_HEADERS = \
+libgstcodecparsers_@GST_API_VERSION@include_HEADERS = \
        gstmpegvideoparser.h gsth264parser.h gstvc1parser.h gstmpeg4parser.h
 
-libgstcodecparsers_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstcodecparsers_@GST_API_VERSION@_la_CFLAGS = \
        $(GST_PLUGINS_BAD_CFLAGS) \
        -DGST_USE_UNSTABLE_API \
        $(GST_CFLAGS)
 
-libgstcodecparsers_@GST_MAJORMINOR@_la_LIBADD = \
+libgstcodecparsers_@GST_API_VERSION@_la_LIBADD = \
        $(GST_BASE_LIBS) \
        $(GST_LIBS)
 
-libgstcodecparsers_@GST_MAJORMINOR@_la_LDFLAGS = \
+libgstcodecparsers_@GST_API_VERSION@_la_LDFLAGS = \
        $(GST_LIB_LDFLAGS) \
        $(GST_ALL_LDFLAGS) \
        $(GST_LT_LDFLAGS)
 
 Android.mk:  $(BUILT_SOURCES) Makefile.am
-       androgenizer -:PROJECT libgstcodecparsers -:STATIC libgstcodecparsers-@GST_MAJORMINOR@ \
+       androgenizer -:PROJECT libgstcodecparsers -:STATIC libgstcodecparsers-@GST_API_VERSION@ \
         -:TAGS eng debug \
          -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstcodecparsers_@GST_MAJORMINOR@_la_SOURCES) \
+        -:SOURCES $(libgstcodecparsers_@GST_API_VERSION@_la_SOURCES) \
          $(built_sources) \
-        -:CFLAGS $(DEFS) $(libgstcodecparsers_@GST_MAJORMINOR@_la_CFLAGS) \
-        -:LDFLAGS $(libgstcodecparsers_@GST_MAJORMINOR@_la_LDFLAGS) \
-                  $(libgstcodecparsers@GST_MAJORMINOR@_la_LIBADD) \
+        -:CFLAGS $(DEFS) $(libgstcodecparsers_@GST_API_VERSION@_la_CFLAGS) \
+        -:LDFLAGS $(libgstcodecparsers_@GST_API_VERSION@_la_LDFLAGS) \
+                  $(libgstcodecparsers@GST_API_VERSION@_la_LIBADD) \
                   -ldl \
-        -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/codecparsers \
+        -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/codecparsers \
         -:HEADERS $(libgstcodecparsersinclude_HEADERS) \
          $(built_headers) \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
index e6fb630..6401a83 100644 (file)
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libgstphotography-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstphotography-@GST_API_VERSION@.la
 libgstphotographyincludedir = \
-        $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/interfaces
+        $(includedir)/gstreamer-@GST_API_VERSION@/gst/interfaces
 
 headers_photography =          \
        photography.h
@@ -23,18 +23,18 @@ libgstphotographyinclude_HEADERS = \
 nodist_libgstphotographyinclude_HEADERS = \
        photography-enumtypes.h
 
-libgstphotography_@GST_MAJORMINOR@_la_SOURCES = \
+libgstphotography_@GST_API_VERSION@_la_SOURCES = \
        photography.c
 
-nodist_libgstphotography_@GST_MAJORMINOR@_la_SOURCES =         \
+nodist_libgstphotography_@GST_API_VERSION@_la_SOURCES =        \
        $(built_sources)
 
-libgstphotography_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstphotography_@GST_API_VERSION@_la_CFLAGS = \
        -DGST_USE_UNSTABLE_API \
        $(GST_PLUGINS_BAD_CFLAGS) \
        $(GST_CFLAGS)
-libgstphotography_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) 
-libgstphotography_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+libgstphotography_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) 
+libgstphotography_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 BUILT_SOURCES = \
        $(built_sources) \
@@ -45,16 +45,16 @@ CLEANFILES = $(BUILT_SOURCES)
 include $(top_srcdir)/common/gst-glib-gen.mak
 
 Android.mk:  $(BUILT_SOURCES) Makefile.am
-       androgenizer -:PROJECT libgstphotography -:STATIC libgstphotography-@GST_MAJORMINOR@ \
+       androgenizer -:PROJECT libgstphotography -:STATIC libgstphotography-@GST_API_VERSION@ \
         -:TAGS eng debug \
          -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstphotography_@GST_MAJORMINOR@_la_SOURCES) \
+        -:SOURCES $(libgstphotography_@GST_API_VERSION@_la_SOURCES) \
          $(built_sources) \
-        -:CFLAGS $(DEFS) $(libgstphotography_@GST_MAJORMINOR@_la_CFLAGS) \
-        -:LDFLAGS $(libgstphotography_@GST_MAJORMINOR@_la_LDFLAGS) \
-                  $(libgstphotography_@GST_MAJORMINOR@_la_LIBADD) \
+        -:CFLAGS $(DEFS) $(libgstphotography_@GST_API_VERSION@_la_CFLAGS) \
+        -:LDFLAGS $(libgstphotography_@GST_API_VERSION@_la_LDFLAGS) \
+                  $(libgstphotography_@GST_API_VERSION@_la_LIBADD) \
                   -ldl \
-        -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/photography \
+        -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/photography \
         -:HEADERS $(libgstphotographyinclude_HEADERS) \
          $(built_headers) \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
index 9172685..c1c6fb1 100644 (file)
@@ -1,16 +1,16 @@
-lib_LTLIBRARIES = libgstsignalprocessor-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstsignalprocessor-@GST_API_VERSION@.la
 
-libgstsignalprocessor_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/signalprocessor
-libgstsignalprocessor_@GST_MAJORMINOR@include_HEADERS = gstsignalprocessor.h
+libgstsignalprocessor_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/signalprocessor
+libgstsignalprocessor_@GST_API_VERSION@include_HEADERS = gstsignalprocessor.h
 
-libgstsignalprocessor_@GST_MAJORMINOR@_la_SOURCES = gstsignalprocessor.c
-libgstsignalprocessor_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstsignalprocessor_@GST_API_VERSION@_la_SOURCES = gstsignalprocessor.c
+libgstsignalprocessor_@GST_API_VERSION@_la_CFLAGS = \
     $(GST_PLUGINS_BAD_CFLAGS) \
     $(GST_PLUGINS_BASE_CFLAGS) \
     $(GST_CFLAGS)
-libgstsignalprocessor_@GST_MAJORMINOR@_la_LIBADD = \
-    $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
+libgstsignalprocessor_@GST_API_VERSION@_la_LIBADD = \
+    $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
     $(GST_LIBS)
-libgstsignalprocessor_@GST_MAJORMINOR@_la_LDFLAGS = \
+libgstsignalprocessor_@GST_API_VERSION@_la_LDFLAGS = \
     $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
index 56f2572..52abc1d 100644 (file)
@@ -1,9 +1,9 @@
 
-lib_LTLIBRARIES = libgstbasevideo-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstbasevideo-@GST_API_VERSION@.la
 
 CLEANFILES = $(BUILT_SOURCES)
 
-libgstbasevideo_@GST_MAJORMINOR@_la_SOURCES = \
+libgstbasevideo_@GST_API_VERSION@_la_SOURCES = \
        gstbasevideocodec.c \
        gstbasevideoutils.c \
        gstbasevideodecoder.c \
@@ -12,8 +12,8 @@ libgstbasevideo_@GST_MAJORMINOR@_la_SOURCES = \
        gstsurfaceconverter.c \
        videocontext.c
 
-libgstbasevideo_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
-libgstbasevideo_@GST_MAJORMINOR@include_HEADERS = \
+libgstbasevideo_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/video
+libgstbasevideo_@GST_API_VERSION@include_HEADERS = \
        gstbasevideocodec.h \
        gstbasevideoutils.h \
        gstbasevideodecoder.h \
@@ -22,11 +22,11 @@ libgstbasevideo_@GST_MAJORMINOR@include_HEADERS = \
        gstsurfaceconverter.h \
        videocontext.h
 
-libgstbasevideo_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstbasevideo_@GST_API_VERSION@_la_CFLAGS = \
        $(GST_PLUGINS_BAD_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) \
        -DGST_USE_UNSTABLE_API \
        $(GST_CFLAGS)
-libgstbasevideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_MAJORMINOR@
-libgstbasevideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+libgstbasevideo_@GST_API_VERSION@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_API_VERSION@
+libgstbasevideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
index 0a728a7..03072f3 100644 (file)
@@ -1,4 +1,4 @@
-%define majorminor   @GST_MAJORMINOR@
+%define majorminor   @GST_API_VERSION@
 %define gstreamer    gstreamer
 
 %define gst_minver   0.10.30
index f82cb9b..16b29e5 100644 (file)
@@ -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
index bfd945d..1ae6eba 100644 (file)
@@ -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
index 2eb8392..7154d3b 100644 (file)
@@ -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)
index 8678fee..0c23883 100644 (file)
@@ -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
 
index ff63c8c..4bf528f 100644 (file)
@@ -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
index c83f84a..e92fa16 100644 (file)
@@ -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) \
-       -lgstvideo-$(GST_MAJORMINOR) -lgstfft-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
+       -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
index d67899e..53c810f 100644 (file)
@@ -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)
index b29a54d..58147bc 100644 (file)
@@ -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@ \
-                 gstbasecamerabinsrc-@GST_MAJORMINOR@ \
+        -:LIBFILTER_STATIC gstphotography-@GST_API_VERSION@ \
+                 gstbasecamerabinsrc-@GST_API_VERSION@ \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
                       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
        > $@
index 3433263..011ea78 100644 (file)
@@ -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/basecamerabinsrc/libgstbasecamerabinsrc-$(GST_MAJORMINOR).la \
-       $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR) -lgstapp-$(GST_MAJORMINOR) -lgstpbutils-$(GST_MAJORMINOR) \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_API_VERSION).la \
+       $(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-$(GST_API_VERSION).la \
+       $(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@ \
-                 gstbasecamerabinsrc-@GST_MAJORMINOR@ \
+        -:LIBFILTER_STATIC gstphotography-@GST_API_VERSION@ \
+                 gstbasecamerabinsrc-@GST_API_VERSION@ \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
                       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
        > $@
index f7a11db..bcf7828 100644 (file)
@@ -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
index 24a8b80..839f127 100644 (file)
@@ -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)
index b35bb4d..ebcbde5 100644 (file)
@@ -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) \
-       -lgstinterfaces-$(GST_MAJORMINOR) $(GST_LIBS)
+       -lgstvideo-$(GST_API_VERSION) \
+       -lgstinterfaces-$(GST_API_VERSION) $(GST_LIBS)
 libgstdebugutilsbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdebugutilsbad_la_LIBTOOLFLAGS = --tag=disable-static
 
index d574323..00b648f 100644 (file)
@@ -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
index 8598612..8577316 100644 (file)
@@ -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
 
index 0acbcb9..b616aae 100644 (file)
@@ -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
index 30b780c..74ce30a 100644 (file)
@@ -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
 
index e6c02ad..aeaf61b 100644 (file)
@@ -14,8 +14,8 @@ libgstfieldanalysis_la_CFLAGS = \
        $(ORC_CFLAGS)
 
 libgstfieldanalysis_la_LIBADD = \
-       $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \
-       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+       $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(ORC_LIBS)
index 3a1ebbd..79b23b8 100644 (file)
@@ -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
 
index 9537e7a..84d9fbe 100644 (file)
@@ -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
 
index 9072044..4f11c8a 100644 (file)
@@ -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@ \
-                            -lgstinterfaces-@GST_MAJORMINOR@ \
+                            -lgstvideo-@GST_API_VERSION@ \
+                            -lgstinterfaces-@GST_API_VERSION@ \
                             $(GST_BASE_LIBS) \
                             $(GST_LIBS) $(LIBM)
 libgstgeometrictransform_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
index f2ed73d..8b39b11 100644 (file)
@@ -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)
index e404959..5ae0985 100644 (file)
@@ -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)
index 5e29e8b..53ec195 100644 (file)
@@ -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)
index 80355d5..0fe07a8 100644 (file)
@@ -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@ \
-    -lgsttag-@GST_MAJORMINOR@ $(GST_LIBS) $(GST_BASE_LIBS)
+    $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_API_VERSION@ \
+    -lgsttag-@GST_API_VERSION@ $(GST_LIBS) $(GST_BASE_LIBS)
 libgstjpegformat_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstjpegformat_la_LIBTOOLFLAGS = --tag=disable-static
 
index 0bbeff9..303503f 100644 (file)
@@ -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
index 2932fee..d1372fb 100644 (file)
@@ -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
index ced0eac..e6b727e 100644 (file)
@@ -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
index 99adf80..a4a9801 100644 (file)
@@ -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
 
index ac6478e..5849913 100644 (file)
@@ -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
 
index 7c0e564..5e44528 100644 (file)
@@ -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)
index e702131..9d1542b 100644 (file)
@@ -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
 
index ac0aadc..254f3cf 100644 (file)
@@ -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)
index 6681e4a..8fc414e 100644 (file)
@@ -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
index 3947648..50fb6d7 100644 (file)
@@ -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' \
-       > $@
\ No newline at end of file
+                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-@GST_API_VERSION@' \
+       > $@
index c21e27a..4af684b 100644 (file)
@@ -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@' \
        > $@
index d9c8293..b19254b 100644 (file)
@@ -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
index c1627c4..b030401 100644 (file)
@@ -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@ \
-                      -lgstrtp-@GST_MAJORMINOR@ -lgstsdp-@GST_MAJORMINOR@ \
+                      -lgstinterfaces-@GST_API_VERSION@ \
+                      -lgstrtp-@GST_API_VERSION@ -lgstsdp-@GST_API_VERSION@ \
                       $(GST_LIBS) $(WIN32_LIBS)
 libgstsdpelem_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsdpelem_la_LIBTOOLFLAGS = --tag=disable-static
index 82540cb..463b485 100644 (file)
@@ -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
 
index c6d1d8c..21ccd04 100644 (file)
@@ -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
index 36de161..d3e430e 100644 (file)
@@ -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)
index 2efe4a6..22a8972 100644 (file)
@@ -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
 
index 0627ef4..6a142f1 100644 (file)
@@ -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) \
index f8829d3..8be08e5 100644 (file)
@@ -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
 
index 49baeac..6fd7f3f 100644 (file)
@@ -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 \
-       $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) \
+       $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-$(GST_API_VERSION).la \
+       $(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@ \
-                           gstcodecparsers-@GST_MAJORMINOR@ \
+        -:LIBFILTER_STATIC gstbaseparse-@GST_API_VERSION@ \
+                           gstcodecparsers-@GST_API_VERSION@ \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
                       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
        > $@
index a10ab8e..1b3fd51 100644 (file)
@@ -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
 
index ce35c18..bee1397 100644 (file)
@@ -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_LIBS) -lgstbase-@GST_MAJORMINOR@ \
+       $(GST_BASE_PLUGINS_LIBS) -lgstvideo-@GST_API_VERSION@ \
+       $(GST_BASE_LIBS) -lgstbase-@GST_API_VERSION@ \
        $(GST_LIBS)
 libgsty4mdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsty4mdec_la_LIBTOOLFLAGS = --tag=disable-static
index 4058adc..6ab9bfd 100644 (file)
@@ -1,13 +1,13 @@
 ### all of the standard pc files we need to generate
 pcverfiles =  \
-       gstreamer-plugins-bad-@GST_MAJORMINOR@.pc \
-       gstreamer-codecparsers-@GST_MAJORMINOR@.pc \
-       gstreamer-basevideo-@GST_MAJORMINOR@.pc
+       gstreamer-plugins-bad-@GST_API_VERSION@.pc \
+       gstreamer-codecparsers-@GST_API_VERSION@.pc \
+       gstreamer-basevideo-@GST_API_VERSION@.pc
 
 pcverfiles_uninstalled = \
-       gstreamer-plugins-bad-@GST_MAJORMINOR@-uninstalled.pc \
-       gstreamer-codecparsers-@GST_MAJORMINOR@-uninstalled.pc \
-       gstreamer-basevideo-@GST_MAJORMINOR@-uninstalled.pc
+       gstreamer-plugins-bad-@GST_API_VERSION@-uninstalled.pc \
+       gstreamer-codecparsers-@GST_API_VERSION@-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
index 151e66f..9013937 100644 (file)
@@ -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}
 
index d892fac..eac324c 100644 (file)
@@ -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}
 
index 5a01ba8..d1bb9b0 100644 (file)
@@ -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}
 
index e2fc6d1..9d1010a 100644 (file)
@@ -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}
 
index 4b6d69d..c3ed14c 100644 (file)
@@ -6,8 +6,8 @@ includedir=${pcfiledir}/../gst-libs
 Name: GStreamer Bad Plugin libraries, Uninstalled
 Description: Currently includes the photography interface library, uninstalled
 Version: @VERSION@
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
 
-Libs: -L${libdir} ${libdir}/libgstphotography-@GST_MAJORMINOR@.la
+Libs: -L${libdir} ${libdir}/libgstphotography-@GST_API_VERSION@.la
 Cflags: -I${includedir}
 
index 5e21301..753d9f3 100644 (file)
@@ -1,11 +1,11 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+includedir=@includedir@/gstreamer-@GST_API_VERSION@
 
 Name: GStreamer Bad Plugin libraries
 Description: Currently includes the photography interface library
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
 Version: @VERSION@
-Libs: -L${libdir} -lgstphotography-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstphotography-@GST_API_VERSION@
 Cflags: -I${includedir}
index eb1b603..2abad53 100644 (file)
@@ -6,9 +6,9 @@ libgstacmenc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
 libgstacmenc_la_LIBADD =     \
     $(GST_BASE_LIBS)             \
     $(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)   \
     -lmsacm32
 
 libgstacmenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
index f927c72..1d7b27e 100644 (file)
@@ -6,9 +6,9 @@ libgstacmmp3dec_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
 libgstacmmp3dec_la_LIBADD =      \
     $(GST_BASE_LIBS)             \
     $(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)   \
     -lmsacm32
 libgstacmmp3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)
 libgstacmmp3dec_la_LIBTOOLFLAGS = --tag=disable-static
index f7b853d..e2b5395 100644 (file)
@@ -25,8 +25,8 @@ libgstapplemedia_la_OBJCFLAGS =                       \
 libgstapplemedia_la_LIBADD =                   \
        $(GST_BASE_LIBS)                        \
        $(GST_PLUGINS_BASE_LIBS)                \
-       -lgstinterfaces-$(GST_MAJORMINOR)       \
-       -lgstvideo-$(GST_MAJORMINOR)
+       -lgstinterfaces-$(GST_API_VERSION)      \
+       -lgstvideo-$(GST_API_VERSION)
 
 libgstapplemedia_la_LIBTOOLFLAGS = --tag=disable-static
 
index 963f514..3151273 100644 (file)
@@ -9,8 +9,8 @@ libgstavc_la_CPPFLAGS = \
        -framework AVCVideoServices \
        -Wno-deprecated-declarations
 libgstavc_la_LIBADD =  \
-       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-       -lgstinterfaces-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
+       -lgstinterfaces-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) \
        $(GST_LIBS)
 
index 76b7920..1c6d24b 100644 (file)
@@ -6,7 +6,7 @@ libgstd3dvideosink_la_SOURCES = d3dvideosink.c directx/d3d.c directx/dx.c \
        directx/directx11/dx11.c directx/directx11/dx11_d3d.c
 libgstd3dvideosink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) $(DIRECTX_CFLAGS)
 libgstd3dvideosink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-       -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \
+       -lgstvideo-$(GST_API_VERSION) -lgstinterfaces-$(GST_API_VERSION) \
        $(DIRECT3D_LIBS)
 libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFAGS)
 libgstd3dvideosink_la_LIBTOOLFLAGS = --tag=disable-static
index 9d12601..8e95995 100644 (file)
@@ -10,8 +10,8 @@ libgstdecklink_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
-       -lgstvideo-@GST_MAJORMINOR@ \
-       -lgstinterfaces-@GST_MAJORMINOR@ \
+       -lgstvideo-@GST_API_VERSION@ \
+       -lgstinterfaces-@GST_API_VERSION@ \
        $(DECKLINK_LIBS) \
        $(LIBM)
 libgstdecklink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
index 559db9b..16fc150 100644 (file)
@@ -4,8 +4,8 @@ libgstdirectdrawsink_la_SOURCES =  gstdirectdrawsink.c gstdirectdrawplugin.c
 libgstdirectdrawsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_CFLAGS)
 libgstdirectdrawsink_la_LIBADD = $(DIRECTDRAW_LIBS) \
-       $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-       -lgstinterfaces-$(GST_MAJORMINOR)
+       $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
+       -lgstinterfaces-$(GST_API_VERSION)
 libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS)
 libgstdirectdrawsink_la_LIBTOOLFLAGS = --tag=disable-static
 
index cd1e059..bdb48bd 100644 (file)
@@ -4,8 +4,8 @@ libgstdirectsoundsrc_la_SOURCES =  gstdirectsoundsrc.c gstdirectsoundplugin.c
 libgstdirectsoundsrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_CFLAGS)
 libgstdirectsoundsrc_la_LIBADD = $(DIRECTDRAW_LIBS) \
-       $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
-       -lgstinterfaces-$(GST_MAJORMINOR) -ldsound
+       $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
+       -lgstinterfaces-$(GST_API_VERSION) -ldsound
 libgstdirectsoundsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS)
 libgstdirectsoundsrc_la_LIBTOOLFLAGS = --tag=disable-static
 
index c62d46f..0ad2635 100644 (file)
@@ -5,7 +5,7 @@ libgstdshowdecwrapper_la_SOURCES = gstdshowaudiodec.cpp gstdshowdecwrapper.cpp \
                                                                   gstdshowfakesrc.cpp
 
 libgstdshowdecwrapper_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst-libs/gst -DLIBGSTDSHOWDECWRAPPER_EXPORTS
-libgstdshowdecwrapper_la_LIBADD = $(top_builddir)/gst-libs/gst/dshow/libgstdshow-@GST_MAJORMINOR@.la \
+libgstdshowdecwrapper_la_LIBADD = $(top_builddir)/gst-libs/gst/dshow/libgstdshow-@GST_API_VERSION@.la \
        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstdshowdecwrapper_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdshowdecwrapper_la_LIBTOOLFLAGS = --tag=disable-static
index 53391f7..56f4325 100644 (file)
@@ -5,8 +5,8 @@ libgstosxvideosrc_la_SOURCES = osxvideoplugin.c osxvideosrc.c
 libgstosxvideosrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) -Wno-deprecated-declarations
 libgstosxvideosrc_la_LIBADD =  \
-       $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-       -lgstinterfaces-$(GST_MAJORMINOR)
+       $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
+       -lgstinterfaces-$(GST_API_VERSION)
 
 libgstosxvideosrc_la_LIBTOOLFLAGS = --tag=disable-static
 
index b450710..fd94d4a 100644 (file)
@@ -8,8 +8,8 @@ libgstpvr_la_SOURCES = \
 libgstpvr_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(PVR_CFLAGS)
 
 libgstpvr_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \
-       $(GST_PLUGINS_BASE_LIBS) $(X11_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-       -lgstinterfaces-$(GST_MAJORMINOR) -lpvr2d -lpvrPVR2D_DRIWSEGL\
+       $(GST_PLUGINS_BASE_LIBS) $(X11_LIBS) -lgstvideo-$(GST_API_VERSION) \
+       -lgstinterfaces-$(GST_API_VERSION) -lpvr2d -lpvrPVR2D_DRIWSEGL\
        $(PVR_LIBS) \
        $(LIBM)
 
index dabba08..d507d4a 100644 (file)
@@ -21,9 +21,9 @@ libgstvdpau_la_SOURCES = \
 libgstvdpau_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X11_CFLAGS) $(VDPAU_CFLAGS)
 
 libgstvdpau_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \
-       $(GST_PLUGINS_BASE_LIBS) $(X11_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-       -lgstinterfaces-$(GST_MAJORMINOR) $(VDPAU_LIBS) \
-       gstvdp/libgstvdp-@GST_MAJORMINOR@.la \
+       $(GST_PLUGINS_BASE_LIBS) $(X11_LIBS) -lgstvideo-$(GST_API_VERSION) \
+       -lgstinterfaces-$(GST_API_VERSION) $(VDPAU_LIBS) \
+       gstvdp/libgstvdp-@GST_API_VERSION@.la \
        $(LIBM)
        
 libgstvdpau_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
index 76bdea5..fcd5084 100644 (file)
@@ -8,7 +8,7 @@ libgstbasevideodecoder_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
        -DGstBaseVideoDecoder=SatBaseVideoDecoder \
        -DGstBaseVideoDecoderClass=SatBaseVideoDecoderClass
 libgstbasevideodecoder_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
 
 libgstbasevideodecoder_la_LDFLAGS = $(GST_ALL_LDFLAGS) -module -avoid-version
index 3759690..982b21f 100644 (file)
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libgstvdp-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstvdp-@GST_API_VERSION@.la
  
-libgstvdp_@GST_MAJORMINOR@_la_SOURCES = \
+libgstvdp_@GST_API_VERSION@_la_SOURCES = \
        gstvdpdevice.c \
        gstvdputils.c \
        gstvdpbuffer.c \
@@ -14,8 +14,8 @@ libgstvdp_@GST_MAJORMINOR@_la_SOURCES = \
        gstvdpdecoder.c \
        gstvdp.c 
        
-libgstvdp_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/vdpau
-libgstvdp_@GST_MAJORMINOR@include_HEADERS = \
+libgstvdp_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/vdpau
+libgstvdp_@GST_API_VERSION@include_HEADERS = \
        gstvdpdevice.h \
        gstvdputils.h \
        gstvdpbuffer.h \
@@ -29,12 +29,12 @@ libgstvdp_@GST_MAJORMINOR@include_HEADERS = \
        gstvdpdecoder.h \
        gstvdp.h
  
-libgstvdp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+libgstvdp_@GST_API_VERSION@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) $(X11_CFLAGS) $(VDPAU_CFLAGS)
   
-libgstvdp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(X11_LIBS) $(VDPAU_LIBS) \
-       -lgstvideo-$(GST_MAJORMINOR) \
+libgstvdp_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) $(X11_LIBS) $(VDPAU_LIBS) \
+       -lgstvideo-$(GST_API_VERSION) \
        ../basevideodecoder/libgstbasevideodecoder.la
   
-libgstvdp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_LT_LDFLAGS) $(GST_ALL_LDFLAGS)
-libgstvdp_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvdp_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_LT_LDFLAGS) $(GST_ALL_LDFLAGS)
+libgstvdp_@GST_API_VERSION@_la_LIBTOOLFLAGS = --tag=disable-static
index 1a5d6ee..a1e3577 100644 (file)
@@ -21,7 +21,7 @@ TESTS_ENVIRONMENT = \
            rsndvdbin sdlaudiosink sdlvideosink vcdsrc rfbsrc vdpauyuvvideo vdpauvideoyuv \
            vdpaumpegdec vdpaumpeg4dec vdpauh264dec vdpauvideopostprocess vdpausink neonhttpsrc"
 
-plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
+plugindir = $(libdir)/gstreamer-@GST_API_VERSION@
 
 # override to _not_ install the test plugins
 install-pluginLTLIBRARIES:
@@ -240,8 +240,8 @@ libs_mpegvideoparser_CFLAGS = \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
 
 libs_mpegvideoparser_LDADD = \
-       $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_MAJORMINOR@.la \
-       $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_MAJORMINOR@ \
+       $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la \
+       $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD)
 
 libs_h264parser_CFLAGS = \
@@ -250,8 +250,8 @@ libs_h264parser_CFLAGS = \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
 
 libs_h264parser_LDADD = \
-       $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_MAJORMINOR@.la \
-       $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_MAJORMINOR@ \
+       $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la \
+       $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD)
 
 libs_vc1parser_CFLAGS = \
@@ -260,8 +260,8 @@ libs_vc1parser_CFLAGS = \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
 
 libs_vc1parser_LDADD = \
-       $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_MAJORMINOR@.la \
-       $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_MAJORMINOR@ \
+       $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la \
+       $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD)
 
 elements_faad_CFLAGS = \
@@ -269,28 +269,28 @@ elements_faad_CFLAGS = \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
 elements_faad_LDADD = \
        $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
-       -lgstaudio-@GST_MAJORMINOR@
+       -lgstaudio-@GST_API_VERSION@
 
 elements_faac_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
 elements_faac_LDADD = \
        $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
-       -lgstaudio-@GST_MAJORMINOR@
+       -lgstaudio-@GST_API_VERSION@
 
 elements_legacyresample_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
 elements_legacyresample_LDADD = \
        $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
-       -lgstaudio-@GST_MAJORMINOR@
+       -lgstaudio-@GST_API_VERSION@
 
 elements_voaacenc_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
 elements_voaacenc_LDADD = \
        $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
-       -lgstaudio-@GST_MAJORMINOR@
+       -lgstaudio-@GST_API_VERSION@
 
 elements_baseaudiovisualizer_SOURCES = elements/baseaudiovisualizer.c \
        $(top_srcdir)/gst/audiovisualizers/gstbaseaudiovisualizer.c \
@@ -299,16 +299,16 @@ elements_baseaudiovisualizer_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
        -I$(top_srcdir)/gst/audiovisualizers $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
 elements_baseaudiovisualizer_LDADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@  \
-       -lgstvideo-@GST_MAJORMINOR@     $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@  \
+       -lgstvideo-@GST_API_VERSION@    $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) \
        $(GST_LIBS) $(LDADD)
 
 elements_camerabin_CFLAGS = \
        $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) -DGST_USE_UNSTABLE_API
 elements_camerabin_LDADD = \
-       $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
-       $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \
+       $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD)
 
 elements_camerabin_SOURCES = elements/camerabin.c
@@ -317,14 +317,14 @@ elements_camerabin2_CFLAGS = \
        $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) -DGST_USE_UNSTABLE_API
 elements_camerabin2_LDADD = \
-        $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
-        $(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_MAJORMINOR@.la \
-        -lgstpbutils-$(GST_MAJORMINOR) \
+        $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \
+        $(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_API_VERSION@.la \
+        -lgstpbutils-$(GST_API_VERSION) \
         $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD)
 elements_camerabin2_SOURCES = elements/camerabin2.c
 
 elements_jifmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(EXIF_CFLAGS) $(AM_CFLAGS)
-elements_jifmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) $(GST_CHECK_LIBS) $(EXIF_LIBS) $(LDADD)
+elements_jifmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) $(GST_CHECK_LIBS) $(EXIF_LIBS) $(LDADD)
 elements_jifmux_SOURCES = elements/jifmux.c
 
 elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
@@ -334,13 +334,13 @@ elements_kate_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
 elements_kate_LDADD = $(GST_BASE_LIBS) $(LDADD)
 
 elements_rtpmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
-elements_rtpmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LDADD)
+elements_rtpmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LDADD)
 
 elements_assrender_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
-elements_assrender_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstapp-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LDADD)
+elements_assrender_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) -lgstapp-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LDADD)
 
 elements_mpegtsmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
-elements_mpegtsmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LDADD)
+elements_mpegtsmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LDADD)
 
 
 EXTRA_DIST = gst-plugins-bad.supp
index aa9f23f..28f0441 100644 (file)
@@ -12,10 +12,10 @@ gst_camera_CFLAGS  = \
        $(GMODULE_EXPORT_CFLAGS) \
         -DGST_USE_UNSTABLE_API
 gst_camera_LDADD   = \
-        $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
+        $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \
         $(GST_PLUGINS_BASE_LIBS) \
-        -lgstinterfaces-@GST_MAJORMINOR@ \
-        -lgstvideo-@GST_MAJORMINOR@ \
+        -lgstinterfaces-@GST_API_VERSION@ \
+        -lgstvideo-@GST_API_VERSION@ \
         $(GST_LIBS) \
        $(GTK_LIBS) \
        $(GMODULE_EXPORT_LIBS)
@@ -39,9 +39,9 @@ GST_CAMERABIN_X11_EXAMPLES = gst-camerabin-test
 gst_camerabin_test_SOURCES = gst-camerabin-test.c
 gst_camerabin_test_CFLAGS  = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS)
 gst_camerabin_test_LDADD   = \
-       $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
-       -lgstinterfaces-@GST_MAJORMINOR@ \
-        -lgstvideo-@GST_MAJORMINOR@ \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \
+       -lgstinterfaces-@GST_API_VERSION@ \
+        -lgstvideo-@GST_API_VERSION@ \
        $(GST_LIBS) \
        $(GST_PLUGINS_BASE_LIBS) \
        $(X11_LIBS)
index acad9c0..2fb8ab1 100644 (file)
@@ -12,11 +12,11 @@ gst_camera2_CFLAGS  = \
        $(GMODULE_EXPORT_CFLAGS) \
         -DGST_USE_UNSTABLE_API
 gst_camera2_LDADD   = \
-        $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
+        $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \
         $(GST_PLUGINS_BASE_LIBS) \
-        -lgstinterfaces-@GST_MAJORMINOR@ \
-        -lgstpbutils-@GST_MAJORMINOR@ \
-       -lgstvideo-@GST_MAJORMINOR@ \
+        -lgstinterfaces-@GST_API_VERSION@ \
+        -lgstpbutils-@GST_API_VERSION@ \
+       -lgstvideo-@GST_API_VERSION@ \
         $(GST_LIBS) \
        $(GTK_LIBS) \
        $(GMODULE_EXPORT_LIBS)
@@ -36,11 +36,11 @@ GST_CAMERABIN_X11_EXAMPLES = gst-camerabin2-test
 gst_camerabin2_test_SOURCES = gst-camerabin2-test.c
 gst_camerabin2_test_CFLAGS  = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS)
 gst_camerabin2_test_LDADD   = \
-       $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \
        $(GST_PLUGINS_BASE_LIBS) \
-       -lgstinterfaces-@GST_MAJORMINOR@ \
-       -lgstpbutils-@GST_MAJORMINOR@ \
-       -lgstvideo-@GST_MAJORMINOR@ \
+       -lgstinterfaces-@GST_API_VERSION@ \
+       -lgstpbutils-@GST_API_VERSION@ \
+       -lgstvideo-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(X11_LIBS)
index cbae9cb..6d7cf3a 100644 (file)
@@ -5,7 +5,7 @@ player_SOURCES = player.c
 player_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
 player_LDFLAGS = \
     $(GST_LIBS) \
-    $(top_builddir)/gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la \
-    $(top_builddir)/gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la \
-    $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
+    $(top_builddir)/gst-libs/gst/gconf/libgstgconf-@GST_API_VERSION@.la \
+    $(top_builddir)/gst-libs/gst/play/libgstplay-@GST_API_VERSION@.la \
+    $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_API_VERSION).la
 
index 245084c..18a1ab9 100644 (file)
@@ -5,7 +5,7 @@ ERROR_CFLAGS=
 
 scaletempo_demo_SOURCES = demo-main.c demo-player.c demo-gui.c
 scaletempo_demo_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
-scaletempo_demo_LDFLAGS = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ $(GST_LIBS) $(GTK_LIBS)
+scaletempo_demo_LDFLAGS = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_API_VERSION@ $(GST_LIBS) $(GTK_LIBS)
 
 noinst_HEADERS = demo-player.h demo-gui.h
 
index 382a51c..c56fa6d 100644 (file)
@@ -6,7 +6,7 @@
 #undef ENABLE_NLS
 
 /* gettext package name */
-#define GETTEXT_PACKAGE "gst-plugins-bad-0.11"
+#define GETTEXT_PACKAGE "gst-plugins-bad-1.0"
 
 /* PREFIX - specifically added for Windows for easier moving */
 #define PREFIX "C:\\gstreamer"