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/aalib/Makefile.am b/ext/aalib/Makefile.am index c7de563f8c..38e6c6d189 100644 --- a/ext/aalib/Makefile.am +++ b/ext/aalib/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstaasink.la diff --git a/ext/dv/Makefile.am b/ext/dv/Makefile.am index 9b56d93c72..12d686ae06 100644 --- a/ext/dv/Makefile.am +++ b/ext/dv/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstdvdec.la diff --git a/ext/esd/Makefile.am b/ext/esd/Makefile.am index 9506b4be97..8b0ea927b0 100644 --- a/ext/esd/Makefile.am +++ b/ext/esd/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstesd.la diff --git a/ext/flac/Makefile.am b/ext/flac/Makefile.am index d87b87e903..0f243f4ca6 100644 --- a/ext/flac/Makefile.am +++ b/ext/flac/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstflac.la diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am index fb745bf376..32e0258ead 100644 --- a/ext/gdk_pixbuf/Makefile.am +++ b/ext/gdk_pixbuf/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstgdkpixbuf.la diff --git a/ext/jpeg/Makefile.am b/ext/jpeg/Makefile.am index 005813bb75..7018a3cf00 100644 --- a/ext/jpeg/Makefile.am +++ b/ext/jpeg/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstjpeg.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/libpng/Makefile.am b/ext/libpng/Makefile.am index 29d6f8476b..868ec54d5a 100644 --- a/ext/libpng/Makefile.am +++ b/ext/libpng/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstpng.la diff --git a/ext/mikmod/Makefile.am b/ext/mikmod/Makefile.am index b3d17d2fff..be7814c0b4 100644 --- a/ext/mikmod/Makefile.am +++ b/ext/mikmod/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmikmod.la diff --git a/ext/pango/Makefile.am b/ext/pango/Makefile.am index 5304729aee..2ec7e4ea09 100644 --- a/ext/pango/Makefile.am +++ b/ext/pango/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ #PANGO_CFLAGS = -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 #PANGO_LDFLAGS = -Wl,--export-dynamic -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 diff --git a/ext/raw1394/Makefile.am b/ext/raw1394/Makefile.am index 1ab8b1560f..aa651a9a15 100644 --- a/ext/raw1394/Makefile.am +++ b/ext/raw1394/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgst1394.la diff --git a/ext/shout2/Makefile.am b/ext/shout2/Makefile.am index 2da9221527..c7aaba639b 100644 --- a/ext/shout2/Makefile.am +++ b/ext/shout2/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstshout2.la diff --git a/ext/speex/Makefile.am b/ext/speex/Makefile.am index 9822164d1c..cdfcbdb53a 100644 --- a/ext/speex/Makefile.am +++ b/ext/speex/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstspeex.la diff --git a/gst/auparse/Makefile.am b/gst/auparse/Makefile.am index 69d1b4993d..1a5ced967b 100644 --- a/gst/auparse/Makefile.am +++ b/gst/auparse/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstauparse.la diff --git a/gst/avi/Makefile.am b/gst/avi/Makefile.am index 1fce33a4f5..68abc44916 100644 --- a/gst/avi/Makefile.am +++ b/gst/avi/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = \ libgstavimux.la \ diff --git a/gst/cutter/Makefile.am b/gst/cutter/Makefile.am index cd3d83295d..ec1a0ac47d 100644 --- a/gst/cutter/Makefile.am +++ b/gst/cutter/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstcutter.la diff --git a/gst/debug/Makefile.am b/gst/debug/Makefile.am index 6bcf345ea3..91210cc67b 100644 --- a/gst/debug/Makefile.am +++ b/gst/debug/Makefile.am @@ -1,4 +1,3 @@ -plugindir= $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstefence.la diff --git a/gst/effectv/Makefile.am b/gst/effectv/Makefile.am index 2964351348..e4668aebec 100644 --- a/gst/effectv/Makefile.am +++ b/gst/effectv/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgsteffectv.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/goom/Makefile.am b/gst/goom/Makefile.am index 205bbdf61a..5fafbde26f 100644 --- a/gst/goom/Makefile.am +++ b/gst/goom/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstgoom.la diff --git a/gst/law/Makefile.am b/gst/law/Makefile.am index a8a9d6ddbf..2a0648f76b 100644 --- a/gst/law/Makefile.am +++ b/gst/law/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstalaw.la libgstmulaw.la diff --git a/gst/level/Makefile.am b/gst/level/Makefile.am index 5bc89dc521..507454d597 100644 --- a/gst/level/Makefile.am +++ b/gst/level/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstlevel.la diff --git a/gst/median/Makefile.am b/gst/median/Makefile.am index 94a6ae4573..b73d4b0eba 100644 --- a/gst/median/Makefile.am +++ b/gst/median/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmedian.la diff --git a/gst/monoscope/Makefile.am b/gst/monoscope/Makefile.am index da0a288ec7..7f50915ee2 100644 --- a/gst/monoscope/Makefile.am +++ b/gst/monoscope/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmonoscope.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/rtp/Makefile.am b/gst/rtp/Makefile.am index 83bcbd316a..b705d6be5c 100644 --- a/gst/rtp/Makefile.am +++ b/gst/rtp/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstrtp.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/udp/Makefile.am b/gst/udp/Makefile.am index e43ed88984..3871d7147d 100644 --- a/gst/udp/Makefile.am +++ b/gst/udp/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstudp.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/videofilter/Makefile.am b/gst/videofilter/Makefile.am index 148e79e8ce..73fb917512 100644 --- a/gst/videofilter/Makefile.am +++ b/gst/videofilter/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstvideofilter.la libgstvideoflip.la \ libgstvideobalance.la diff --git a/gst/videoflip/Makefile.am b/gst/videoflip/Makefile.am index ad9b7a9eb5..fac6d92d99 100644 --- a/gst/videoflip/Makefile.am +++ b/gst/videoflip/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstvideoflip.la diff --git a/gst/wavenc/Makefile.am b/gst/wavenc/Makefile.am index b198bc3b83..a7afdd42cd 100644 --- a/gst/wavenc/Makefile.am +++ b/gst/wavenc/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstwavenc.la diff --git a/gst/wavparse/Makefile.am b/gst/wavparse/Makefile.am index 8e8bfe5aba..dfd9d61a1f 100644 --- a/gst/wavparse/Makefile.am +++ b/gst/wavparse/Makefile.am @@ -1,4 +1,3 @@ -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstwavparse.la