diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am index cf2c85288c..f4ffac0ccc 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am @@ -47,15 +47,15 @@ GstApp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_MAJORMINOR@ $(gir_cincludes) \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ - --library=libgstapp-0.10.la \ - --include=Gst-0.10 \ - --include=GstBase-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --library=libgstapp-@GST_MAJORMINOR@.la \ + --include=Gst-@GST_MAJORMINOR@ \ + --include=GstBase-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ - --pkg gstreamer-base-0.10 \ - --pkg-export gstreamer-app-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ + --pkg gstreamer-base-@GST_MAJORMINOR@ \ + --pkg-export gstreamer-app-@GST_MAJORMINOR@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -74,8 +74,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index b449e24aab..0a282171f3 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -76,17 +76,17 @@ GstAudio-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_MAJORMI -I$(top_builddir)/gst-libs \ $(gir_cincludes) \ --add-include-path=$(builddir)/../interfaces \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ - --library=libgstaudio-0.10.la \ - --include=Gst-0.10 \ - --include=GstBase-0.10 \ - --include=GstInterfaces-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --library=libgstaudio-@GST_MAJORMINOR@.la \ + --include=Gst-@GST_MAJORMINOR@ \ + --include=GstBase-@GST_MAJORMINOR@ \ + --include=GstInterfaces-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ - --pkg gstreamer-base-0.10 \ - --pkg gstreamer-interfaces-0.10 \ - --pkg-export gstreamer-audio-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ + --pkg gstreamer-base-@GST_MAJORMINOR@ \ + --pkg gstreamer-interfaces-@GST_MAJORMINOR@ \ + --pkg-export gstreamer-audio-@GST_MAJORMINOR@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -106,8 +106,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir=$(builddir)/../interfaces \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst-libs/gst/cdda/Makefile.am b/gst-libs/gst/cdda/Makefile.am index 5985c84d18..09f334aae5 100644 --- a/gst-libs/gst/cdda/Makefile.am +++ b/gst-libs/gst/cdda/Makefile.am @@ -29,17 +29,17 @@ GstCdda-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcdda-@GST_MAJORMINO --strip-prefix=Gst \ $(gir_cincludes) \ --add-include-path=$(builddir)/../tag \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ - --library=libgstcdda-0.10.la \ - --include=Gst-0.10 \ - --include=GstBase-0.10 \ - --include=GstTag-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --library=libgstcdda-@GST_MAJORMINOR@.la \ + --include=Gst-@GST_MAJORMINOR@ \ + --include=GstBase-@GST_MAJORMINOR@ \ + --include=GstTag-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ - --pkg gstreamer-base-0.10 \ - --pkg gstreamer-tag-0.10 \ - --pkg-export gstreamer-cdda-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ + --pkg gstreamer-base-@GST_MAJORMINOR@ \ + --pkg gstreamer-tag-@GST_MAJORMINOR@ \ + --pkg-export gstreamer-cdda-@GST_MAJORMINOR@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -59,8 +59,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir=$(builddir)/../tag \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am index bf14e55ee4..7e84eaec17 100644 --- a/gst-libs/gst/fft/Makefile.am +++ b/gst-libs/gst/fft/Makefile.am @@ -57,12 +57,12 @@ GstFft-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_MAJORMINOR@ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --library=libgstfft-0.10.la \ - --include=Gst-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --library=libgstfft-@GST_MAJORMINOR@.la \ + --include=Gst-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ - --pkg-export gstreamer-fft-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ + --pkg-export gstreamer-fft-@GST_MAJORMINOR@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -81,7 +81,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index eca6a805a5..f462211fa2 100644 --- a/gst-libs/gst/interfaces/Makefile.am +++ b/gst-libs/gst/interfaces/Makefile.am @@ -88,12 +88,12 @@ GstInterfaces-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstinterfaces-@G $(gir_cincludes) \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --library=libgstinterfaces-0.10.la \ - --include=Gst-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --library=libgstinterfaces-@GST_MAJORMINOR@.la \ + --include=Gst-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ - --pkg-export gstreamer-interfaces-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ + --pkg-export gstreamer-interfaces-@GST_MAJORMINOR@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -112,7 +112,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst-libs/gst/netbuffer/Makefile.am b/gst-libs/gst/netbuffer/Makefile.am index 9f70a396a2..fced57c33c 100644 --- a/gst-libs/gst/netbuffer/Makefile.am +++ b/gst-libs/gst/netbuffer/Makefile.am @@ -22,12 +22,12 @@ GstNetbuffer-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnetbuffer-@GST --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --library=libgstnetbuffer-0.10.la \ - --include=Gst-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --library=libgstnetbuffer-@GST_MAJORMINOR@.la \ + --include=Gst-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ - --pkg-export gstreamer-netbuffer-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ + --pkg-export gstreamer-netbuffer-@GST_MAJORMINOR@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -46,7 +46,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am index 2a129c9c93..e26ef9b49a 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am @@ -83,13 +83,13 @@ GstPbutils-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_MAJ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ --add-include-path=$(srcdir)/../video \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --library=libgstpbutils-0.10.la \ - --library-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10` \ - --library=gstreamer-0.10 \ - --include=Gst-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --library=libgstpbutils-@GST_MAJORMINOR@.la \ + --library-path=`$(PKG_CONFIG) --variable=libdir gstreamer-@GST_MAJORMINOR@` \ + --library=gstreamer-@GST_MAJORMINOR@ \ + --include=Gst-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ --pkg gstreamer-video-@GST_MAJORMINOR@ \ --pkg-export gstreamer-pbutils-@GST_MAJORMINOR@ \ --add-init-section="gst_init(NULL,NULL);" \ @@ -112,7 +112,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(srcdir)/../video \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index 5da50d63fc..0bde2b0fb3 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -35,18 +35,18 @@ GstRiff-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_MAJORMINO --add-include-path=$(builddir)/../tag \ --add-include-path=$(builddir)/../audio \ --add-include-path=$(builddir)/../interfaces \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ - --library=libgstriff-0.10.la \ - --include=GstAudio-0.10 \ - --include=GstTag-0.10 \ - --include=Gst-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --library=libgstriff-@GST_MAJORMINOR@.la \ + --include=GstAudio-@GST_MAJORMINOR@ \ + --include=GstTag-@GST_MAJORMINOR@ \ + --include=Gst-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ - --pkg gstreamer-tag-0.10 \ - --pkg gstreamer-audio-0.10 \ - --pkg gstreamer-interfaces-0.10 \ - --pkg-export gstreamer-riff-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ + --pkg gstreamer-tag-@GST_MAJORMINOR@ \ + --pkg gstreamer-audio-@GST_MAJORMINOR@ \ + --pkg gstreamer-interfaces-@GST_MAJORMINOR@ \ + --pkg-export gstreamer-riff-@GST_MAJORMINOR@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -68,8 +68,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(builddir)/../tag \ --includedir=$(builddir)/../audio \ --includedir=$(builddir)/../interfaces \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am index 36a423ae66..130f2c91f9 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am @@ -34,15 +34,15 @@ GstRtp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_MAJORMINOR@ --strip-prefix=Gst \ $(gir_cincludes) \ -I$(top_srcdir)/gst-libs \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ - --library=libgstrtp-0.10.la \ - --include=Gst-0.10 \ - --include=GstBase-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --library=libgstrtp-@GST_MAJORMINOR@.la \ + --include=Gst-@GST_MAJORMINOR@ \ + --include=GstBase-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ - --pkg gstreamer-base-0.10 \ - --pkg-export gstreamer-rtp-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ + --pkg gstreamer-base-@GST_MAJORMINOR@ \ + --pkg-export gstreamer-rtp-@GST_MAJORMINOR@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -61,8 +61,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am index a26b527dad..4ed474273d 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am @@ -68,14 +68,14 @@ GstRtsp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_MAJORMINO -I$(top_builddir)/gst-libs \ -I$(top_srcdir)/gst-libs \ --add-include-path=$(builddir)/../sdp \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --library=libgstrtsp-0.10.la \ - --include=Gst-0.10 \ - --include=GstSdp-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --library=libgstrtsp-@GST_MAJORMINOR@.la \ + --include=Gst-@GST_MAJORMINOR@ \ + --include=GstSdp-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ - --pkg gstreamer-sdp-0.10 \ - --pkg-export gstreamer-rtsp-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ + --pkg gstreamer-sdp-@GST_MAJORMINOR@ \ + --pkg-export gstreamer-rtsp-@GST_MAJORMINOR@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -95,7 +95,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir=$(builddir)/../sdp \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am index 55480ebb22..6c8dae21d9 100644 --- a/gst-libs/gst/sdp/Makefile.am +++ b/gst-libs/gst/sdp/Makefile.am @@ -25,12 +25,12 @@ GstSdp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_MAJORMINOR@ --strip-prefix=Gst \ $(gir_cincludes) \ -I$(top_srcdir)/gst-libs \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --library=libgstsdp-0.10.la \ - --include=Gst-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --library=libgstsdp-@GST_MAJORMINOR@.la \ + --include=Gst-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ - --pkg-export gstreamer-sdp-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ + --pkg-export gstreamer-sdp-@GST_MAJORMINOR@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -49,7 +49,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am index f953e60a7d..4ac8a6e3ad 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am @@ -31,15 +31,15 @@ GstTag-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_MAJORMINOR@ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ $(gir_cincludes) \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ - --library=libgsttag-0.10.la \ - --include=Gst-0.10 \ - --include=GstBase-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --library=libgsttag-@GST_MAJORMINOR@.la \ + --include=Gst-@GST_MAJORMINOR@ \ + --include=GstBase-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ - --pkg gstreamer-base-0.10 \ - --pkg-export gstreamer-tag-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ + --pkg gstreamer-base-@GST_MAJORMINOR@ \ + --pkg-export gstreamer-tag-@GST_MAJORMINOR@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -58,8 +58,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 26d5d1b347..fd91258f0e 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -45,15 +45,15 @@ GstVideo-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_MAJORMI $(gir_cincludes) \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ - --library=libgstvideo-0.10.la \ - --include=Gst-0.10 \ - --include=GstBase-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --library=libgstvideo-@GST_MAJORMINOR@.la \ + --include=Gst-@GST_MAJORMINOR@ \ + --include=GstBase-@GST_MAJORMINOR@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-0.10 \ - --pkg gstreamer-base-0.10 \ - --pkg-export gstreamer-video-0.10 \ + --pkg gstreamer-@GST_MAJORMINOR@ \ + --pkg gstreamer-base-@GST_MAJORMINOR@ \ + --pkg-export gstreamer-video-@GST_MAJORMINOR@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -72,8 +72,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)