parallel install fixes

Original commit message from CVS:
parallel install fixes

9 files changed, 42 insertions, 39 deletions

diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 070d3531..3d74dda3 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -1,11 +1,11 @@
-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
diff --git a/gst-libs/gst/floatcast/Makefile.am b/gst-libs/gst/floatcast/Makefile.am
index dd213597..b18029c4 100644
--- a/gst-libs/gst/floatcast/Makefile.am
+++ b/gst-libs/gst/floatcast/Makefile.am
@@ -1,2 +1,2 @@
-libgstfloatcastincludedir = $(includedir)/@PACKAGE@-@VERSION@/gst/floatcast
-libgstfloatcastinclude_HEADERS = floatcast.h
+floatcastincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/floatcast
+floatcastinclude_HEADERS = floatcast.h
diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am
index 9f5c9b77..1288ca82 100644
--- a/gst-libs/gst/gconf/Makefile.am
+++ b/gst-libs/gst/gconf/Makefile.am
@@ -1,17 +1,17 @@
 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@
diff --git a/gst-libs/gst/idct/Makefile.am b/gst-libs/gst/idct/Makefile.am
index 8716bb71..1f3b1227 100644
--- a/gst-libs/gst/idct/Makefile.am
+++ b/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
diff --git a/gst-libs/gst/media-info/Makefile.am b/gst-libs/gst/media-info/Makefile.am
index 265011b5..5216ec40 100644
--- a/gst-libs/gst/media-info/Makefile.am
+++ b/gst-libs/gst/media-info/Makefile.am
@@ -1,17 +1,17 @@
 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
diff --git a/gst-libs/gst/play/Makefile.am b/gst-libs/gst/play/Makefile.am
index 52b0d157..5853bac9 100644
--- a/gst-libs/gst/play/Makefile.am
+++ b/gst-libs/gst/play/Makefile.am
@@ -1,13 +1,14 @@
 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
diff --git a/gst-libs/gst/resample/Makefile.am b/gst-libs/gst/resample/Makefile.am
index 07722904..82abb56a 100644
--- a/gst-libs/gst/resample/Makefile.am
+++ b/gst-libs/gst/resample/Makefile.am
@@ -1,4 +1,4 @@
-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
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
index c5bd8e8f..0f7b8a72 100644
--- a/gst-libs/gst/riff/Makefile.am
+++ b/gst-libs/gst/riff/Makefile.am
@@ -1,11 +1,12 @@
-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
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index ef924fd7..a3c59341 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -1,11 +1,12 @@
-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