15 files changed, 44 insertions, 31 deletions
diff --git a/gst/chart/Makefile.am b/gst/chart/Makefile.am
index c85c60af..2b3e26e0 100644
--- a/gst/chart/Makefile.am
+++ b/gst/chart/Makefile.am
@@ -1,4 +1,5 @@
-filterdir = $(libdir)/gst
-filter_LTLIBRARIES = libchart.la
+plugindir = $(libdir)/gst
+plugin_LTLIBRARIES = libchart.la
 libchart_la_SOURCES = gstchart.c
 libchart_la_CFLAGS = $(GST_CFLAGS)
+libchart_la_LIBADD = $(GST_LIBS)
diff --git a/gst/deinterlace/Makefile.am b/gst/deinterlace/Makefile.am
index eafa47d5..0f34139a 100644
--- a/gst/deinterlace/Makefile.am
+++ b/gst/deinterlace/Makefile.am
@@ -1,9 +1,10 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstdeinterlace.la
+plugin_LTLIBRARIES = libgstdeinterlace.la
 
 libgstdeinterlace_la_SOURCES = gstdeinterlace.c
 libgstdeinterlace_la_CFLAGS = $(GST_CFLAGS)
+libgstdeinterlace_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstdeinterlace.h 
 
diff --git a/gst/flx/Makefile.am b/gst/flx/Makefile.am
index 79a6fba7..df0a6880 100644
--- a/gst/flx/Makefile.am
+++ b/gst/flx/Makefile.am
@@ -1,9 +1,10 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstflxdec.la
+plugin_LTLIBRARIES = libgstflxdec.la
 
 libgstflxdec_la_SOURCES = gstflxdec.c flx_color.c
 libgstflxdec_la_CFLAGS = $(GST_CFLAGS)
+libgstflxdec_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = flx_fmt.h flx_color.h gstflxdec.h
 
diff --git a/gst/mpeg1sys/Makefile.am b/gst/mpeg1sys/Makefile.am
index 44c49467..97f27b2c 100644
--- a/gst/mpeg1sys/Makefile.am
+++ b/gst/mpeg1sys/Makefile.am
@@ -1,13 +1,13 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstmpeg1systemencode.la
+plugin_LTLIBRARIES = libgstmpeg1systemencode.la
 
 libgstmpeg1systemencode_la_SOURCES = gstmpeg1systemencode.c \
 			 buffer.c \
 			 systems.c  
 libgstmpeg1systemencode_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS)
+libgstmpeg1systemencode_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstmpeg1systemencode.h \
 		 main.h \
 		 buffer.h
-
diff --git a/gst/mpeg2sub/Makefile.am b/gst/mpeg2sub/Makefile.am
index d8bfe888..04d1996b 100644
--- a/gst/mpeg2sub/Makefile.am
+++ b/gst/mpeg2sub/Makefile.am
@@ -1,6 +1,6 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstmpeg2subt.la
+plugin_LTLIBRARIES = libgstmpeg2subt.la
 
 libgstmpeg2subt_la_SOURCES = gstmpeg2subt.c  
 
@@ -11,8 +11,8 @@ ARCHCFLAGS =
 endif
 
 libgstmpeg2subt_la_CFLAGS = -O3 $(ARCHCFLAGS) -fschedule-insns2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math $(GST_CFLAGS)
+libgstmpeg2subt_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstmpeg2subt.h 
 
 EXTRA_DIST = Notes.txt
-
diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am
index 4823c996..e1c938fd 100644
--- a/gst/mpegaudioparse/Makefile.am
+++ b/gst/mpegaudioparse/Makefile.am
@@ -1,14 +1,16 @@
 #FIXME clean me up a bit
 
-filterdir = $(libdir)/gst
-filter_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la
+plugindir = $(libdir)/gst
+plugin_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la
 
 libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c
 # FIXME is this useful?
 libgstmpegaudioparse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -ffast-math -finline-functions $(GST_CFLAGS)
+libgstmpegaudioparse_la_LIBADD = $(GST_LIBS)
 
 libgstmp3types_la_SOURCES = gstmp3types.c
 libgstmp3types_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -ffast-math -finline-functions $(GST_CFLAGS)
+libgstmp3types_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstmpegaudioparse.h
 EXTRA_DIST = README
diff --git a/gst/passthrough/Makefile.am b/gst/passthrough/Makefile.am
index 500d4679..b8584d79 100644
--- a/gst/passthrough/Makefile.am
+++ b/gst/passthrough/Makefile.am
@@ -1,9 +1,10 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstpassthrough.la
+plugin_LTLIBRARIES = libgstpassthrough.la
 
 libgstpassthrough_la_SOURCES = gstpassthrough.c
 libgstpassthrough_la_CFLAGS = $(GST_CFLAGS)
+libgstpassthrough_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstpassthrough.h filter.func
 
diff --git a/gst/playondemand/Makefile.am b/gst/playondemand/Makefile.am
index 4a96570a..39046de8 100644
--- a/gst/playondemand/Makefile.am
+++ b/gst/playondemand/Makefile.am
@@ -1,9 +1,10 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstplayondemand.la
+plugin_LTLIBRARIES = libgstplayondemand.la
 
 libgstplayondemand_la_SOURCES = gstplayondemand.c
 libgstplayondemand_la_CFLAGS = $(GST_CFLAGS)
+libgstplayondemand_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstplayondemand.h filter.func
 
diff --git a/gst/rtjpeg/Makefile.am b/gst/rtjpeg/Makefile.am
index 8adeae0b..86cc6065 100644
--- a/gst/rtjpeg/Makefile.am
+++ b/gst/rtjpeg/Makefile.am
@@ -1,8 +1,9 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstrtjpeg.la
+plugin_LTLIBRARIES = libgstrtjpeg.la
 
 libgstrtjpeg_la_SOURCES = gstrtjpeg.c gstrtjpegenc.c gstrtjpegdec.c RTjpeg.c
 libgstrtjpeg_la_CFLAGS = $(GST_CFLAGS)
+libgstrtjpeg_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstrtjpegenc.h gstrtjpegdec.h RTjpeg.h
diff --git a/gst/smooth/Makefile.am b/gst/smooth/Makefile.am
index f4856a14..7031dce1 100644
--- a/gst/smooth/Makefile.am
+++ b/gst/smooth/Makefile.am
@@ -1,8 +1,9 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstsmooth.la
+plugin_LTLIBRARIES = libgstsmooth.la
 
 libgstsmooth_la_SOURCES = gstsmooth.c
 libgstsmooth_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS)
+libgstsmooth_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstsmooth.h
diff --git a/gst/smoothwave/Makefile.am b/gst/smoothwave/Makefile.am
index e46a9572..d74c4a30 100644
--- a/gst/smoothwave/Makefile.am
+++ b/gst/smoothwave/Makefile.am
@@ -1,10 +1,10 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstsmoothwave.la
+plugin_LTLIBRARIES = libgstsmoothwave.la
 
 libgstsmoothwave_la_SOURCES = gstsmoothwave.c
 libgstsmoothwave_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS)
-libgstsmoothwave_la_LIBADD = $(GTK_LIBS)
+libgstsmoothwave_la_LIBADD = $(GST_LIBS) $(GTK_LIBS)
 
 noinst_HEADERS = gstsmoothwave.h
 
diff --git a/gst/spectrum/Makefile.am b/gst/spectrum/Makefile.am
index 65fefde4..370478da 100644
--- a/gst/spectrum/Makefile.am
+++ b/gst/spectrum/Makefile.am
@@ -1,9 +1,10 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstspectrum.la
+plugin_LTLIBRARIES = libgstspectrum.la
 
 libgstspectrum_la_SOURCES = gstspectrum.c fix_fft.c
 libgstspectrum_la_CFLAGS = $(GST_CFLAGS)
+libgstspectrum_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstspectrum.h
 
diff --git a/gst/speed/Makefile.am b/gst/speed/Makefile.am
index c20b1d20..1111a301 100644
--- a/gst/speed/Makefile.am
+++ b/gst/speed/Makefile.am
@@ -1,9 +1,10 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstspeed.la
+plugin_LTLIBRARIES = libgstspeed.la
 
 libgstspeed_la_SOURCES = gstspeed.c
 libgstspeed_la_CFLAGS = $(GST_CFLAGS)
+libgstspeed_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstspeed.h filter.func
 
diff --git a/gst/stereo/Makefile.am b/gst/stereo/Makefile.am
index 69e18c72..1976ebac 100644
--- a/gst/stereo/Makefile.am
+++ b/gst/stereo/Makefile.am
@@ -1,9 +1,10 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgststereo.la
+plugin_LTLIBRARIES = libgststereo.la
 
 libgststereo_la_SOURCES = gststereo.c
 libgststereo_la_CFLAGS = $(GST_CFLAGS)
+libgststereo_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gststereo.h
 
diff --git a/gst/y4m/Makefile.am b/gst/y4m/Makefile.am
index c1f1d345..5972955f 100644
--- a/gst/y4m/Makefile.am
+++ b/gst/y4m/Makefile.am
@@ -4,5 +4,6 @@ plugin_LTLIBRARIES = libgsty4mencode.la
 
 libgsty4mencode_la_SOURCES = gsty4mencode.c
 libgsty4mencode_la_CFLAGS = $(GST_CFLAGS)
+libgsty4mencode_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gsty4mencode.h