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

diff --git a/ext/alsa/Makefile.am b/ext/alsa/Makefile.am
index 75ff111..75fbdf4 100644 (file)
--- a/ext/alsa/Makefile.am
+++ b/ext/alsa/Makefile.am
@@ -3,11 +3,9 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstalsa.la
 
 libgstalsa_la_SOURCES = gstalsa.c
+libgstalsa_la_CFLAGS = $(GST_CFLAGS) $(ALSA_CFLAGS)
+libgstalsa_la_LIBADD = $(GST_LIBS) $(ALSA_LIBS)
 
 noinst_HEADERS = gstalsa.h
 
-libgstalsa_la_CFLAGS = $(ALSA_CFLAGS) $(GST_CFLAGS)
-libgstalsa_la_LIBADD = $(ALSA_LIBS)
-
 EXTRA_DIST = README
-

diff --git a/ext/cdparanoia/Makefile.am b/ext/cdparanoia/Makefile.am
index 54ec5c7..f5c7e63 100644 (file)
--- a/ext/cdparanoia/Makefile.am
+++ b/ext/cdparanoia/Makefile.am
@@ -3,7 +3,7 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstcdparanoia.la
 
 libgstcdparanoia_la_SOURCES = gstcdparanoia.c
-libgstcdparanoia_la_LIBADD = $(CDPARANOIA_LIBS)
 libgstcdparanoia_la_CFLAGS = $(GST_CFLAGS)
+libgstcdparanoia_la_LIBADD = $(GST_LIBS) $(CDPARANOIA_LIBS)
 
 noinst_HEADERS = gstcdparanoia.h

diff --git a/ext/gnomevfs/Makefile.am b/ext/gnomevfs/Makefile.am
index d436f47..ec91d66 100644 (file)
--- a/ext/gnomevfs/Makefile.am
+++ b/ext/gnomevfs/Makefile.am
@@ -3,11 +3,9 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstgnomevfssrc.la libgstgnomevfssink.la
  
 libgstgnomevfssrc_la_SOURCES = gstgnomevfssrc.c
-libgstgnomevfssink_la_SOURCES = gstgnomevfssink.c
- 
-libgstgnomevfssrc_la_CFLAGS = $(GNOME_VFS_CFLAGS) $(GST_CFLAGS)
-libgstgnomevfssrc_la_LIBADD = $(GNOME_VFS_LIBS) $(GST_LIBS)
-
-libgstgnomevfssink_la_CFLAGS = $(GNOME_VFS_CFLAGS) $(GST_CFLAGS)
-libgstgnomevfssink_la_LIBADD = $(GNOME_VFS_LIBS) $(GST_LIBS)
+libgstgnomevfssrc_la_CFLAGS = $(GST_CFLAGS) $(GNOME_VFS_CFLAGS)
+libgstgnomevfssrc_la_LIBADD = $(GST_LIBS) $(GNOME_VFS_LIBS)
 
+libgstgnomevfssink_la_SOURCES = gstgnomevfssink.c
+libgstgnomevfssink_la_CFLAGS = $(GST_CFLAGS) $(GNOME_VFS_CFLAGS)
+libgstgnomevfssink_la_LIBADD = $(GST_LIBS) $(GNOME_VFS_LIBS)

diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am
index dce857e..7b2f60e 100644 (file)
--- a/ext/vorbis/Makefile.am
+++ b/ext/vorbis/Makefile.am
@@ -3,9 +3,8 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstvorbis.la
 
 libgstvorbis_la_SOURCES = vorbis.c vorbisenc.c vorbisdec.c
-
+libgstvorbis_la_CFLAGS = $(GST_CFLAGS) $(VORBIS_CFLAGS)
 ## AM_PATH_VORBIS also sets VORBISENC_LIBS
-libgstvorbis_la_LIBADD = $(VORBIS_LIBS) $(VORBISENC_LIBS)
-libgstvorbis_la_CFLAGS = $(VORBIS_CFLAGS) $(GST_CFLAGS)
+libgstvorbis_la_LIBADD = $(GST_LIBS) $(VORBIS_LIBS) $(VORBISENC_LIBS)
 
 noinst_HEADERS = vorbisenc.h vorbisdec.h

diff --git a/gst/adder/Makefile.am b/gst/adder/Makefile.am
index d0aef16..336c2ab 100644 (file)
--- a/gst/adder/Makefile.am
+++ b/gst/adder/Makefile.am
@@ -1,8 +1,9 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstadder.la
+plugin_LTLIBRARIES = libgstadder.la
 
 libgstadder_la_SOURCES = gstadder.c
 libgstadder_la_CFLAGS = $(GST_CFLAGS)
+libgstadder_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstadder.h

diff --git a/gst/sine/Makefile.am b/gst/sine/Makefile.am
index 0b31123..8321178 100644 (file)
--- a/gst/sine/Makefile.am
+++ b/gst/sine/Makefile.am
@@ -4,6 +4,7 @@ plugin_LTLIBRARIES = libgstsinesrc.la
 
 libgstsinesrc_la_SOURCES = gstsinesrc.c
 libgstsinesrc_la_CFLAGS = $(GST_CFLAGS)
+libgstsinesrc_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstsinesrc.h
 

diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am
index aac20cf..22c0fed 100644 (file)
--- a/gst/videoscale/Makefile.am
+++ b/gst/videoscale/Makefile.am
@@ -1,6 +1,6 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstvideoscale.la
+plugin_LTLIBRARIES = libgstvideoscale.la
 
 if HAVE_CPU_I386
 ARCHSRCS = \
@@ -15,6 +15,6 @@ libgstvideoscale_la_SOURCES = \
                        videoscale.c \
                        $(ARCHSRCS)
 libgstvideoscale_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS)
+libgstvideoscale_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstvideoscale.h videoscale_x86.h
-

diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am
index 2caed5e..6b310a9 100644 (file)
--- a/gst/volume/Makefile.am
+++ b/gst/volume/Makefile.am
@@ -1,8 +1,9 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstvolume.la
+plugin_LTLIBRARIES = libgstvolume.la
 
 libgstvolume_la_SOURCES = gstvolume.c
 libgstvolume_la_CFLAGS = $(GST_CFLAGS)
+libgstvolume_la_LIBADD = $(GST_LIBS)
 
 noinst_HEADERS = gstvolume.h filter.func

diff --git a/sys/v4l/Makefile.am b/sys/v4l/Makefile.am
index c8d43ed..bdd7090 100644 (file)
--- a/sys/v4l/Makefile.am
+++ b/sys/v4l/Makefile.am
@@ -8,30 +8,35 @@ libv4lelement_la_SOURCES = \
                v4l_calls.c
 libv4lelement_la_CFLAGS = \
                $(GST_CFLAGS)
+libv4lelement_la_LIBADD = \
+               $(GST_LIBS)
 
 libv4lsrc_la_SOURCES = \
                gstv4lsrc.c \
                v4lsrc_calls.c
-libv4lsrc_la_LIBADD = \
-               libv4lelement.la
 libv4lsrc_la_CFLAGS = \
                $(GST_CFLAGS)
+libv4lsrc_la_LIBADD = \
+               $(GST_LIBS) \
+               libv4lelement.la
 
 libv4lmjpegsrc_la_SOURCES = \
                gstv4lmjpegsrc.c \
                v4lmjpegsrc_calls.c
-libv4lmjpegsrc_la_LIBADD = \
-               libv4lelement.la
 libv4lmjpegsrc_la_CFLAGS = \
                $(GST_CFLAGS)
+libv4lmjpegsrc_la_LIBADD = \
+               $(GST_LIBS) \
+               libv4lelement.la
 
 libv4lmjpegsink_la_SOURCES = \
                gstv4lmjpegsink.c \
                v4lmjpegsink_calls.c
-libv4lmjpegsink_la_LIBADD = \
-               libv4lelement.la
 libv4lmjpegsink_la_CFLAGS = \
                $(GST_CFLAGS)
+libv4lmjpegsink_la_LIBADD = \
+               $(GST_LIBS) \
+               libv4lelement.la
 
 noinst_HEADERS = gstv4lelement.h v4l_calls.h \
                gstv4lsrc.h v4lsrc_calls.h \