diff options
author | David Schleef <ds@schleef.org> | 2004-03-09 20:55:30 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2004-03-09 20:55:30 +0000 |
commit | 8782f54d7d0d3644dce91ed530962cda4d55af5c (patch) | |
tree | 4c860389f3530198edc52b30dc1d1c03277aace8 | |
parent | 31c8cb0db1f3917d6673df252ff8b11978b8009a (diff) | |
download | gst-plugins-bad-8782f54d7d0d3644dce91ed530962cda4d55af5c.tar.gz gst-plugins-bad-8782f54d7d0d3644dce91ed530962cda4d55af5c.tar.bz2 gst-plugins-bad-8782f54d7d0d3644dce91ed530962cda4d55af5c.zip |
ext/lcs/Makefile.am: Fix so that the lcs colorspace plugin doesn't conflict with the internal colorspace plugin.
Original commit message from CVS:
* ext/lcs/Makefile.am: Fix so that the lcs colorspace plugin
doesn't conflict with the internal colorspace plugin.
* gst-libs/gst/audio/make_filter: Use `` instead of $() to
satisfy the crappy-ass shell shipped by a certain vendor.
* gst/videofilter/make_filter: same (bug #135299)
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ext/lcs/Makefile.am | 10 | ||||
-rwxr-xr-x | gst-libs/gst/audio/make_filter | 9 |
3 files changed, 17 insertions, 10 deletions
@@ -1,3 +1,11 @@ +2004-03-09 David Schleef <ds@schleef.org> + + * ext/lcs/Makefile.am: Fix so that the lcs colorspace plugin + doesn't conflict with the internal colorspace plugin. + * gst-libs/gst/audio/make_filter: Use `` instead of $() to + satisfy the crappy-ass shell shipped by a certain vendor. + * gst/videofilter/make_filter: same (bug #135299) + 2004-03-09 Thomas Vander Stichele <thomas at apestaart dot org> * configure.ac: bump nano to 1 diff --git a/ext/lcs/Makefile.am b/ext/lcs/Makefile.am index 2db03789..41d7e818 100644 --- a/ext/lcs/Makefile.am +++ b/ext/lcs/Makefile.am @@ -1,9 +1,9 @@ -plugin_LTLIBRARIES = libgstcolorspace.la +plugin_LTLIBRARIES = libgstcolorspacelcs.la -libgstcolorspace_la_SOURCES = gstcolorspace.c -libgstcolorspace_la_CFLAGS = $(GST_CFLAGS) $(LCS_CFLAGS) -libgstcolorspace_la_LIBADD = $(LCS_LIBS) -libgstcolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstcolorspacelcs_la_SOURCES = gstcolorspace.c +libgstcolorspacelcs_la_CFLAGS = $(GST_CFLAGS) $(LCS_CFLAGS) +libgstcolorspacelcs_la_LIBADD = $(LCS_LIBS) +libgstcolorspacelcs_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = diff --git a/gst-libs/gst/audio/make_filter b/gst-libs/gst/audio/make_filter index 6a8efcad..58b95434 100755 --- a/gst-libs/gst/audio/make_filter +++ b/gst-libs/gst/audio/make_filter @@ -14,13 +14,12 @@ if test x"$2" = x ; then srcfile="gstaudiofiltertemplate.c" fi -id=$(echo '$Id$' | sed \ - -e 's/\$I[d]: \([^$]*\)\$/\1/g' \ - ) +id=`echo '$Id$' | sed \ + -e 's/\$I[d]: \([^$]*\)\$/\1/g'` echo $id -TEMPLATE=$(echo $Template | tr a-z A-Z) -template=$(echo $Template | tr A-Z a-z) +TEMPLATE=`echo $Template | tr a-z A-Z` +template=`echo $Template | tr A-Z a-z` # remember to break up the Id: in the line below sed \ |