diff --git a/ChangeLog b/ChangeLog
index 6729522be2..30a4e75896 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2005-07-13  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	  make GST_PLUGIN_LDFLAGS only be flags; GST_LIBS should be
+	  added manually to each Makefile.am so we are sure it goes
+	  *last* and doesn't add -L flags before linking in libs of our
+	  own, like, say, internal .la libs, that then accidentally pick
+	  up the installed copy.
+	* docs/libs/Makefile.am:
+	* ext/alsa/Makefile.am:
+	* ext/cdparanoia/Makefile.am:
+	* ext/gnomevfs/Makefile.am:
+	* ext/libvisual/Makefile.am:
+	* ext/ogg/Makefile.am:
+	* ext/theora/Makefile.am:
+	* ext/vorbis/Makefile.am:
+	* gst-libs/gst/video/Makefile.am:
+	* gst/adder/Makefile.am:
+	* gst/audioconvert/Makefile.am:
+	* gst/audiorate/Makefile.am:
+	* gst/audioscale/Makefile.am:
+	* gst/ffmpegcolorspace/Makefile.am:
+	* gst/playback/Makefile.am:
+	* gst/sine/Makefile.am:
+	* gst/subparse/Makefile.am:
+	* gst/tags/Makefile.am:
+	* gst/tcp/Makefile.am:
+	* gst/typefind/Makefile.am:
+	* gst/videorate/Makefile.am:
+	* gst/videoscale/Makefile.am:
+	* gst/videotestsrc/Makefile.am:
+	* gst/volume/Makefile.am:
+	* sys/v4l/Makefile.am:
+	* sys/ximage/Makefile.am:
+	* sys/xvimage/Makefile.am:
+	  adapt properly to this change. This should make sure that
+	  plugins and libs properly link to the as-yet-uninstalled
+	  copies of stuff like libgstinterfaces and libgstvideo
+
 2005-07-13  Andy Wingo  <wingo@pobox.com>
 
 	* sys/v4l/gstv4lsrc.c (gst_v4lsrc_stop): Fix a spurious warning.
diff --git a/configure.ac b/configure.ac
index e2b01b2953..d030c161e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -363,7 +363,9 @@ dnl ===========================================================================
 plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
 AC_SUBST(plugindir)
 
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '[_]*(gst_|Gst|GST_).*' $GST_LIBS"
+dnl this really should only contain flags, not libs - they get added before
+dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '[_]*(gst_|Gst|GST_).*'"
 AC_SUBST(GST_PLUGIN_LDFLAGS)
 
 dnl these are all the gst plug-ins, compilable without additional libs
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index e3e0b512af..c830c2fb70 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -61,9 +61,6 @@ CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.c
 # thomasvs: another nice wingo addition would be an explanation on why
 # this is useful ;)
 
-#SCANOBJ_DEPS = $(top_builddir)/gst/elements/libgstelements.la \
-#	$(top_builddir)/gst/schedulers/libgstbasicomegascheduler.la
-#SCANOBJ_DEPS = $(top_builddir)/libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la
 SCANOBJ_DEPS = \
 	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
 	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la
@@ -83,7 +80,7 @@ extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
 # contains GtkObjects/GObjects and you want to document signals and properties.
 GTKDOC_CFLAGS = $(GST_BASE_CFLAGS) -I$(top_builddir) -I$(top_builddir)/gst-libs
-GTKDOC_LIBS = $(GST_BASE_LIBS) $(SCANOBJ_DEPS)
+GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_BASE_LIBS)
 
 GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
 GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
diff --git a/ext/alsa/Makefile.am b/ext/alsa/Makefile.am
index d976b00df8..050828cf39 100644
--- a/ext/alsa/Makefile.am
+++ b/ext/alsa/Makefile.am
@@ -1,4 +1,3 @@
-
 plugin_LTLIBRARIES = libgstalsa.la
 
 libgstalsa_la_SOURCES = \
@@ -15,10 +14,11 @@ EXTRA_DIST = \
 	gstalsaclock.c 
 
 libgstalsa_la_CFLAGS = $(GST_CFLAGS) $(ALSA_CFLAGS)
-libgstalsa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \
-libgstalsa_la_LIBADD = $(ALSA_LIBS) \
-  ${top_builddir}/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la 	\
-  ${top_builddir}/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la
+libgstalsa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstalsa_la_LIBADD = \
+	$(ALSA_LIBS) \
+  $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la 	\
+  $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la
 
 noinst_HEADERS = \
 	gstalsa.h \
diff --git a/ext/cdparanoia/Makefile.am b/ext/cdparanoia/Makefile.am
index 8db0f8cfdd..72f13f349b 100644
--- a/ext/cdparanoia/Makefile.am
+++ b/ext/cdparanoia/Makefile.am
@@ -1,9 +1,8 @@
-
 plugin_LTLIBRARIES = libgstcdparanoia.la
 
 libgstcdparanoia_la_SOURCES = gstcdparanoia.c
 libgstcdparanoia_la_CFLAGS = $(GST_CFLAGS)
-libgstcdparanoia_la_LIBADD = $(CDPARANOIA_LIBS)
 libgstcdparanoia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstcdparanoia_la_LIBADD = $(CDPARANOIA_LIBS) $(GST_LIBS)
 
 noinst_HEADERS = gstcdparanoia.h
diff --git a/ext/gnomevfs/Makefile.am b/ext/gnomevfs/Makefile.am
index c6665ce2a2..9c8b800b1d 100644
--- a/ext/gnomevfs/Makefile.am
+++ b/ext/gnomevfs/Makefile.am
@@ -9,8 +9,8 @@ EXTRA_DIST = \
 	gstgnomevfssink.c
 
 libgstgnomevfs_la_CFLAGS = $(GST_CFLAGS) $(GNOME_VFS_CFLAGS)
-libgstgnomevfs_la_LIBADD = $(GNOME_VFS_LIBS) 
-libgstgnomevfs_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS)
+libgstgnomevfs_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstgnomevfs_la_LIBADD = $(GNOME_VFS_LIBS) $(GST_BASE_LIBS)
 
 noinst_HEADERS = \
 	gstgnomevfs.h \
diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am
index 4f362da876..7a12aad8bb 100644
--- a/ext/libvisual/Makefile.am
+++ b/ext/libvisual/Makefile.am
@@ -2,6 +2,7 @@ plugin_LTLIBRARIES = libgstlibvisual.la
 
 libgstlibvisual_la_SOURCES = visual.c 
 libgstlibvisual_la_CFLAGS = $(GST_CFLAGS) $(LIBVISUAL_CFLAGS)
-libgstlibvisual_la_LIBADD = $(LIBVISUAL_LIBS) \
-	libgstbytestream-$(GST_MAJORMINOR).la
 libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstlibvisual_la_LIBADD = \
+	libgstbytestream-$(GST_MAJORMINOR).la \
+	$(LIBVISUAL_LIBS)
diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am
index 70355ca540..0d0fed2bda 100644
--- a/ext/ogg/Makefile.am
+++ b/ext/ogg/Makefile.am
@@ -9,7 +9,8 @@ libgstogg_la_SOURCES = \
 	gstogmparse.c
 
 libgstogg_la_CFLAGS = $(GST_CFLAGS) $(OGG_CFLAGS) 
-libgstogg_la_LIBADD = $(OGG_LIBS) \
-	$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la $(GST_BASE_LIBS) 
 libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
+libgstogg_la_LIBADD = \
+	$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la \
+	$(GST_BASE_LIBS) \
+	$(OGG_LIBS)
diff --git a/ext/theora/Makefile.am b/ext/theora/Makefile.am
index 02e8c47019..e42c86ed31 100644
--- a/ext/theora/Makefile.am
+++ b/ext/theora/Makefile.am
@@ -2,7 +2,8 @@ plugin_LTLIBRARIES = libgsttheora.la
 
 libgsttheora_la_SOURCES = theora.c theoraenc.c theoradec.c
 libgsttheora_la_CFLAGS = $(GST_CFLAGS) $(THEORA_CFLAGS)
-libgsttheora_la_LIBADD = $(THEORA_LIBS) \
-	$(top_builddir)/gst-libs/gst/tag/libgsttagedit-@GST_MAJORMINOR@.la
 libgsttheora_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
+libgsttheora_la_LIBADD = \
+	$(top_builddir)/gst-libs/gst/tag/libgsttagedit-@GST_MAJORMINOR@.la \
+	$(GST_LIBS) \
+	$(THEORA_LIBS)
diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am
index 603129935f..a31ad5e6ad 100644
--- a/ext/vorbis/Makefile.am
+++ b/ext/vorbis/Makefile.am
@@ -4,9 +4,11 @@ libgstvorbis_la_SOURCES = vorbis.c \
 	vorbisdec.c vorbisenc.c vorbisparse.c
 libgstvorbis_la_CFLAGS = $(GST_CFLAGS) $(VORBIS_CFLAGS) 
 ## AM_PATH_VORBIS also sets VORBISENC_LIBS
-libgstvorbis_la_LIBADD = $(VORBIS_LIBS) $(VORBISENC_LIBS) $(VORBISFILE_LIBS) \
-	$(top_builddir)/gst-libs/gst/tag/libgsttagedit-@GST_MAJORMINOR@.la \
-	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la
 libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstvorbis_la_LIBADD = \
+	$(top_builddir)/gst-libs/gst/tag/libgsttagedit-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
+	$(GST_LIBS) \
+	$(VORBIS_LIBS) $(VORBISENC_LIBS)
 
 noinst_HEADERS = vorbisenc.h vorbisdec.h vorbisparse.h
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index bbfb81072a..20cee9ed50 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -1,4 +1,3 @@
-
 lib_LTLIBRARIES = libgstvideo-@GST_MAJORMINOR@.la
 
 libgstvideo_@GST_MAJORMINOR@_la_SOURCES = video.c gstvideosink.c 
@@ -6,6 +5,6 @@ libgstvideo_@GST_MAJORMINOR@_la_SOURCES = video.c gstvideosink.c
 libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
 libgstvideoinclude_HEADERS = video.h videosink.h
 
-libgstvideo_@GST_MAJORMINOR@_la_LIBADD =
 libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIBS) $(GST_BASE_LIBS)
+libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS =
+libgstvideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
diff --git a/gst/adder/Makefile.am b/gst/adder/Makefile.am
index cba7c4853f..54b043d133 100644
--- a/gst/adder/Makefile.am
+++ b/gst/adder/Makefile.am
@@ -1,9 +1,8 @@
-
 plugin_LTLIBRARIES = libgstadder.la
 
 libgstadder_la_SOURCES = gstadder.c
 libgstadder_la_CFLAGS = $(GST_CFLAGS)
-libgstadder_la_LIBADD =
-libgstadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS)
+libgstadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstadder_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 
 noinst_HEADERS = gstadder.h
diff --git a/gst/audioconvert/Makefile.am b/gst/audioconvert/Makefile.am
index c016165a41..86ab480478 100644
--- a/gst/audioconvert/Makefile.am
+++ b/gst/audioconvert/Makefile.am
@@ -7,9 +7,10 @@ libgstaudioconvert_la_SOURCES = \
 	plugin.c
 
 libgstaudioconvert_la_CFLAGS = $(GST_CFLAGS)
-libgstaudioconvert_la_LIBADD =
-libgstaudioconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \
-	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la
+libgstaudioconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstaudioconvert_la_LIBADD = \
+	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
+	$(GST_LIBS)
 
 noinst_HEADERS = \
 	gstchannelmix.h \
diff --git a/gst/audiorate/Makefile.am b/gst/audiorate/Makefile.am
index fa0e736a30..f9acbf450b 100644
--- a/gst/audiorate/Makefile.am
+++ b/gst/audiorate/Makefile.am
@@ -1,7 +1,6 @@
-
 plugin_LTLIBRARIES = libgstaudiorate.la
 
 libgstaudiorate_la_SOURCES = gstaudiorate.c
 libgstaudiorate_la_CFLAGS = $(GST_CFLAGS)
-libgstaudiorate_la_LIBADD =
 libgstaudiorate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstaudiorate_la_LIBADD = $(GST_LIBS)
diff --git a/gst/audioscale/Makefile.am b/gst/audioscale/Makefile.am
index beeeea7d65..2790ffec27 100644
--- a/gst/audioscale/Makefile.am
+++ b/gst/audioscale/Makefile.am
@@ -3,14 +3,12 @@ noinst_LTLIBRARIES = libgstresample.la
 
 #libgstaudioscale_la_SOURCES = gstaudioscale.c
 #libgstaudioscale_la_CFLAGS = $(GST_CFLAGS)
-#libgstaudioscale_la_LIBADD =
 #libgstaudioscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+#libgstaudioscale_la_LIBADD = $(GST_LIBS) 
 
 noinst_HEADERS = gstaudioscale.h private.h
 
 libgstresample_la_SOURCES = dtos.c dtof.c functable.c resample.c resample.h
-libgstresample_la_LIBADD =
-libgstresample_la_CFLAGS = $(GST_CFLAGS)
+libgstresample_la_LIBADD = $(GST_LIBS)
 libgstresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-
+libgstresample_la_CFLAGS = $(GST_CFLAGS)
diff --git a/gst/ffmpegcolorspace/Makefile.am b/gst/ffmpegcolorspace/Makefile.am
index 78fc224623..5333ed2393 100644
--- a/gst/ffmpegcolorspace/Makefile.am
+++ b/gst/ffmpegcolorspace/Makefile.am
@@ -11,6 +11,7 @@ libgstffmpegcolorspace_la_SOURCES = \
 
 libgstffmpegcolorspace_la_CFLAGS = $(GST_CFLAGS)
 libgstffmpegcolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstffmpegcolorspace_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = \
 	gstffmpegcodecmap.h \
diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am
index b7d0bd00cc..e3efc6f040 100644
--- a/gst/playback/Makefile.am
+++ b/gst/playback/Makefile.am
@@ -17,14 +17,14 @@ libgstplaybin_la_SOURCES = \
 
 nodist_libgstplaybin_la_SOURCES = $(built_sources)
 libgstplaybin_la_CFLAGS = $(GST_CFLAGS)
-libgstplaybin_la_LIBADD =
 libgstplaybin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstplaybin_la_LIBADD = $(GST_LIBS)
 
 libgstdecodebin_la_SOURCES = gstdecodebin.c
 nodist_libgstdecodebin_la_SOURCES = $(built_sources)
 libgstdecodebin_la_CFLAGS = $(GST_CFLAGS)
-libgstdecodebin_la_LIBADD =
 libgstdecodebin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstdecodebin_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = \
 	gstplaybasebin.h \
diff --git a/gst/sine/Makefile.am b/gst/sine/Makefile.am
index 3c6a95022b..c54d8d8669 100644
--- a/gst/sine/Makefile.am
+++ b/gst/sine/Makefile.am
@@ -1,10 +1,8 @@
-
 plugin_LTLIBRARIES = libgstsinesrc.la
 
 libgstsinesrc_la_SOURCES = gstsinesrc.c
 libgstsinesrc_la_CFLAGS = $(GST_CFLAGS)
-libgstsinesrc_la_LIBADD = $(GST_LIBS) $(GST_CONTROL_LIBS) $(GST_BASE_LIBS)
 libgstsinesrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstsinesrc_la_LIBADD = $(GST_CONTROL_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
 
 noinst_HEADERS = gstsinesrc.h
-
diff --git a/gst/subparse/Makefile.am b/gst/subparse/Makefile.am
index 003f1a75fc..2f4edaa652 100644
--- a/gst/subparse/Makefile.am
+++ b/gst/subparse/Makefile.am
@@ -4,8 +4,8 @@ libgstsubparse_la_SOURCES = \
 	gstsubparse.c
 
 libgstsubparse_la_CFLAGS = $(GST_CFLAGS)
-libgstsubparse_la_LIBADD =
 libgstsubparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstsubparse_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = \
 	gstsubparse.h
diff --git a/gst/tags/Makefile.am b/gst/tags/Makefile.am
index 9cc87ac3f8..fbd53d2405 100644
--- a/gst/tags/Makefile.am
+++ b/gst/tags/Makefile.am
@@ -1,10 +1,8 @@
-
 plugin_LTLIBRARIES = libgsttagedit.la
 
 libgsttagedit_la_SOURCES = gsttagediting.c
 libgsttagedit_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
-libgsttagedit_la_LIBADD = $(GST_LIBS) 
 libgsttagedit_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgsttagedit_la_LIBADD = $(GST_LIBS) 
 
 noinst_HEADERS = gsttageditingprivate.h
-
diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am
index bf910db31e..65a9e5c56d 100644
--- a/gst/tcp/Makefile.am
+++ b/gst/tcp/Makefile.am
@@ -25,8 +25,8 @@ nodist_libgsttcp_la_SOURCES = \
 
 # remove ENABLE_NEW when dataprotocol is stable
 libgsttcp_la_CFLAGS = $(GST_CFLAGS) -DGST_ENABLE_NEW
-libgsttcp_la_LIBADD = 
-libgsttcp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_GDP_LIBS)
+libgsttcp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgsttcp_la_LIBADD = $(GST_BASE_LIBS) $(GST_GDP_LIBS) $(GST_LIBS)
 
 noinst_HEADERS = \
   gsttcpplugin.h \
@@ -45,4 +45,3 @@ noinst_PROGRAMS = fdsetstress
 fdsetstress_SOURCES = fdsetstress.c gstfdset.c 
 fdsetstress_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS)
 fdsetstress_LDFLAGS = $(GST_LIBS) $(GTK_LIBS)
-
diff --git a/gst/typefind/Makefile.am b/gst/typefind/Makefile.am
index fa729a219f..7f63b06184 100644
--- a/gst/typefind/Makefile.am
+++ b/gst/typefind/Makefile.am
@@ -1,8 +1,6 @@
-
 plugin_LTLIBRARIES = libgsttypefindfunctions.la
 
 libgsttypefindfunctions_la_SOURCES = gsttypefindfunctions.c
 libgsttypefindfunctions_la_CFLAGS = $(GST_CFLAGS)
-libgsttypefindfunctions_la_LIBADD =
 libgsttypefindfunctions_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
+libgsttypefindfunctions_la_LIBADD = $(GST_LIBS)
diff --git a/gst/videorate/Makefile.am b/gst/videorate/Makefile.am
index bcd2298f9d..66c1af51a9 100644
--- a/gst/videorate/Makefile.am
+++ b/gst/videorate/Makefile.am
@@ -1,7 +1,6 @@
-
 plugin_LTLIBRARIES = libgstvideorate.la
 
 libgstvideorate_la_SOURCES = gstvideorate.c
 libgstvideorate_la_CFLAGS = $(GST_CFLAGS)
-libgstvideorate_la_LIBADD =
 libgstvideorate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstvideorate_la_LIBADD = $(GST_LIBS)
diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am
index 271a1dcd1b..3f778b40f8 100644
--- a/gst/videoscale/Makefile.am
+++ b/gst/videoscale/Makefile.am
@@ -1,4 +1,3 @@
-
 plugin_LTLIBRARIES = libgstvideoscale.la
 
 libgstvideoscale_la_SOURCES = \
@@ -7,11 +6,10 @@ libgstvideoscale_la_SOURCES = \
 	vs_scanline.c
 
 libgstvideoscale_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
-libgstvideoscale_la_LIBADD = $(GST_BASE_LIBS)
 libgstvideoscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstvideoscale_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 
 noinst_HEADERS = \
 	gstvideoscale.h \
 	vs_image.h \
 	vs_scanline.h
-
diff --git a/gst/videotestsrc/Makefile.am b/gst/videotestsrc/Makefile.am
index eb828bfe30..b935de1b25 100644
--- a/gst/videotestsrc/Makefile.am
+++ b/gst/videotestsrc/Makefile.am
@@ -1,4 +1,3 @@
-
 plugin_LTLIBRARIES = libgstvideotestsrc.la
 
 libgstvideotestsrc_la_SOURCES = \
@@ -6,7 +5,7 @@ libgstvideotestsrc_la_SOURCES = \
 			videotestsrc.c
 
 libgstvideotestsrc_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS)
-libgstvideotestsrc_la_LIBADD =
-libgstvideotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBOIL_LIBS)
+libgstvideotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstvideotestsrc_la_LIBADD = $(GST_LIBS) $(LIBOIL_LIBS)
 
 noinst_HEADERS = gstvideotestsrc.h videotestsrc.h
diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am
index 82721bbf2b..db77ea50f7 100644
--- a/gst/volume/Makefile.am
+++ b/gst/volume/Makefile.am
@@ -1,12 +1,13 @@
-
 plugin_LTLIBRARIES = libgstvolume.la
 
 libgstvolume_la_SOURCES = gstvolume.c
 libgstvolume_la_CFLAGS = $(GST_CFLAGS)
-libgstvolume_la_LIBADD = $(GST_LIBS) $(GST_CONTROL_LIBS) \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
-	$(GST_BASE_LIBS)
 libgstvolume_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstvolume_la_LIBADD = \
+	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+	$(GST_CONTROL_LIBS) \
+	$(GST_BASE_LIBS) \
+	$(GST_LIBS)
 
 noinst_HEADERS = gstvolume.h filter.func
 
diff --git a/sys/v4l/Makefile.am b/sys/v4l/Makefile.am
index 53d0e9c20c..878aa73477 100644
--- a/sys/v4l/Makefile.am
+++ b/sys/v4l/Makefile.am
@@ -22,12 +22,10 @@ libgstvideo4linux_la_SOURCES = \
 #	gstv4lmjpegsink.c v4lmjpegsink_calls.c
 
 libgstvideo4linux_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/gst-libs
+libgstvideo4linux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideo4linux_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
-	$(GST_BASE_LIBS)
-libgstvideo4linux_la_LDFLAGS = \
-	$(GST_PLUGIN_LDFLAGS) \
-	$(xv_libs)
+	$(GST_BASE_LIBS) $(GST_LIBS) $(xv_libs)
 
 noinst_HEADERS = gstv4lelement.h v4l_calls.h \
 		gstv4lsrc.h v4lsrc_calls.h \
diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am
index b4dc7c8c4a..abdb04ff14 100644
--- a/sys/ximage/Makefile.am
+++ b/sys/ximage/Makefile.am
@@ -1,13 +1,12 @@
-
 plugin_LTLIBRARIES = libgstximagesink.la
 
 libgstximagesink_la_SOURCES =  ximagesink.c 
 libgstximagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
-libgstximagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
-	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la
 libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstximagesink_la_LIBADD = \
+	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
+$(X_LIBS) $(XSHM_LIBS)
 libgstximagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la
 
 noinst_HEADERS = ximagesink.h 
-
diff --git a/sys/xvimage/Makefile.am b/sys/xvimage/Makefile.am
index 3a6a5ce13f..ce3f7b5120 100644
--- a/sys/xvimage/Makefile.am
+++ b/sys/xvimage/Makefile.am
@@ -1,13 +1,12 @@
-
 plugin_LTLIBRARIES = libgstxvimagesink.la
 
 libgstxvimagesink_la_SOURCES =  xvimagesink.c 
 libgstxvimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
-libgstxvimagesink_la_LIBADD = $(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS) \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
-	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la
-libgstxvimagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la
 libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstxvimagesink_la_LIBADD = \
+	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
+	$(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS)
+libgstxvimagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la
 
 noinst_HEADERS = xvimagesink.h 
-