parallel install fixes

Original commit message from CVS:
parallel install fixes

Makefile.am

@@ -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

configure.ac

@@ -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 ==============================================
 

examples/dynparams/Makefile.am

@@ -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)

ext/alsa/Makefile.am

-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 man_MANS = gstalsa.1
 

ext/cdparanoia/Makefile.am

-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 plugin_LTLIBRARIES = libgstcdparanoia.la
 

ext/gnomevfs/Makefile.am

-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
  
 plugin_LTLIBRARIES = libgstgnomevfssrc.la libgstgnomevfssink.la
  

ext/vorbis/Makefile.am

-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 plugin_LTLIBRARIES = libgstvorbis.la
 

gst-libs/gst/audio/Makefile.am

-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

gst-libs/gst/floatcast/Makefile.am

-libgstfloatcastincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/floatcast
-libgstfloatcastinclude_HEADERS = floatcast.h
+floatcastincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/floatcast
+floatcastinclude_HEADERS = floatcast.h

gst-libs/gst/gconf/Makefile.am

 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@

gst-libs/gst/idct/Makefile.am

@@ -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

gst-libs/gst/media-info/Makefile.am

 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

gst-libs/gst/play/Makefile.am

 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

gst-libs/gst/resample/Makefile.am

-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

gst-libs/gst/riff/Makefile.am

-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

gst-libs/gst/video/Makefile.am

-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

gst/adder/Makefile.am

-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 plugin_LTLIBRARIES = libgstadder.la
 

gst/audioscale/Makefile.am

-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 plugin_LTLIBRARIES = libgstaudioscale.la
 

gst/sine/Makefile.am

-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 plugin_LTLIBRARIES = libgstsinesrc.la
 
 libgstsinesrc_la_SOURCES = gstsinesrc.c
 libgstsinesrc_la_CFLAGS = $(GST_CFLAGS)
-libgstsinesrc_la_LIBADD = $(GST_LIBS) -lgstcontrol
+libgstsinesrc_la_LIBADD = $(GST_LIBS) $(GST_CONTROL_LIBS)
 libgstsinesrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstsinesrc.h
@@ -16,4 +16,4 @@ endif
 demo_dparams_SOURCES = demo-dparams.c
 ## putting GTK in front solves a bad compilation problem
 demo_dparams_CFLAGS  = $(GTK_CFLAGS) $(GST_CFLAGS) 
-demo_dparams_LDFLAGS = $(GST_LIBS) $(GTK_LIBS) -lgstcontrol
+demo_dparams_LDFLAGS = $(GST_LIBS) $(GTK_LIBS) $(GST_CONTROL_LIBS)

gst/videoscale/Makefile.am

-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 plugin_LTLIBRARIES = libgstvideoscale.la
 

gst/videotestsrc/Makefile.am

-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 plugin_LTLIBRARIES = libgstvideotestsrc.la
 

gst/volume/Makefile.am

-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 plugin_LTLIBRARIES = libgstvolume.la
 
 libgstvolume_la_SOURCES = gstvolume.c
 libgstvolume_la_CFLAGS = $(GST_CFLAGS)
-libgstvolume_la_LIBADD = $(GST_LIBS) -lgstcontrol
+libgstvolume_la_LIBADD = $(GST_LIBS) $(GST_CONTROL_LIBS)
 libgstvolume_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstvolume.h filter.func

gstreamer-libs.pc.in

 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}

gstreamer-play.pc.in

 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}

sys/v4l/Makefile.am

-plugindir = $(libdir)/gst
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 plugin_LTLIBRARIES = libgstv4lelement.la libgstv4lsrc.la \
 	libgstv4lmjpegsrc.la libgstv4lmjpegsink.la

tests/old/examples/dynparams/Makefile.am

@@ -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)