parallel install fixes

Original commit message from CVS:
parallel install fixes
parent 2a195140
......@@ -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 = libgstarts.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstartsdsink.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstaudiofile.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstgsm.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstcolorspace.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstjack.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 = libgstcolorspace.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstlibfame.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
CC = g++
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstsdlvideosink.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstshout.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstsmoothwave.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstsnapshot.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstswfdec.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgsttarkin.la
......
librarydir = $(libdir)/gst
librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@
library_LTLIBRARIES = libgstaudio.la
libgstaudio_la_SOURCES = audio.c
libgstaudioincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/audio
libgstaudioinclude_HEADERS = audio.h
# libgstaudioincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio
noinst_HEADERS = audio.h
libgstaudio_la_LIBADD =
libgstaudio_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
......
libgstfloatcastincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/floatcast
libgstfloatcastinclude_HEADERS = floatcast.h
floatcastincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/floatcast
floatcastinclude_HEADERS = floatcast.h
librarydir = $(libdir)
library_LTLIBRARIES = libgstgconf.la
library_LTLIBRARIES = libgstgconf-@GST_MAJORMINOR@.la
libgstgconf_la_SOURCES = gconf.c
libgstgconf_@GST_MAJORMINOR@_la_SOURCES = gconf.c
libgstgconfincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/gconf
libgstgconfinclude_HEADERS = gconf.h
libgstgconf_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gconf
libgstgconf_@GST_MAJORMINOR@include_HEADERS = gconf.h
noinst_PROGRAMS = test-gconf
test_gconf_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf.la
test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf-@GST_MAJORMINOR@.la
libgstgconf_la_LIBADD = $(GCONF_LIBS)
libgstgconf_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
libgstgconf_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@
libgstgconf_@GST_MAJORMINOR@_la_LIBADD = $(GCONF_LIBS)
libgstgconf_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
libgstgconf_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@
......@@ -4,7 +4,7 @@ else
GSTIDCTARCH_SRCS =
endif
librarydir = $(libdir)/gst
librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@
library_LTLIBRARIES = libgstidct.la
......@@ -15,8 +15,9 @@ libgstidct_la_SOURCES = \
intidct.c \
$(GSTIDCTARCH_SRCS)
libgstidctincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/idct
libgstidctinclude_HEADERS = idct.h
## libgstidctincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/idct
## libgstidctinclude_HEADERS = idct.h
noinst_HEADERS = idct.h dct.h
## check_PROGRAMS = ieeetest
......@@ -25,7 +26,6 @@ libgstidctinclude_HEADERS = idct.h
## ieeetest_CFLAGS = $(GST_CFLAGS)
## ieeetest_LDFLAGS = $(GST_LIBS)
noinst_HEADERS = dct.h
libgstidct_la_LIBADD =
libgstidct_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
......
librarydir = $(libdir)
library_LTLIBRARIES = libgstmedia-info.la
library_LTLIBRARIES = libgstmedia-info-@GST_MAJORMINOR@.la
libgstmedia_info_la_SOURCES = media-info.c
libgstmedia_info_@GST_MAJORMINOR@_la_SOURCES = media-info.c
libincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/media-info
libincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/media-info
libinclude_HEADERS = media-info.h
libgstmedia_info_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGIN_CFLAGS)
libgstmedia_info_la_LIBADD = $(GST_LIBS) $(GST_PLUGIN_LIBS)
libgstmedia_info_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGIN_CFLAGS)
libgstmedia_info_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(GST_PLUGIN_LIBS)
noinst_PROGRAMS = media-info-test
media_info_test_SOURCES = media-info-test.c
media_info_test_CFLAGS = $(GST_CFLAGS)
media_info_test_LDADD = $(GST_LIBS) libgstmedia-info.la
media_info_test_LDADD = $(GST_LIBS) libgstmedia-info-@GST_MAJORMINOR@.la
librarydir = $(libdir)
library_LTLIBRARIES = libgstplay.la
library_LTLIBRARIES = libgstplay-@GST_MAJORMINOR@.la
libgstplay_la_SOURCES = play.c
libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c
libgstplayincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/play
libgstplayinclude_HEADERS = play.h
libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/play
libgstplay_@GST_MAJORMINOR@include_HEADERS = play.h
libgstplay_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS)
libgstplay_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_LIBS)
libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS)
libgstplay_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_LIBS)
libgstplay_@GST_MAJORMINOR@_la_LDFLAGS = -version-info @GST_PLUGINS_LIBVERSION@
noinst_HEADERS = playpipelines.c
librarydir = $(libdir)/gst
librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@
library_LTLIBRARIES = libgstresample.la
......@@ -17,10 +17,10 @@ libgstresample_la_LIBADD =
libgstresample_la_CFLAGS = $(GST_CFLAGS) -ffast-math $(ARCHCFLAGS)
libgstresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstresampleincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/resample
libgstresampleinclude_HEADERS = resample.h
#libgstresampleincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/resample
#libgstresampleinclude_HEADERS = resample.h
noinst_HEADERS = private.h
noinst_HEADERS = private.h resample.h
#check_PROGRAMS = test
#test_SOURCES = test.c
......
librarydir = $(prefix)/lib/gst
librarydir = $(prefix)/lib/gstreamer-@GST_MAJORMINOR@
library_LTLIBRARIES = libgstriff.la
libgstriff_la_SOURCES = riffparse.c riffencode.c riffutil.c riff.c
libgstriffincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/riff
libgstriffinclude_HEADERS = riff.h
## libgstriffincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/riff
## libgstriffinclude_HEADERS = riff.h
noinst_HEADERS = riff.h
libgstriff_la_LIBADD =
libgstriff_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
......
librarydir = $(libdir)/gst
librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@
library_LTLIBRARIES = libgstvideo.la
libgstvideo_la_SOURCES = video.c
libgstvideoincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/video
libgstvideoinclude_HEADERS = video.h
#libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
#libgstvideoinclude_HEADERS = video.h
noinst_HEADERS = video.h
libgstvideo_la_LIBADD =
libgstvideo_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
......
This diff is collapsed.
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = \
libgstcdxaparse.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstchart.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstdeinterlace.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstfestival.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstfilter.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstflxdec.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libmixmatrix.la
......
SUBDIRS=libmodplug .
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstmodplug.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstmpeg1systemencode.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstmp1videoparse.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstmpeg2subt.la
......
#FIXME clean me up a bit
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la
libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstpassthrough.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstplayondemand.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstqtdemux.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstrtjpeg.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstsmooth.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 = libgstspeed.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgststereo.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstvideocrop.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstvirtualdub.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgsty4menc.la
......
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 = libgstcdplayer.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstdxr3.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstqcam.la
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = \
libgstv4l2element.la \
......
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstvcdsrc.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