diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-04-04 14:20:13 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-04-04 14:55:15 +0200 |
| commit | 65307dd1323ba8200893b51c917bb175f11e5e4f (patch) | |
| tree | 912add0a6a266875674857cec245db23017be3fd /tools | |
| parent | 296e1bf3dd756c939a622422ced3e639fa0cce04 (diff) | |
gst: Update versioning
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 26 | ||||
| -rw-r--r-- | tools/gst-visualise-m.m | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 6e4deeda2..6d1d99540 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,13 +1,13 @@ bin_SCRIPTS = \ - gst-visualise-@GST_MAJORMINOR@ + gst-visualise-@GST_API_VERSION@ man_MANS = \ - gst-visualise-@GST_MAJORMINOR@.1 + gst-visualise-@GST_API_VERSION@.1 bin_PROGRAMS = \ - gst-discoverer-@GST_MAJORMINOR@ + gst-discoverer-@GST_API_VERSION@ -gst_discoverer_@GST_MAJORMINOR@_SOURCES = gst-discoverer.c +gst_discoverer_@GST_API_VERSION@_SOURCES = gst-discoverer.c CLEANFILES = $(man_MANS) $(bin_SCRIPTS) $(bin_PROGRAMS) @@ -15,22 +15,22 @@ EXTRA_DIST = \ gst-visualise-m.m gst-visualise.1.in -LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ +LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(GST_LIBS) AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) # generate versioned scripts from templates -%-@GST_MAJORMINOR@: %-m.m - $(AM_V_GEN)sed -e s,\@GST_MAJORMINOR\@,@GST_MAJORMINOR@,g $< > $@ && \ +%-@GST_API_VERSION@: %-m.m + $(AM_V_GEN)sed -e s,\@GST_API_VERSION\@,@GST_API_VERSION@,g $< > $@ && \ chmod +x $@ # generate man pages -%-@GST_MAJORMINOR@.1: %.1.in +%-@GST_API_VERSION@.1: %.1.in $(AM_V_GEN)sed \ - -e s,gst-visualise,gst-visualise-@GST_MAJORMINOR@,g \ + -e s,gst-visualise,gst-visualise-@GST_API_VERSION@,g \ $< >$@ all: all-am chmod @@ -42,9 +42,9 @@ Android.mk: Makefile.am androgenizer -:PROJECT gst-discoverer \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:EXECUTABLE gst-discoverer -:TAGS eng debug \ - -:SOURCES $(gst_discoverer_@GST_MAJORMINOR@_SOURCES) \ + -:SOURCES $(gst_discoverer_@GST_API_VERSION@_SOURCES) \ -:CFLAGS $(DEFS) $(AM_CFLAGS) \ - -:LDFLAGS -lgstpbutils-@GST_MAJORMINOR@ -lgstvideo-@GST_MAJORMINOR@ \ + -:LDFLAGS -lgstpbutils-@GST_API_VERSION@ -lgstvideo-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/tools/gst-visualise-m.m b/tools/gst-visualise-m.m index 798929b18..eea4b598c 100644 --- a/tools/gst-visualise-m.m +++ b/tools/gst-visualise-m.m @@ -52,7 +52,7 @@ sub visualise(@) my $pipe; $pipe = $vis unless $pipe = $pipes{$vis}; - $command = "gst-launch-@GST_MAJORMINOR@ $cfg{AUDIOSRC} ! $pipe ! { queue ! videoconvert ! $cfg{VIDEOSINK} }"; + $command = "gst-launch-@GST_API_VERSION@ $cfg{AUDIOSRC} ! $pipe ! { queue ! videoconvert ! $cfg{VIDEOSINK} }"; print "Running $command\n"; system ("PATH=\$PATH:".$cfg{CVS_PATH}."/gstreamer/tools $command"); } |