[gst-cvs] gst-plugins-base: tools: rename gst-discoverer binary to gst-discoverer-0. 10

Tim Müller tpm at kemper.freedesktop.org
Sat Oct 30 04:08:05 PDT 2010


Module: gst-plugins-base
Branch: master
Commit: 0c4e4f25ae392681a3574202aa1813e6bb0a51c5
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=0c4e4f25ae392681a3574202aa1813e6bb0a51c5

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Sat Oct 30 12:03:39 2010 +0100

tools: rename gst-discoverer binary to gst-discoverer-0.10

We're not providing a wrapper like we do for the tools in core,
since wrappers are confusing (e.g. for debugging purposes),
mostly pointless (since the API is likely to change between
major versions), and cause packaging issues when packages for
two different major versions are to be installed in parallel.

https://bugzilla.gnome.org/show_bug.cgi?id=633023

---

 Makefile.am       |    4 +++-
 tools/.gitignore  |    2 +-
 tools/Makefile.am |    8 +++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 230c516..19e3c2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,7 +75,9 @@ check: check-exports
 
 CRUFT_FILES = \
 	$(top_builddir)/common/shave \
-	$(top_builddir)/common/shave-libtool
+	$(top_builddir)/common/shave-libtool \
+	$(top_builddir)/tools/gst-discoverer
+
 
 include $(top_srcdir)/common/cruft.mak
 
diff --git a/tools/.gitignore b/tools/.gitignore
index c6cdf5c..af30ade 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -2,4 +2,4 @@ gst-launch-ext-?.*
 gst-visualise-?.*
 gst-launch-ext-?.*.1
 gst-visualise-?.*.1
-gst-discoverer
+gst-discoverer-*
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c7afbe7..997d6d4 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,13 +5,15 @@ man_MANS = \
         gst-visualise- at GST_MAJORMINOR@.1
 
 bin_PROGRAMS = \
-	gst-discoverer
+	gst-discoverer- at GST_MAJORMINOR@
+
+gst_discoverer_ at GST_MAJORMINOR@_SOURCES = gst-discoverer.c
 
 CLEANFILES = $(man_MANS) $(bin_SCRIPTS) $(bin_PROGRAMS)
 
 EXTRA_DIST = \
-	gst-visualise-m.m gst-visualise.1.in \
-	gst-discoverer.c
+	gst-visualise-m.m gst-visualise.1.in
+
 
 LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils- at GST_MAJORMINOR@.la\
 	$(top_builddir)/gst-libs/gst/video/libgstvideo- at GST_MAJORMINOR@.la\





More information about the Gstreamer-commits mailing list