parallel install fixes

Original commit message from CVS:
parallel install fixes
parent 17a38e04
......@@ -16,11 +16,20 @@ else
EXAMPLES_DIR=
endif
gstreamer-libs-@GST_MAJORMINOR@.pc: gstreamer-libs.pc
cp gstreamer-libs.pc gstreamer-libs-@GST_MAJORMINOR@.pc
gstreamer-play-@GST_MAJORMINOR@.pc: gstreamer-play.pc
cp gstreamer-play.pc gstreamer-play-@GST_MAJORMINOR@.pc
gst_element_check-@GST_MAJORMINOR@.m4: gst-element-check.m4
cp gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gstreamer-libs.pc gstreamer-play.pc
pkgconfig_DATA = \
gstreamer-libs-@GST_MAJORMINOR@.pc \
gstreamer-play-@GST_MAJORMINOR@.pc
aclocaldir = $(datadir)/aclocal
aclocal_DATA = gst-element-check.m4
aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
SUBDIRS=gst-libs gst sys $(EXT_DIR) $(EXAMPLES_DIR) tools $(GCONF_DIR) testsuite
......
common @ 92ff5101
Subproject commit 9d5642850b94f5bc21d565f8c900a0606fbb518f
Subproject commit 92ff5101d55c0f853620bf13f8dd528992824137
......@@ -14,7 +14,17 @@ dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 4, 2, 1, GST_ERROR="-Wall", GST_ERROR="-Wall -Werror")
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
AS_LIBTOOL(GST_PLUGINS, 0, 0, 0, yes)
dnl our libraries and install dirs use major.minor as a version
GST_MAJORMINOR=$GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR
AC_SUBST(GST_MAJORMINOR)
dnl CURRENT, REVISION, AGE
dnl - library source changed -> increment REVISION
dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
dnl - interfaces added -> increment AGE
dnl - interfaces removed -> AGE = 0
AS_LIBTOOL(GST_PLUGINS, 1, 0, 0)
dnl FIXME take something else ?
AC_CONFIG_SRCDIR([gst/law/alaw.c])
......@@ -136,19 +146,23 @@ GST_CHECK_FEATURE(GCONF, [GConf libraries], , [
])
dnl check for gstreamer; uninstalled is selected preferentially -- see pkg-config(1)
PKG_CHECK_MODULES(GST, gstreamer >= $GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR.$GST_PLUGINS_VERSION_MICRO,
PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR.$GST_PLUGINS_VERSION_MICRO,
HAVE_GST="yes", HAVE_GST="no")
if test "x$HAVE_GST" = "xno"; then
AC_MSG_ERROR(no GStreamer found)
fi
GST_TOOLS_DIR=`pkg-config --variable=toolsdir gstreamer`
GST_TOOLS_DIR=`pkg-config --variable=toolsdir gstreamer-$GST_MAJORMINOR`
if test -z $GST_TOOLS_DIR; then
AC_MSG_ERROR([no tools dir defined in GStreamer pkg-config file; core upgrade needed.])
fi
AC_SUBST(GST_TOOLS_DIR)
dnl additional gstcontrol libs
GST_CONTROL_LIBS=`pkg-config --variable=gstcontrol_libs gstreamer-$GST_MAJORMINOR`
AC_SUBST(GST_CONTROL_LIBS)
dnl Set up conditionals for (target) architecture:
dnl ==============================================
......
......@@ -3,5 +3,5 @@ examples = filter
noinst_PROGRAMS = $(examples)
# we have nothing but apps here, we can do this safely
LIBS = $(GST_LIBS) $(GTK_LIBS) -lgstcontrol
LIBS = $(GST_LIBS) $(GTK_LIBS) $(GST_CONTROL_LIBS)
AM_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS)
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstaasink.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstdvdec.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstesdsink.la libgstesdmon.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstflac.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstjpeg.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstladspa.la
libgstladspa_la_SOURCES = gstladspa.c search.c load.c
libgstladspa_la_CFLAGS = $(GST_CFLAGS)
libgstladspa_la_LIBADD = $(GST_LIBS) -lgstcontrol
libgstladspa_la_LIBADD = $(GST_LIBS) $(GST_CONTROL_LIBS)
libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstladspa.h utils.h
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstpng.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstmikmod.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgst1394.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstshout2.la
......
This diff is collapsed.
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstauparse.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = \
libgstavimux.la \
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstcutter.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgsteffectv.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstflxdec.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstgoom.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstalaw.la libgstmulaw.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstlevel.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstmedian.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstmonoscope.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstqtdemux.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstsmoothwave.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstsmpte.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstspectrum.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstudp.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstvideocrop.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstwavenc.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstwavparse.la
......
......@@ -412,7 +412,7 @@ gst_wavparse_pad_convert (GstPad *pad,
bytes_per_sample = wavparse->channels * wavparse->width / 8;
if (bytes_per_sample == 0) {
g_warning ("bytes_per_sample is 0, internal error\n");
g_warning ("channels %d, width %d\n",
g_warning ("channels %d, width %d\n",
wavparse->channels, wavparse->width);
return FALSE;
}
......
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/@PACKAGE@-@VERSION@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
Name: GStreamer Media-Specific Libraries
Description: Streaming-media framework, media-specific libraries
Requires: gstreamer = @VERSION@
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
Version: @VERSION@
Libs:
Cflags: -I${includedir}
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/@PACKAGE@-@VERSION@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
Name: GStreamer Play Library
Description: Streaming-media framework, play libraries
Requires: gstreamer >= @VERSION@
Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@
Version: @VERSION@
Libs: -L${libdir} -lgstplay -lgstcontrol
Libs: -L${libdir} -lgstplay-@GST_MAJORMINOR@ -lgstcontrol-@GST_MAJORMINOR@
Cflags: -I${includedir}
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstossaudio.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = \
libgstv4l2element.la \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment