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

8 files changed, 15 insertions, 19 deletions

diff --git a/ext/aalib/Makefile.am b/ext/aalib/Makefile.am
index 984b2f31..0b20ad89 100644
--- a/ext/aalib/Makefile.am
+++ b/ext/aalib/Makefile.am
@@ -2,11 +2,8 @@ plugindir = $(libdir)/gst
 
 plugin_LTLIBRARIES = libgstaasink.la
 
-
 libgstaasink_la_SOURCES =  gstaasink.c
-libgstaasink_la_LIBADD = $(AALIB_LIBS)
 libgstaasink_la_CFLAGS =  $(GST_CFLAGS) $(AALIB_CFLAGS)
+libgstaasink_la_LIBADD = $(GST_LIBS) $(AALIB_LIBS)
 
 noinst_HEADERS = gstaasink.h
-
-
diff --git a/ext/dv/Makefile.am b/ext/dv/Makefile.am
index 9801ac0f..23420acb 100644
--- a/ext/dv/Makefile.am
+++ b/ext/dv/Makefile.am
@@ -3,8 +3,8 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstdvdec.la
 
 libgstdvdec_la_SOURCES = gstdvdec.c
-libgstdvdec_la_LIBADD = $(DV_LIBS) 
 libgstdvdec_la_CFLAGS = $(GST_CFLAGS)
+libgstdvdec_la_LIBADD = $(GST_LIBS) $(DV_LIBS) 
 
 noinst_HEADERS = gstdvdec.h
 
diff --git a/ext/esd/Makefile.am b/ext/esd/Makefile.am
index 0e3e92fb..6cd5845a 100644
--- a/ext/esd/Makefile.am
+++ b/ext/esd/Makefile.am
@@ -1,11 +1,10 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libesdsink.la
+plugin_LTLIBRARIES = libesdsink.la
 
 libesdsink_la_SOURCES = esdsink.c
-noinst_HEADERS = esdsink.h
-
-libesdsink_la_CFLAGS = $(ESD_CFLAGS) $(GST_CFLAGS)
-libesdsink_la_LIBADD = $(ESD_LIBS)
+libesdsink_la_CFLAGS = $(GST_CFLAGS) $(ESD_CFLAGS)
+libesdsink_la_LIBADD = $(GST_LIBS) $(ESD_LIBS)
 
+noinst_HEADERS = esdsink.h
 EXTRA_DIST = README
diff --git a/ext/flac/Makefile.am b/ext/flac/Makefile.am
index 6efc3538..fb4db406 100644
--- a/ext/flac/Makefile.am
+++ b/ext/flac/Makefile.am
@@ -3,8 +3,7 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstflac.la
 
 libgstflac_la_SOURCES = gstflac.c gstflacenc.c gstflacdec.c
-
-noinst_HEADERS = gstflacenc.h gstflacdec.h
-
 libgstflac_la_CFLAGS = $(GST_CFLAGS)
 libgstflac_la_LIBADD = $(GST_LIBS) $(FLAC_LIBS) 
+
+noinst_HEADERS = gstflacenc.h gstflacdec.h
diff --git a/ext/jpeg/Makefile.am b/ext/jpeg/Makefile.am
index 8f467686..795a48c4 100644
--- a/ext/jpeg/Makefile.am
+++ b/ext/jpeg/Makefile.am
@@ -3,9 +3,9 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstjpeg.la
 
 libgstjpeg_la_SOURCES = gstjpeg.c gstjpegdec.c gstjpegenc.c
-libgstjpeg_la_LIBADD = $(JPEG_LIBS) 
 libgstjpeg_la_CFLAGS = $(GST_CFLAGS)
 ## FIXME: check these CFLAGS
 ## -O3 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math -DNDEBUG
+libgstjpeg_la_LIBADD = $(GST_LIBS) $(JPEG_LIBS) 
 
 noinst_HEADERS = gstjpegdec.h gstjpegenc.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/mikmod/Makefile.am b/ext/mikmod/Makefile.am
index 0219925f..b7f1985e 100644
--- a/ext/mikmod/Makefile.am
+++ b/ext/mikmod/Makefile.am
@@ -3,9 +3,8 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstmikmod.la
 
 libgstmikmod_la_SOURCES = gstmikmod.c drv_gst.c mikmod_reader.c mikmod_types.c
-
-libgstmikmod_la_LIBADD = $(MIKMOD_LIBS)
-libgstmikmod_la_CFLAGS = $(MIKMOD_CFLAGS) $(GST_CFLAGS)
+libgstmikmod_la_CFLAGS = $(GST_CFLAGS) $(MIKMOD_CFLAGS)
+libgstmikmod_la_LIBADD = $(GST_LIBS) $(MIKMOD_LIBS)
 
 noinst_HEADERS = gstmikmod.h
 
diff --git a/ext/raw1394/Makefile.am b/ext/raw1394/Makefile.am
index af17049b..a16f7c4d 100644
--- a/ext/raw1394/Makefile.am
+++ b/ext/raw1394/Makefile.am
@@ -3,6 +3,7 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgst1394.la
 
 libgst1394_la_SOURCES = gst1394.c gstdv1394src.c
-libgst1394_la_LIBADD = $(raw1394_LIBS) 
+libgst1394_la_CFLAGS = $(GST_CFLAGS)
+libgst1394_la_LIBADD = $(GST_LIBS) $(raw1394_LIBS) 
 
 noinst_HEADERS = gstdv1394src.h