diff --git a/examples/gob/Makefile.am b/examples/gob/Makefile.am index 4709f0a9c3..7abde4dc67 100644 --- a/examples/gob/Makefile.am +++ b/examples/gob/Makefile.am @@ -1,6 +1,4 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ - plugin_LTLIBRARIES = libgstidentity2.la GOB_FILES_ID = gst-identity2.c gst-identity2.h gst-identity2-private.h diff --git a/ext/arts/Makefile.am b/ext/arts/Makefile.am index 94009dc329..d3218ddf78 100644 --- a/ext/arts/Makefile.am +++ b/ext/arts/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstarts.la diff --git a/ext/artsd/Makefile.am b/ext/artsd/Makefile.am index bfb84ae1f2..4200c89b01 100644 --- a/ext/artsd/Makefile.am +++ b/ext/artsd/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstartsdsink.la diff --git a/ext/audiofile/Makefile.am b/ext/audiofile/Makefile.am index 53e8716c16..cdca46d172 100644 --- a/ext/audiofile/Makefile.am +++ b/ext/audiofile/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstaudiofile.la diff --git a/ext/cdaudio/Makefile.am b/ext/cdaudio/Makefile.am index 5a6e4f5342..0fb0ff169e 100644 --- a/ext/cdaudio/Makefile.am +++ b/ext/cdaudio/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstcdaudio.la diff --git a/ext/divx/Makefile.am b/ext/divx/Makefile.am index 301657c8cf..e5323e11ac 100644 --- a/ext/divx/Makefile.am +++ b/ext/divx/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstdivxenc.la libgstdivxdec.la diff --git a/ext/gsm/Makefile.am b/ext/gsm/Makefile.am index 9960453d8d..a3779668e6 100644 --- a/ext/gsm/Makefile.am +++ b/ext/gsm/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstgsm.la diff --git a/ext/hermes/Makefile.am b/ext/hermes/Makefile.am index f536a7efae..f08b401bdf 100644 --- a/ext/hermes/Makefile.am +++ b/ext/hermes/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstcolorspace.la diff --git a/ext/ivorbis/Makefile.am b/ext/ivorbis/Makefile.am index 456a592624..1427f972c0 100644 --- a/ext/ivorbis/Makefile.am +++ b/ext/ivorbis/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstivorbis.la diff --git a/ext/jack/Makefile.am b/ext/jack/Makefile.am index 3d05433206..a97a2ad7a9 100644 --- a/ext/jack/Makefile.am +++ b/ext/jack/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstjack.la diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am index d393d74342..a5a8f4e568 100644 --- a/ext/ladspa/Makefile.am +++ b/ext/ladspa/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstladspa.la diff --git a/ext/lcs/Makefile.am b/ext/lcs/Makefile.am index b9e0ac5e62..2db0378929 100644 --- a/ext/lcs/Makefile.am +++ b/ext/lcs/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstcolorspace.la diff --git a/ext/libfame/Makefile.am b/ext/libfame/Makefile.am index 28d3d1e782..7c2d846904 100644 --- a/ext/libfame/Makefile.am +++ b/ext/libfame/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstlibfame.la diff --git a/ext/mas/Makefile.am b/ext/mas/Makefile.am index 194e61756e..bc73ff28e7 100644 --- a/ext/mas/Makefile.am +++ b/ext/mas/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmassink.la diff --git a/ext/mplex/Makefile.am b/ext/mplex/Makefile.am index 3d0eadc7ad..5f9d847f33 100644 --- a/ext/mplex/Makefile.am +++ b/ext/mplex/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmplex.la diff --git a/ext/sdl/Makefile.am b/ext/sdl/Makefile.am index 447fbe4fc0..17cd38802a 100644 --- a/ext/sdl/Makefile.am +++ b/ext/sdl/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsdlvideosink.la diff --git a/ext/shout/Makefile.am b/ext/shout/Makefile.am index 2e4c501ba0..d0dd38510f 100644 --- a/ext/shout/Makefile.am +++ b/ext/shout/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstshout.la diff --git a/ext/smoothwave/Makefile.am b/ext/smoothwave/Makefile.am index e70825e322..6dd55d9c7e 100644 --- a/ext/smoothwave/Makefile.am +++ b/ext/smoothwave/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsmoothwave.la diff --git a/ext/snapshot/Makefile.am b/ext/snapshot/Makefile.am index 81c6895307..c1542abf67 100644 --- a/ext/snapshot/Makefile.am +++ b/ext/snapshot/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsnapshot.la diff --git a/ext/sndfile/Makefile.am b/ext/sndfile/Makefile.am index deeee5a31e..23a86d717b 100644 --- a/ext/sndfile/Makefile.am +++ b/ext/sndfile/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsndfile.la diff --git a/ext/swfdec/Makefile.am b/ext/swfdec/Makefile.am index 1a6c994835..9ca992ae56 100644 --- a/ext/swfdec/Makefile.am +++ b/ext/swfdec/Makefile.am @@ -1,6 +1,4 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ - plugin_LTLIBRARIES = libgstswfdec.la libgstswfdec_la_SOURCES = gstswfdec.c diff --git a/ext/tarkin/Makefile.am b/ext/tarkin/Makefile.am index a8c6a3d5bf..7d701100ec 100644 --- a/ext/tarkin/Makefile.am +++ b/ext/tarkin/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgsttarkin.la diff --git a/ext/xvid/Makefile.am b/ext/xvid/Makefile.am index 50e3685981..32f60d31d8 100644 --- a/ext/xvid/Makefile.am +++ b/ext/xvid/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstxvid.la diff --git a/gst/cdxaparse/Makefile.am b/gst/cdxaparse/Makefile.am index d07dc48483..0c19c1238c 100644 --- a/gst/cdxaparse/Makefile.am +++ b/gst/cdxaparse/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = \ libgstcdxaparse.la diff --git a/gst/chart/Makefile.am b/gst/chart/Makefile.am index 90a1d08571..89e36a27ff 100644 --- a/gst/chart/Makefile.am +++ b/gst/chart/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstchart.la diff --git a/gst/deinterlace/Makefile.am b/gst/deinterlace/Makefile.am index 2f64005bb8..5af2998bfb 100644 --- a/gst/deinterlace/Makefile.am +++ b/gst/deinterlace/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstdeinterlace.la diff --git a/gst/festival/Makefile.am b/gst/festival/Makefile.am index e22ea02975..d785fbe5bc 100644 --- a/gst/festival/Makefile.am +++ b/gst/festival/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstfestival.la diff --git a/gst/filter/Makefile.am b/gst/filter/Makefile.am index 77e7ff5908..f19caa7839 100644 --- a/gst/filter/Makefile.am +++ b/gst/filter/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstfilter.la diff --git a/gst/flx/Makefile.am b/gst/flx/Makefile.am index 7b64b42575..fd742efade 100644 --- a/gst/flx/Makefile.am +++ b/gst/flx/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstflxdec.la diff --git a/gst/mixmatrix/Makefile.am b/gst/mixmatrix/Makefile.am index e858ae8a4a..a76905472f 100755 --- a/gst/mixmatrix/Makefile.am +++ b/gst/mixmatrix/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libmixmatrix.la diff --git a/gst/modplug/Makefile.am b/gst/modplug/Makefile.am index 5eef5961c9..4738dbb11a 100644 --- a/gst/modplug/Makefile.am +++ b/gst/modplug/Makefile.am @@ -1,7 +1,5 @@ SUBDIRS=libmodplug . -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ - plugin_LTLIBRARIES = libgstmodplug.la libgstmodplug_la_SOURCES = modplug_types.cc gstmodplug.cc diff --git a/gst/mpeg1sys/Makefile.am b/gst/mpeg1sys/Makefile.am index 2083e71901..0bf31a86ff 100644 --- a/gst/mpeg1sys/Makefile.am +++ b/gst/mpeg1sys/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmpeg1systemencode.la diff --git a/gst/mpeg1videoparse/Makefile.am b/gst/mpeg1videoparse/Makefile.am index ed72691e81..fea714280f 100644 --- a/gst/mpeg1videoparse/Makefile.am +++ b/gst/mpeg1videoparse/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmp1videoparse.la diff --git a/gst/mpeg2sub/Makefile.am b/gst/mpeg2sub/Makefile.am index 14f1c7dba9..fc1c39dd1f 100644 --- a/gst/mpeg2sub/Makefile.am +++ b/gst/mpeg2sub/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmpeg2subt.la diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am index 8b81fcc412..ece03b8531 100644 --- a/gst/mpegaudioparse/Makefile.am +++ b/gst/mpegaudioparse/Makefile.am @@ -1,6 +1,5 @@ #FIXME clean me up a bit -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c diff --git a/gst/overlay/Makefile.am b/gst/overlay/Makefile.am index 38eac4cc75..cc66aff7ca 100644 --- a/gst/overlay/Makefile.am +++ b/gst/overlay/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstoverlay.la diff --git a/gst/passthrough/Makefile.am b/gst/passthrough/Makefile.am index 4d7581e061..7294092367 100644 --- a/gst/passthrough/Makefile.am +++ b/gst/passthrough/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstpassthrough.la diff --git a/gst/playondemand/Makefile.am b/gst/playondemand/Makefile.am index af06bfdd9f..a9894c4b38 100644 --- a/gst/playondemand/Makefile.am +++ b/gst/playondemand/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstplayondemand.la diff --git a/gst/qtdemux/Makefile.am b/gst/qtdemux/Makefile.am index e4339741e4..58c1df42c9 100644 --- a/gst/qtdemux/Makefile.am +++ b/gst/qtdemux/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstqtdemux.la diff --git a/gst/rtjpeg/Makefile.am b/gst/rtjpeg/Makefile.am index 740e27d69a..60962e2e07 100644 --- a/gst/rtjpeg/Makefile.am +++ b/gst/rtjpeg/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstrtjpeg.la diff --git a/gst/smooth/Makefile.am b/gst/smooth/Makefile.am index 31675bf572..3d0143e067 100644 --- a/gst/smooth/Makefile.am +++ b/gst/smooth/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsmooth.la diff --git a/gst/smoothwave/Makefile.am b/gst/smoothwave/Makefile.am index e70825e322..6dd55d9c7e 100644 --- a/gst/smoothwave/Makefile.am +++ b/gst/smoothwave/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsmoothwave.la diff --git a/gst/smpte/Makefile.am b/gst/smpte/Makefile.am index b46ff76a40..00d06bbc94 100644 --- a/gst/smpte/Makefile.am +++ b/gst/smpte/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsmpte.la diff --git a/gst/spectrum/Makefile.am b/gst/spectrum/Makefile.am index 0d3a203498..1e9a6c770b 100644 --- a/gst/spectrum/Makefile.am +++ b/gst/spectrum/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstspectrum.la diff --git a/gst/speed/Makefile.am b/gst/speed/Makefile.am index eee61a786f..7062fa958d 100644 --- a/gst/speed/Makefile.am +++ b/gst/speed/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstspeed.la diff --git a/gst/stereo/Makefile.am b/gst/stereo/Makefile.am index 1023b85dbc..b81e95dc12 100644 --- a/gst/stereo/Makefile.am +++ b/gst/stereo/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgststereo.la diff --git a/gst/vbidec/Makefile.am b/gst/vbidec/Makefile.am index a7009ec5a1..9c3dcad668 100644 --- a/gst/vbidec/Makefile.am +++ b/gst/vbidec/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstvbidec.la diff --git a/gst/videocrop/Makefile.am b/gst/videocrop/Makefile.am index 9c6489694d..81c4199031 100644 --- a/gst/videocrop/Makefile.am +++ b/gst/videocrop/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstvideocrop.la diff --git a/gst/virtualdub/Makefile.am b/gst/virtualdub/Makefile.am index 9c4b7d6773..d02a079267 100644 --- a/gst/virtualdub/Makefile.am +++ b/gst/virtualdub/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstvirtualdub.la diff --git a/gst/y4m/Makefile.am b/gst/y4m/Makefile.am index c2928cce33..3e20c1728e 100644 --- a/gst/y4m/Makefile.am +++ b/gst/y4m/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgsty4menc.la