From: Wim Taymans Date: Mon, 6 Dec 2010 16:09:10 +0000 (+0100) Subject: more 0.10 -> 0.11 changes X-Git-Tag: 1.19.3~511^2~7812 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eee6bc7dc984d5870c334a41561dba828d65bd0e;p=platform%2Fupstream%2Fgstreamer.git more 0.10 -> 0.11 changes --- diff --git a/configure.ac b/configure.ac index 8c9d900..71d0349 100644 --- a/configure.ac +++ b/configure.ac @@ -415,7 +415,7 @@ AG_GST_CHECK_PLUGIN(volume) dnl check for gstreamer core features (subsystems) dnl FIXME: this assumes srcdir == builddir for uninstalled setups -GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-0.10`"/gst/gstconfig.h" +GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-0.11`"/gst/gstconfig.h" AG_GST_PARSE_SUBSYSTEM_DISABLES($GST_CONFIGPATH) AM_CONDITIONAL(USE_XML, test $GST_DISABLE_XML != "1") @@ -1031,7 +1031,7 @@ sed \ -e "s/.* PACKAGE_STRING$/#define PACKAGE_STRING \"$PACKAGE_STRING\"/" \ -e 's/.* PACKAGE_TARNAME$/#define PACKAGE_TARNAME "'$PACKAGE_TARNAME'"/' \ -e 's/.* PACKAGE_VERSION$/#define PACKAGE_VERSION "'$PACKAGE_VERSION'"/' \ - -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.10"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.10"\n#endif/' \ + -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.11"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.11"\n#endif/' \ -e 's/.* USE_BINARY_REGISTRY$/#define USE_BINARY_REGISTRY/' \ -e 's/.* VERSION$/#define VERSION "'$VERSION'"/' \ -e "s/.* DEFAULT_AUDIOSINK$/#define DEFAULT_AUDIOSINK \"directaudiosink\"/" \ diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am index 8848a7d..ad55d00 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) @@ -73,8 +73,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(AM_V_GEN)$(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 4411683..3d5d770 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) @@ -105,8 +105,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 31bae21..8b67dff 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) @@ -58,8 +58,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 046d4d9..2ab5265 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) @@ -80,7 +80,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(AM_V_GEN)$(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 e262448..6fd5a30 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) @@ -111,7 +111,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(AM_V_GEN)$(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 5a78b9d..ec86c57 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) @@ -45,7 +45,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(AM_V_GEN)$(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 9a261f5..2962897 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am @@ -79,11 +79,11 @@ 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 \ - --include=Gst-0.10 \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --library=libgstpbutils-@GST_MAJORMINOR@.la \ + --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@ \ --output $@ \ @@ -104,7 +104,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 879f980..171891b 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) @@ -67,8 +67,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 9c98366..7921b09 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) @@ -60,8 +60,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(AM_V_GEN)$(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 65777a7..cb7653e 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) @@ -94,7 +94,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 b122f2f..1ba7dc3 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) @@ -48,7 +48,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(AM_V_GEN)$(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 aac1c13..7443059 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) @@ -57,8 +57,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(AM_V_GEN)$(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 8a9019cb..793ede5 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) @@ -71,8 +71,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(AM_V_GEN)$(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)