summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac27
-rw-r--r--docs/plugins/Makefile.am2
-rw-r--r--docs/plugins/gst-plugins-ugly-plugins-docs.sgml4
-rw-r--r--docs/version.entities.in2
-rw-r--r--ext/a52dec/Makefile.am2
-rw-r--r--ext/amrnb/Makefile.am4
-rw-r--r--ext/amrwbdec/Makefile.am2
-rw-r--r--ext/cdio/Makefile.am2
-rw-r--r--ext/lame/Makefile.am2
-rw-r--r--ext/mad/Makefile.am2
-rw-r--r--ext/mpeg2dec/Makefile.am2
-rw-r--r--ext/sidplay/Makefile.am2
-rw-r--r--ext/twolame/Makefile.am2
-rw-r--r--ext/x264/Makefile.am6
-rw-r--r--gst-plugins-ugly.spec.in2
-rw-r--r--gst/asfdemux/Makefile.am4
-rw-r--r--gst/dvdlpcmdec/Makefile.am2
-rw-r--r--gst/dvdsub/Makefile.am2
-rw-r--r--gst/realmedia/Makefile.am6
-rw-r--r--pkgconfig/Makefile.am8
-rw-r--r--pkgconfig/gstreamer-plugins-ugly-uninstalled.pc.in2
-rw-r--r--tests/check/Makefile.am2
22 files changed, 45 insertions, 44 deletions
diff --git a/configure.ac b/configure.ac
index d516870c..fa748efd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,11 +37,12 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
[AM_DEFAULT_VERBOSITY=1
AC_SUBST(AM_DEFAULT_VERBOSITY)])
-dnl our libraries and install dirs use major.minor as a version
-GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
-dnl we override it here if we need to for the release candidate of new series
-GST_MAJORMINOR=0.11
-AC_SUBST(GST_MAJORMINOR)
+dnl our libraries and install dirs use GST_API_VERSION in the filename
+dnl to allow side-by-side installation of different API versions
+GST_API_VERSION=1.0
+AC_SUBST(GST_API_VERSION)
+AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION",
+ [GStreamer API Version])
dnl FIXME: this macro doesn't actually work;
dnl the generated libtool script has no support for the listed tags.
@@ -67,7 +68,7 @@ dnl set up gettext
dnl the version check needs to stay here because autopoint greps for it
AM_GNU_GETTEXT_VERSION(0.17)
AM_GNU_GETTEXT([external])
-AG_GST_GETTEXT([gst-plugins-ugly-$GST_MAJORMINOR])
+AG_GST_GETTEXT([gst-plugins-ugly-$GST_API_VERSION])
dnl *** check for arguments to configure ***
@@ -161,16 +162,16 @@ ORC_CHECK([0.4.6])
dnl checks for gstreamer
dnl uninstalled is selected preferentially -- see pkg-config(1)
-AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ], yes)
-AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ], yes)
-AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
-AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], yes)
+AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ], yes)
+AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ], yes)
+AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no)
+AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ], yes)
AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
dnl Check for documentation xrefs
GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
-GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`"
-GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_MAJORMINOR`"
+GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_API_VERSION`"
+GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_API_VERSION`"
AC_SUBST(GLIB_PREFIX)
AC_SUBST(GST_PREFIX)
AC_SUBST(GSTPB_PREFIX)
@@ -483,7 +484,7 @@ sed \
-e 's/.* GST_DATADIR$/#define GST_DATADIR PREFIX "\\\\share"/' \
-e 's/.* GST_LEVEL_DEFAULT$/#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR/' \
-e 's/.* GST_LICENSE$/#define GST_LICENSE "'$GST_LICENSE'"/' \
- -e 's/.* GST_MAJORMINOR$/#define GST_MAJORMINOR "'$GST_MAJORMINOR'"/' \
+ -e 's/.* GST_API_VERSION$/#define GST_API_VERSION "'$GST_API_VERSION'"/' \
-e "s,.* GST_PACKAGE_NAME$,#define GST_PACKAGE_NAME \"${GST_PACKAGE_NAME}\"," \
-e 's/.* GST_PACKAGE_ORIGIN$/#define GST_PACKAGE_ORIGIN "Unknown package origin"/' \
-e "s,.* GST_PACKAGE_RELEASE_DATETIME$,#define GST_PACKAGE_RELEASE_DATETIME \"${GST_PACKAGE_RELEASE_DATETIME}\"," \
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index d574585c..0c8bff12 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -3,7 +3,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj
## Process this file with automake to produce Makefile.in
# The name of the module, e.g. 'glib'.
-#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@
+#DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@
MODULE=gst-plugins-ugly
DOC_MODULE=$(MODULE)-plugins
diff --git a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml
index 29471737..cb475b2a 100644
--- a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml
@@ -7,9 +7,9 @@
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
- <title>GStreamer Ugly Plugins &GST_MAJORMINOR; Plugins Reference Manual</title>
+ <title>GStreamer Ugly Plugins &GST_API_VERSION; Plugins Reference Manual</title>
<releaseinfo>
- for GStreamer Ugly Plugins &GST_MAJORMINOR; (&GST_VERSION;)
+ for GStreamer Ugly Plugins &GST_API_VERSION; (&GST_VERSION;)
The latest version of this documentation can be found on-line at
<ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-ugly/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-ugly/html/</ulink>.
</releaseinfo>
diff --git a/docs/version.entities.in b/docs/version.entities.in
index 79a68981..286989f5 100644
--- a/docs/version.entities.in
+++ b/docs/version.entities.in
@@ -1,2 +1,2 @@
-<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@">
+<!ENTITY GST_API_VERSION "@GST_API_VERSION@">
<!ENTITY GST_VERSION "@VERSION@">
diff --git a/ext/a52dec/Makefile.am b/ext/a52dec/Makefile.am
index bf56cc99..65c4d266 100644
--- a/ext/a52dec/Makefile.am
+++ b/ext/a52dec/Makefile.am
@@ -11,7 +11,7 @@ libgsta52dec_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
$(GST_BASE_LIBS) \
$(GST_LIBS) \
- -lgstaudio-$(GST_MAJORMINOR) \
+ -lgstaudio-$(GST_API_VERSION) \
$(ORC_LIBS) \
$(A52DEC_LIBS)
libgsta52dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/ext/amrnb/Makefile.am b/ext/amrnb/Makefile.am
index 4e528dc1..93793967 100644
--- a/ext/amrnb/Makefile.am
+++ b/ext/amrnb/Makefile.am
@@ -8,7 +8,7 @@ libgstamrnb_la_SOURCES = \
libgstamrnb_la_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRNB_CFLAGS)
libgstamrnb_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
- -lgstaudio-@GST_MAJORMINOR@ \
+ -lgstaudio-@GST_API_VERSION@ \
$(GST_BASE_LIBS) $(GST_LIBS) $(AMRNB_LIBS)
libgstamrnb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstamrnb_la_LIBTOOLFLAGS = --tag=disable-static
@@ -17,7 +17,7 @@ noinst_HEADERS = \
amrnbdec.h \
amrnbenc.h
-presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets
+presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets
preset_DATA = GstAmrnbEnc.prs
EXTRA_DIST = $(preset_DATA)
diff --git a/ext/amrwbdec/Makefile.am b/ext/amrwbdec/Makefile.am
index e65d340f..64b6e6ad 100644
--- a/ext/amrwbdec/Makefile.am
+++ b/ext/amrwbdec/Makefile.am
@@ -8,7 +8,7 @@ libgstamrwbdec_la_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRWB_CFLAGS)
libgstamrwbdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
$(GST_BASE_LIBS) \
- -lgstaudio-@GST_MAJORMINOR@ \
+ -lgstaudio-@GST_API_VERSION@ \
$(GST_LIBS) $(AMRWB_LIBS)
libgstamrwbdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstamrwbdec_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/ext/cdio/Makefile.am b/ext/cdio/Makefile.am
index ae17c1c1..8ad13c3f 100644
--- a/ext/cdio/Makefile.am
+++ b/ext/cdio/Makefile.am
@@ -11,7 +11,7 @@ libgstcdio_la_CFLAGS = \
$(CDIO_CFLAGS)
libgstcdio_la_LIBADD = \
- $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
$(GST_BASE_LIBS) \
$(CDIO_LIBS)
diff --git a/ext/lame/Makefile.am b/ext/lame/Makefile.am
index 53b22b35..d3a70c3a 100644
--- a/ext/lame/Makefile.am
+++ b/ext/lame/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstlame.la
libgstlame_la_SOURCES = gstlamemp3enc.c plugin.c
libgstlame_la_CFLAGS = -DGST_USE_UNSTABLE_API \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LAME_CFLAGS)
-libgstlame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+libgstlame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS) $(LAME_LIBS)
libgstlame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstlame_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/ext/mad/Makefile.am b/ext/mad/Makefile.am
index dfd25274..097b864a 100644
--- a/ext/mad/Makefile.am
+++ b/ext/mad/Makefile.am
@@ -6,7 +6,7 @@ libgstmad_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) \
$(MAD_CFLAGS)
libgstmad_la_LIBADD = \
- $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS) $(MAD_LIBS)
libgstmad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstmad_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/ext/mpeg2dec/Makefile.am b/ext/mpeg2dec/Makefile.am
index ab2aed30..bf0a4ea2 100644
--- a/ext/mpeg2dec/Makefile.am
+++ b/ext/mpeg2dec/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstmpeg2dec.la
libgstmpeg2dec_la_SOURCES = gstmpeg2dec.c
libgstmpeg2dec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS) $(MPEG2DEC_CFLAGS)
-libgstmpeg2dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+libgstmpeg2dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
$(GST_LIBS) $(MPEG2DEC_LIBS)
libgstmpeg2dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstmpeg2dec_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/ext/sidplay/Makefile.am b/ext/sidplay/Makefile.am
index 60d50307..47e51ee4 100644
--- a/ext/sidplay/Makefile.am
+++ b/ext/sidplay/Makefile.am
@@ -4,7 +4,7 @@ libgstsid_la_SOURCES = gstsiddec.cc
libgstsid_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_CXXFLAGS) $(SIDPLAY_CFLAGS)
libgstsid_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(SIDPLAY_LIBS) \
- -lgstaudio-$(GST_MAJORMINOR)
+ -lgstaudio-$(GST_API_VERSION)
libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstsid_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/ext/twolame/Makefile.am b/ext/twolame/Makefile.am
index ff048e50..785fd8f8 100644
--- a/ext/twolame/Makefile.am
+++ b/ext/twolame/Makefile.am
@@ -4,7 +4,7 @@ libgsttwolame_la_SOURCES = gsttwolamemp2enc.c
libgsttwolame_la_CFLAGS = -DGST_USE_UNSTABLE_API \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TWOLAME_CFLAGS)
libgsttwolame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
- -lgstaudio-@GST_MAJORMINOR@ -lgstpbutils-@GST_MAJORMINOR@ \
+ -lgstaudio-@GST_API_VERSION@ -lgstpbutils-@GST_API_VERSION@ \
$(GST_LIBS) $(TWOLAME_LIBS)
libgsttwolame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgsttwolame_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/ext/x264/Makefile.am b/ext/x264/Makefile.am
index 92691d15..f69c9b13 100644
--- a/ext/x264/Makefile.am
+++ b/ext/x264/Makefile.am
@@ -7,8 +7,8 @@ libgstx264_la_CFLAGS = \
$(X264_CFLAGS)
libgstx264_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
- -lgstvideo-$(GST_MAJORMINOR) \
- -lgstpbutils-$(GST_MAJORMINOR) \
+ -lgstvideo-$(GST_API_VERSION) \
+ -lgstpbutils-$(GST_API_VERSION) \
$(GST_LIBS) \
$(X264_LIBS)
libgstx264_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
@@ -16,7 +16,7 @@ libgstx264_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = gstx264enc.h
-presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets
+presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets
preset_DATA = GstX264Enc.prs
EXTRA_DIST = $(preset_DATA)
diff --git a/gst-plugins-ugly.spec.in b/gst-plugins-ugly.spec.in
index a9087a1e..7ff6aa50 100644
--- a/gst-plugins-ugly.spec.in
+++ b/gst-plugins-ugly.spec.in
@@ -1,4 +1,4 @@
-%define majorminor @GST_MAJORMINOR@
+%define majorminor @GST_API_VERSION@
%define gstreamer gstreamer011
%define gst_minver 0.11.0
diff --git a/gst/asfdemux/Makefile.am b/gst/asfdemux/Makefile.am
index c4e03b35..2b3bc27f 100644
--- a/gst/asfdemux/Makefile.am
+++ b/gst/asfdemux/Makefile.am
@@ -3,8 +3,8 @@ plugin_LTLIBRARIES = libgstasf.la
libgstasf_la_SOURCES = gstasfdemux.c gstasf.c asfheaders.c asfpacket.c gstrtpasfdepay.c gstrtspwms.c
libgstasf_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstasf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
- -lgstriff-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ -lgstsdp-@GST_MAJORMINOR@ \
- -lgstrtp-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ -lgsttag-@GST_MAJORMINOR@ \
+ -lgstriff-@GST_API_VERSION@ -lgstrtsp-@GST_API_VERSION@ -lgstsdp-@GST_API_VERSION@ \
+ -lgstrtp-@GST_API_VERSION@ -lgstaudio-@GST_API_VERSION@ -lgsttag-@GST_API_VERSION@ \
$(GST_BASE_LIBS) $(GST_LIBS) \
$(WIN32_LIBS)
libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/dvdlpcmdec/Makefile.am b/gst/dvdlpcmdec/Makefile.am
index 1e4367b3..78095361 100644
--- a/gst/dvdlpcmdec/Makefile.am
+++ b/gst/dvdlpcmdec/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstdvdlpcmdec.la
libgstdvdlpcmdec_la_SOURCES = gstdvdlpcmdec.c
libgstdvdlpcmdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstdvdlpcmdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ $(GST_LIBS)
+libgstdvdlpcmdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ $(GST_LIBS)
libgstdvdlpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstdvdlpcmdec_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/gst/dvdsub/Makefile.am b/gst/dvdsub/Makefile.am
index ba0f7147..68b16c5c 100644
--- a/gst/dvdsub/Makefile.am
+++ b/gst/dvdsub/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstdvdsub.la
libgstdvdsub_la_SOURCES = gstdvdsubdec.c gstdvdsubparse.c
libgstdvdsub_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstdvdsub_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+libgstdvdsub_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS)
libgstdvdsub_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstdvdsub_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/gst/realmedia/Makefile.am b/gst/realmedia/Makefile.am
index c17d8f16..4db7e7d2 100644
--- a/gst/realmedia/Makefile.am
+++ b/gst/realmedia/Makefile.am
@@ -9,9 +9,9 @@ libgstrmdemux_la_SOURCES = rademux.c rmdemux.c \
libgstrmdemux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstrmdemux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
- -lgstrtsp-@GST_MAJORMINOR@ \
- -lgstsdp-@GST_MAJORMINOR@ \
- -lgstpbutils-@GST_MAJORMINOR@ \
+ -lgstrtsp-@GST_API_VERSION@ \
+ -lgstsdp-@GST_API_VERSION@ \
+ -lgstpbutils-@GST_API_VERSION@ \
$(GST_BASE_LIBS) $(GST_LIBS)
libgstrmdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstrmdemux_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 29c395af..b7089b7f 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -1,8 +1,8 @@
### all of the standard pc files we need to generate
pcverfiles = \
- gstreamer-plugins-ugly-@GST_MAJORMINOR@.pc
+ gstreamer-plugins-ugly-@GST_API_VERSION@.pc
pcverfiles_uninstalled = \
- gstreamer-plugins-ugly-@GST_MAJORMINOR@-uninstalled.pc
+ gstreamer-plugins-ugly-@GST_API_VERSION@-uninstalled.pc
### all-local: $(pcverfiles) $(pcverfiles_uninstalled)
all-local: $(pcverfiles_uninstalled)
@@ -12,9 +12,9 @@ cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY))
cp_verbose_0 = @echo " CP $@";
### how to generate versioned .pc files from .pc files in this dir
-%-@GST_MAJORMINOR@.pc: %.pc
+%-@GST_API_VERSION@.pc: %.pc
$(cp_verbose)cp $< $@
-%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
+%-@GST_API_VERSION@-uninstalled.pc: %-uninstalled.pc
$(cp_verbose)cp $< $@
# do not install for now
diff --git a/pkgconfig/gstreamer-plugins-ugly-uninstalled.pc.in b/pkgconfig/gstreamer-plugins-ugly-uninstalled.pc.in
index 2a9ee09a..6aefd7a0 100644
--- a/pkgconfig/gstreamer-plugins-ugly-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-plugins-ugly-uninstalled.pc.in
@@ -7,7 +7,7 @@ pluginsdir=@abs_top_builddir@
Name: GStreamer Ugly Plugins, Uninstalled
Description: Streaming media framework, ugly plugins, uninstalled
Version: @VERSION@
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-plugins-base-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-plugins-base-@GST_API_VERSION@
Libs:
Cflags:
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index def216ac..7ec7e677 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -69,7 +69,7 @@ VALGRIND_TESTS_DISABLE = \
SUPPRESSIONS = $(top_srcdir)/common/gst.supp $(srcdir)/gst-plugins-ugly.supp
elements_amrnbenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)
-elements_amrnbenc_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_amrnbenc_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
elements_cmmldec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)
elements_cmmlenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 23:12:47 +0000