s/filter/plugin/ link plugins to GST_LIBS rearrange rules to a common format

Original commit message from CVS:
* s/filter/plugin/
* link plugins to GST_LIBS
* rearrange rules to a common format

9 files changed, 25 insertions, 24 deletions

diff --git a/ext/arts/Makefile.am b/ext/arts/Makefile.am
index ce2150a3..5ca2b1ba 100644
--- a/ext/arts/Makefile.am
+++ b/ext/arts/Makefile.am
@@ -15,14 +15,13 @@ SUFFIXES = .idl
 # mcopidl Extension Expansion Technology clean up
 CLEANFILES = gst_artsio.h gst_artsio.cc gst_artsio.mcopclass gst_artsio.mcoptype
 
-
 # FIXME automake 1.4 hack, 1.5 should let us put the .idl in
 #       _SOURCES at which point the follow can be removed
 
 libgstarts_la_SOURCES = gst_arts.c gst_artsio.cc gst_artsio_impl.cc
 libgstarts_la_CFLAGS = $(GST_CFLAGS)
 libgstarts_la_CXXFLAGS = $(ARTS_CXXFLAGS) $(GST_CFLAGS)
-libgstarts_la_LIBADD = $(ARTS_LIBS)
+libgstarts_la_LIBADD = $(GST_LIBS) $(ARTS_LIBS)
 
 EXTRA_DIST = gst_artsio.idl
 else
@@ -33,4 +32,3 @@ noinst_HEADERS = gst_arts.h gst_artsio_impl.h
 
 dist-hook:
 	rm -f $(distdir)/gst_artsio.cc
-
diff --git a/ext/artsd/Makefile.am b/ext/artsd/Makefile.am
index f41f73d6..b9db91fe 100644
--- a/ext/artsd/Makefile.am
+++ b/ext/artsd/Makefile.am
@@ -3,7 +3,7 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libartsdsink.la
 
 libartsdsink_la_SOURCES = gstartsdsink.c
-noinst_HEADERS = gstartsdsink.h
+libartsdsink_la_CFLAGS = $(GST_CFLAGS) $(ARTSC_CFLAGS)
+libartsdsink_la_LIBADD = $(GST_LIBS) $(ARTSC_LIBS)
 
-libartsdsink_la_CFLAGS = $(ARTSC_CFLAGS) $(GST_CFLAGS)
-libartsdsink_la_LIBADD = $(ARTSC_LIBS)
+noinst_HEADERS = gstartsdsink.h
diff --git a/ext/audiofile/Makefile.am b/ext/audiofile/Makefile.am
index 7e1ca5ec..cb03aa5a 100644
--- a/ext/audiofile/Makefile.am
+++ b/ext/audiofile/Makefile.am
@@ -3,12 +3,11 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libafsink.la libafsrc.la
 
 libafsink_la_SOURCES = gstafsink.c
-libafsrc_la_SOURCES = gstafsrc.c
-noinst_HEADERS = gstafsink.h gstafsrc.h
-
-libafsink_la_LIBADD = $(AUDIOFILE_LIBS)
-libafsrc_la_LIBADD = $(AUDIOFILE_LIBS)
-
 libafsink_la_CFLAGS = $(GST_CFLAGS)
+libafsink_la_LIBADD = $(GST_LIBS) $(AUDIOFILE_LIBS)
+
+libafsrc_la_SOURCES = gstafsrc.c
 libafsrc_la_CFLAGS = $(GST_CFLAGS)
+libafsrc_la_LIBADD = $(GST_LIBS) $(AUDIOFILE_LIBS)
 
+noinst_HEADERS = gstafsink.h gstafsrc.h
diff --git a/ext/gsm/Makefile.am b/ext/gsm/Makefile.am
index 92df5f68..b70b41cd 100644
--- a/ext/gsm/Makefile.am
+++ b/ext/gsm/Makefile.am
@@ -3,8 +3,8 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstgsm.la
 
 libgstgsm_la_SOURCES = gstgsm.c gstgsmdec.c gstgsmenc.c
-libgstgsm_la_LIBADD = $(GSM_LIBS)
 libgstgsm_la_CFLAGS = $(GST_CFLAGS)
+libgstgsm_la_LIBADD = $(GST_LIBS) $(GSM_LIBS)
 
 noinst_HEADERS = gstgsmenc.h gstgsmdec.h 
 
diff --git a/ext/hermes/Makefile.am b/ext/hermes/Makefile.am
index 40d88e8f..15e7c1e8 100644
--- a/ext/hermes/Makefile.am
+++ b/ext/hermes/Makefile.am
@@ -8,10 +8,14 @@ else
 ARCHSRCS =
 endif
 
-libgstcolorspace_la_SOURCES = gstcolorspace.c yuv2yuv.c yuv2rgb.c $(ARCHSRCS)
-libgstcolorspace_la_CFLAGS = $(GST_CFLAGS)
 if USE_HERMES
-libgstcolorspace_la_LIBADD = $(HERMES_LIBS)
+PLUGIN_EXTRA_LIBS = $(HERMES_LIBS)
+else
+PLUGIN_EXTRA_LIBS =
 endif
 
+libgstcolorspace_la_SOURCES = gstcolorspace.c yuv2yuv.c yuv2rgb.c $(ARCHSRCS)
+libgstcolorspace_la_CFLAGS = $(GST_CFLAGS)
+libgstcolorspace_la_LIBADD = $(GST_LIBS) $(PLUGIN_EXTRA_LIBS)
+
 noinst_HEADERS = gstcolorspace.h yuv2rgb.h
diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am
index 5a7dcd10..9f986a48 100644
--- a/ext/ladspa/Makefile.am
+++ b/ext/ladspa/Makefile.am
@@ -4,5 +4,6 @@ plugin_LTLIBRARIES = libgstladspa.la
 
 libgstladspa_la_SOURCES = gstladspa.c search.c load.c
 libgstladspa_la_CFLAGS = $(GST_CFLAGS)
+libgstladspa_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstladspa.h ladspa.h utils.h
diff --git a/ext/sdl/Makefile.am b/ext/sdl/Makefile.am
index 371ac789..0b034478 100644
--- a/ext/sdl/Makefile.am
+++ b/ext/sdl/Makefile.am
@@ -1,11 +1,10 @@
 plugindir = $(libdir)/gst
 
 plugin_LTLIBRARIES = libsdlvideosink.la
-libsdlvideosink_la_SOURCES =  sdlvideosink.c
-
 
+libsdlvideosink_la_SOURCES =  sdlvideosink.c
 ## FIXME I have my doubts about these opti flags
-libsdlvideosink_la_CFLAGS = -ffast-math -finline-functions $(GST_CFLAGS) $(SDL_CFLAGS)
-libsdlvideosink_la_LIBADD = $(SDL_LIBS)
+libsdlvideosink_la_CFLAGS = $(GST_CFLAGS) $(SDL_CFLAGS) -ffast-math -finline-functions
+libsdlvideosink_la_LIBADD = $(GST_LIBS) $(SDL_LIBS)
 
 noinst_HEADERS = sdlvideosink.h
diff --git a/ext/shout/Makefile.am b/ext/shout/Makefile.am
index 762bedd7..da20ef43 100644
--- a/ext/shout/Makefile.am
+++ b/ext/shout/Makefile.am
@@ -4,6 +4,6 @@ plugin_LTLIBRARIES = libgstshout.la
 
 libgstshout_la_SOURCES = gstshout.c 
 libgstshout_la_CFLAGS = $(GST_CFLAGS)
-libgstshout_la_LIBADD = $(SHOUT_LIBS)
+libgstshout_la_LIBADD = $(GST_LIBS) $(SHOUT_LIBS)
 
 noinst_HEADERS = gstshout.h
diff --git a/ext/smoothwave/Makefile.am b/ext/smoothwave/Makefile.am
index e46a9572..d74c4a30 100644
--- a/ext/smoothwave/Makefile.am
+++ b/ext/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