From e2e2f1261e626f6f0adabbdf2c40045e8c3db04e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 4 Apr 2012 14:50:23 +0200 Subject: [PATCH] ges: Update versioning --- configure.ac | 30 +++++----- docs/libs/Makefile.am | 2 +- docs/libs/ges-docs.sgml | 2 +- docs/version.entities.in | 2 +- ges/Makefile.am | 72 ++++++++++++------------ gst-editing-services.spec.in | 4 +- pkgconfig/Makefile.am | 8 +-- pkgconfig/gst-editing-services-uninstalled.pc.in | 4 +- pkgconfig/gst-editing-services.pc.in | 6 +- tests/check/Makefile.am | 6 +- tests/examples/Makefile.am | 2 +- tools/Makefile.am | 10 ++-- 12 files changed, 74 insertions(+), 74 deletions(-) diff --git a/configure.ac b/configure.ac index 6f7c0bc..c9ab41b 100644 --- a/configure.ac +++ b/configure.ac @@ -36,10 +36,10 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])], AC_SUBST(AM_DEFAULT_VERBOSITY)]) dnl our libraries and install dirs use major.minor as a version -GST_MAJORMINOR=$GST_EDITING_SERVICES_VERSION_MAJOR.$GST_EDITING_SERVICES_VERSION_MINOR +GST_API_VERSION=$GST_EDITING_SERVICES_VERSION_MAJOR.$GST_EDITING_SERVICES_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) +GST_API_VERSION=1.0 +AC_SUBST(GST_API_VERSION) dnl FIXME: this macro doesn't actually work; dnl the generated libtool script has no support for the listed tags. @@ -153,20 +153,20 @@ AC_SUBST(GIO_LIBS) 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_GDP($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_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_GDP($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) +AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ], yes) AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes") -GSTPB_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-base-$GST_MAJORMINOR --variable pluginsdir` +GSTPB_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-base-$GST_API_VERSION --variable pluginsdir` AC_SUBST(GSTPB_PLUGINS_DIR) AC_MSG_NOTICE(Using GStreamer Base Plugins in $GSTPB_PLUGINS_DIR) dnl check for gstreamer-pbutils -PKG_CHECK_MODULES(GST_PBUTILS, gstreamer-pbutils-$GST_MAJORMINOR, HAVE_GST_PBUTILS="yes", HAVE_GST_PBUTILS="no") +PKG_CHECK_MODULES(GST_PBUTILS, gstreamer-pbutils-$GST_API_VERSION, HAVE_GST_PBUTILS="yes", HAVE_GST_PBUTILS="no") if test "x$HAVE_GST_PBUTILS" != "xyes"; then AC_ERROR([gst-pbutils is required for rendering support]) fi @@ -174,7 +174,7 @@ AC_SUBST(GST_PBUTILS_LIBS) AC_SUBST(GST_PBUTILS_CFLAGS) dnl check for gst-controller -PKG_CHECK_MODULES(GST_CONTROLLER, gstreamer-controller-$GST_MAJORMINOR, HAVE_GST_CONTROLLER="yes", HAVE_GST_CONROLLER="no") +PKG_CHECK_MODULES(GST_CONTROLLER, gstreamer-controller-$GST_API_VERSION, HAVE_GST_CONTROLLER="yes", HAVE_GST_CONROLLER="no") if test "x$HAVE_GST_CONTROLLER" != "xyes"; then AC_ERROR([gst-controller is required for transition support]) fi @@ -182,7 +182,7 @@ AC_SUBST(GST_CONTROLLER_LIBS) AC_SUBST(GST_CONTROLLER_CFLAGS) dnl check for gstvideo -PKG_CHECK_MODULES(GST_VIDEO, gstreamer-video-$GST_MAJORMINOR, HAVE_GST_VIDEO="yes", HAVE_GST_CONROLLER="no") +PKG_CHECK_MODULES(GST_VIDEO, gstreamer-video-$GST_API_VERSION, HAVE_GST_VIDEO="yes", HAVE_GST_CONROLLER="no") if test "x$HAVE_GST_VIDEO" != "xyes"; then AC_ERROR([gst-video is required for transition support]) fi @@ -191,8 +191,8 @@ AC_SUBST(GST_VIDEO_CFLAGS) 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) diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index df447d3..3e866ad 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -66,7 +66,7 @@ extra_files = GTKDOC_CFLAGS = -I$(top_srcdir) $(GST_PBUTILS_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) $(GIO_CFLAGS) GTKDOC_LIBS = \ - $(top_builddir)/ges/libges-@GST_MAJORMINOR@.la \ + $(top_builddir)/ges/libges-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS) GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC) diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml index ce0a2f5..180250b 100644 --- a/docs/libs/ges-docs.sgml +++ b/docs/libs/ges-docs.sgml @@ -9,7 +9,7 @@ GStreamer Editing Services &GES_VERSION; Reference Manual - for GStreamer Editing Services &GST_MAJORMINOR; (&GES_VERSION;) + for GStreamer Editing Services &GST_API_VERSION; (&GES_VERSION;) diff --git a/docs/version.entities.in b/docs/version.entities.in index b2646a8..606e725 100644 --- a/docs/version.entities.in +++ b/docs/version.entities.in @@ -1,2 +1,2 @@ - + diff --git a/ges/Makefile.am b/ges/Makefile.am index c47a5ee..c4e1ee6 100644 --- a/ges/Makefile.am +++ b/ges/Makefile.am @@ -1,13 +1,13 @@ built_header_make = built_source_make = -lib_LTLIBRARIES = libges-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libges-@GST_API_VERSION@.la -EXTRA_libges_@GST_MAJORMINOR@_la_SOURCES = gesmarshal.list +EXTRA_libges_@GST_API_VERSION@_la_SOURCES = gesmarshal.list CLEANFILES = $(BUILT_SOURCES) $(built_header_make) $(built_source_make) -libges_@GST_MAJORMINOR@_la_SOURCES = \ +libges_@GST_API_VERSION@_la_SOURCES = \ $(built_source_make) \ ges.c \ ges-enums.c \ @@ -49,8 +49,8 @@ libges_@GST_MAJORMINOR@_la_SOURCES = \ ges-pitivi-formatter.c \ ges-utils.c -libges_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/ges/ -libges_@GST_MAJORMINOR@include_HEADERS = \ +libges_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/ges/ +libges_@GST_API_VERSION@include_HEADERS = \ $(built_header_make) \ ges-types.h \ ges.h \ @@ -96,13 +96,13 @@ libges_@GST_MAJORMINOR@include_HEADERS = \ noinst_HEADERS = \ ges-internal.h -libges_@GST_MAJORMINOR@_la_CFLAGS = -I$(top_srcdir) $(GST_PBUTILS_CFLAGS) \ +libges_@GST_API_VERSION@_la_CFLAGS = -I$(top_srcdir) $(GST_PBUTILS_CFLAGS) \ $(GST_VIDEO_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_CFLAGS) $(XML_CFLAGS) $(GIO_CFLAGS) -libges_@GST_MAJORMINOR@_la_LIBADD = $(GST_PBUTILS_LIBS) \ +libges_@GST_API_VERSION@_la_LIBADD = $(GST_PBUTILS_LIBS) \ $(GST_VIDEO_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) $(GST_LIBS) $(XML_LIBS) $(GIO_LIBS) -libges_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \ +libges_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \ $(GST_LT_LDFLAGS) $(GIO_CFLAGS) -export-symbols-regex \^_*\(ges_\|GES_\).* DISTCLEANFILE = $(CLEANFILES) @@ -115,36 +115,36 @@ BUILT_SOURCES = \ include $(top_srcdir)/common/gst-glib-gen.mak if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GES-@GST_MAJORMINOR@.gir +BUILT_GIRSOURCES = GES-@GST_API_VERSION@.gir -gir_headers=$(patsubst %,$(srcdir)/%, $(libges_@GST_MAJORMINOR@include_HEADERS)) -gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libges_@GST_MAJORMINOR@include_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libges_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libges_@GST_MAJORMINOR@_la_SOURCES)) -gir_cincludes=$(patsubst %,--c-include='ges/%',$(libges_@GST_MAJORMINOR@include_HEADERS)) -gir_cincludes+=$(patsubst %,--c-include='ges/%',$(nodist_libges_@GST_MAJORMINOR@include_HEADERS)) +gir_headers=$(patsubst %,$(srcdir)/%, $(libges_@GST_API_VERSION@include_HEADERS)) +gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libges_@GST_API_VERSION@include_HEADERS)) +gir_sources=$(patsubst %,$(srcdir)/%, $(libges_@GST_API_VERSION@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libges_@GST_API_VERSION@_la_SOURCES)) +gir_cincludes=$(patsubst %,--c-include='ges/%',$(libges_@GST_API_VERSION@include_HEADERS)) +gir_cincludes+=$(patsubst %,--c-include='ges/%',$(nodist_libges_@GST_API_VERSION@include_HEADERS)) -GES-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libges-@GST_MAJORMINOR@.la +GES-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libges-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(INTROSPECTION_SCANNER) -v --namespace GES \ - --nsversion=@GST_MAJORMINOR@ \ + --nsversion=@GST_API_VERSION@ \ --identifier-prefix=GES \ --symbol-prefix=ges \ --warn-all \ $(gir_cincludes) \ -I$(top_srcdir) \ -I$(top_builddir) \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.11` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.11` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-@GST_API_VERSION@` \ --add-include-path=`$(PKG_CONFIG) --variable=girdir gio-2.0` \ - --library=libges-@GST_MAJORMINOR@.la \ - --include=Gst-@GST_MAJORMINOR@ \ - --include=GstPbutils-@GST_MAJORMINOR@ \ + --library=libges-@GST_API_VERSION@.la \ + --include=Gst-@GST_API_VERSION@ \ + --include=GstPbutils-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_MAJORMINOR@ \ - --pkg gstreamer-pbutils-@GST_MAJORMINOR@ \ + --pkg gstreamer-@GST_API_VERSION@ \ + --pkg gstreamer-pbutils-@GST_API_VERSION@ \ --pkg gio-2.0 \ - --pkg-export ges-@GST_MAJORMINOR@ \ + --pkg-export ges-@GST_API_VERSION@ \ --add-init-section="gst_init(NULL, NULL);" \ --add-init-section="ges_init(NULL, NULL);" \ --output $@ \ @@ -166,8 +166,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(srcdir)/../video \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.11` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.11` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-@GST_API_VERSION@` \ --includedir=`$(PKG_CONFIG) --variable=girdir gio-2.0` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) @@ -175,17 +175,17 @@ CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer -:PROJECT libges -:SHARED libges-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libges -:SHARED libges-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libges_@GST_MAJORMINOR@_la_SOURCES) \ - $(nodist_libges_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(libges_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libges_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libges_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libges_@GST_API_VERSION@_la_SOURCES) \ + $(nodist_libges_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(libges_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libges_@GST_API_VERSION@_la_LDFLAGS) \ + $(libges_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/interfaces \ - -:HEADERS $(libges_@GST_MAJORMINOR@include_HEADERS) \ - $(nodist_libges_@GST_MAJORMINOR@include_HEADERS) \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/interfaces \ + -:HEADERS $(libges_@GST_API_VERSION@include_HEADERS) \ + $(nodist_libges_@GST_API_VERSION@include_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/gst-editing-services.spec.in b/gst-editing-services.spec.in index c433271..2689478 100644 --- a/gst-editing-services.spec.in +++ b/gst-editing-services.spec.in @@ -1,4 +1,4 @@ -%define majorminor @GST_MAJORMINOR@ +%define majorminor @GST_API_VERSION@ %define gstreamer gstreamer %define gst_minver 0.11.0 @@ -8,7 +8,7 @@ Version: @VERSION@ Release: @PACKAGE_VERSION_RELEASE@.gst Summary: GStreamer helper library for editing applications -%define majorminor @GST_MAJORMINOR@ +%define majorminor @GST_API_VERSION@ Group: Applications/Multimedia License: LGPL diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 36d5452..2bb20e8 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -1,15 +1,15 @@ pcfiles = \ - gst-editing-services-@GST_MAJORMINOR@.pc + gst-editing-services-@GST_API_VERSION@.pc pcfiles_uninstalled = \ - gst-editing-services-@GST_MAJORMINOR@-uninstalled.pc + gst-editing-services-@GST_API_VERSION@-uninstalled.pc all-local: $(pcfiles) $(pcfiles_uninstalled) ### how to generate pc files -%-@GST_MAJORMINOR@.pc: %.pc +%-@GST_API_VERSION@.pc: %.pc cp $< $@ -%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc +%-@GST_API_VERSION@-uninstalled.pc: %-uninstalled.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgconfig/gst-editing-services-uninstalled.pc.in b/pkgconfig/gst-editing-services-uninstalled.pc.in index bce1f9e..f227529 100644 --- a/pkgconfig/gst-editing-services-uninstalled.pc.in +++ b/pkgconfig/gst-editing-services-uninstalled.pc.in @@ -7,6 +7,6 @@ includedir=@abs_top_builddir@ Name: gst-editing-services Description: GStreamer Editing Services Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ gstreamer-controller-@GST_MAJORMINOR@ gstreamer-pbutils-@GST_MAJORMINOR@ -Libs: @abs_top_builddir@/ges/libges-@GST_MAJORMINOR@.la +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-controller-@GST_API_VERSION@ gstreamer-pbutils-@GST_API_VERSION@ +Libs: @abs_top_builddir@/ges/libges-@GST_API_VERSION@.la Cflags: -I@abs_top_srcdir@ -I@abs_top_builddir@ diff --git a/pkgconfig/gst-editing-services.pc.in b/pkgconfig/gst-editing-services.pc.in index 61bcd89..3469e35 100644 --- a/pkgconfig/gst-editing-services.pc.in +++ b/pkgconfig/gst-editing-services.pc.in @@ -1,11 +1,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ Name: gst-editing-services Description: GStreamer Editing Services Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ gstreamer-controller-@GST_MAJORMINOR@ gstreamer-pbutils-@GST_MAJORMINOR@ -Libs: -L${libdir} -lges-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-controller-@GST_API_VERSION@ gstreamer-pbutils-@GST_API_VERSION@ +Libs: -L${libdir} -lges-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 59105d0..33a6010 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/common/check.mak TESTS_ENVIRONMENT = -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ +plugindir = $(libdir)/gstreamer-@GST_API_VERSION@ # override to _not_ install the test plugins install-pluginLTLIBRARIES: @@ -36,8 +36,8 @@ AM_CFLAGS = -I$(top_srcdir) $(GST_PLUGINS_BASE_CFLAGS) $(GST_OBJ_CFLAGS) \ $(GST_CHECK_CFLAGS) $(GST_OPTION_CFLAGS) $(GST_CFLAGS) \ -UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS -LDADD = $(top_builddir)/ges/libges-@GST_MAJORMINOR@.la \ - $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_MAJORMINOR) \ +LDADD = $(top_builddir)/ges/libges-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) \ $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) EXTRA_DIST = #gst-plugins-bad.supp diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am index aef0cff..ddb272d 100644 --- a/tests/examples/Makefile.am +++ b/tests/examples/Makefile.am @@ -18,4 +18,4 @@ noinst_PROGRAMS = \ $(graphical) AM_CFLAGS = -I$(top_srcdir) $(GST_PBUTILS_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) -export-dynamic -LDADD = $(top_builddir)/ges/libges-@GST_MAJORMINOR@.la $(GST_PBUTILS_LIBS) $(GST_LIBS) $(GTK_LIBS) +LDADD = $(top_builddir)/ges/libges-@GST_API_VERSION@.la $(GST_PBUTILS_LIBS) $(GST_LIBS) $(GTK_LIBS) diff --git a/tools/Makefile.am b/tools/Makefile.am index 8c55389..798918f 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,16 +1,16 @@ -bin_PROGRAMS = ges-launch-@GST_MAJORMINOR@ +bin_PROGRAMS = ges-launch-@GST_API_VERSION@ AM_CFLAGS = -I$(top_srcdir) $(GST_PBUTILS_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) -LDADD = $(top_builddir)/ges/libges-@GST_MAJORMINOR@.la $(GST_PBUTILS_LIBS) $(GST_LIBS) $(GIO_LIBS) +LDADD = $(top_builddir)/ges/libges-@GST_API_VERSION@.la $(GST_PBUTILS_LIBS) $(GST_LIBS) $(GIO_LIBS) -ges_launch_@GST_MAJORMINOR@_SOURCES = ges-launch.c +ges_launch_@GST_API_VERSION@_SOURCES = ges-launch.c Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ -:PROJECT ges_launch -:EXECUTABLE ges-launch \ -:TAGS eng \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(ges_launch_@GST_MAJORMINOR@_SOURCES) \ + -:SOURCES $(ges_launch_@GST_API_VERSION@_SOURCES) \ -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(AM_CFLAGS) \ - -:LDFLAGS -lges-@GST_MAJORMINOR@ $(GST_PBUTILS_LIBS) $(GST_LIBS) \ + -:LDFLAGS -lges-@GST_API_VERSION@ $(GST_PBUTILS_LIBS) $(GST_LIBS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ -- 2.7.4