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/a52dec/Makefile.am b/ext/a52dec/Makefile.am
index 24baaac..148af79 100644 (file)
--- a/ext/a52dec/Makefile.am
+++ b/ext/a52dec/Makefile.am
@@ -1,12 +1,6 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgsta52dec.la
-
-libgsta52dec_la_SOURCES = gsta52dec.c
-libgsta52dec_la_LIBADD = -la52 -lm
-libgsta52dec_la_CFLAGS = -O3 $(ARCHFLAGS) $(FOMIT_FRAME_POINTER) $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
-
-noinst_HEADERS = gsta52dec.h
+plugin_LTLIBRARIES = libgsta52dec.la
 
 if HAVE_CPU_I386
 ARCHFLAGS = -m486
@@ -14,3 +8,8 @@ else
 ARCHFLAGS = 
 endif
 
+libgsta52dec_la_SOURCES = gsta52dec.c
+libgsta52dec_la_CFLAGS = $(GST_CFLAGS) -O3 $(ARCHFLAGS) $(FOMIT_FRAME_POINTER)
+libgsta52dec_la_LIBADD = $(GST_LIBS) -la52 -lm
+
+noinst_HEADERS = gsta52dec.h

diff --git a/ext/dvdread/Makefile.am b/ext/dvdread/Makefile.am
index c6d99b7..85a4256 100644 (file)
--- a/ext/dvdread/Makefile.am
+++ b/ext/dvdread/Makefile.am
@@ -6,8 +6,8 @@ plugin_LTLIBRARIES = libdvdsrc.la
 ## AM_CFLAGS = -D_LARGEFILE64_SOURCE $(LIBDVDREADCFLAGS)
 
 libdvdsrc_la_SOURCES = dvdsrc.c
-libdvdsrc_la_LDFLAGS = $(DVDREAD_LIBS)
 libdvdsrc_la_CFLAGS = $(GST_CFLAGS)
+libdvdsrc_la_LIBADD = $(GST_LIBS) $(DVDREAD_LIBS)
 
 noinst_HEADERS = dvdsrc.h
 
@@ -19,6 +19,4 @@ noinst_HEADERS = dvdsrc.h
 #demo_play_CFLAGS  = $(GST_CFLAGS) $(GNOME_CFLAGS)
 #demo_play_LDFLAGS = $(GST_LIBS) $(GNOME_LIBS)
 
-#EXTRA_DIST = README
-
-EXTRA_DIST = demo-play.c README
\ No newline at end of file
+EXTRA_DIST = demo-play.c README

diff --git a/ext/lame/Makefile.am b/ext/lame/Makefile.am
index 53501c9..0b09dff 100644 (file)
--- a/ext/lame/Makefile.am
+++ b/ext/lame/Makefile.am
@@ -3,8 +3,7 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstlame.la
 
 libgstlame_la_SOURCES = gstlame.c
-
-libgstlame_la_LIBADD = $(LAME_LIBS)
 libgstlame_la_CFLAGS = $(GST_CFLAGS)
+libgstlame_la_LIBADD = $(GST_LIBS) $(LAME_LIBS)
 
 noinst_HEADERS = gstlame.h

diff --git a/ext/mad/Makefile.am b/ext/mad/Makefile.am
index 608312d..d0d2e23 100644 (file)
--- a/ext/mad/Makefile.am
+++ b/ext/mad/Makefile.am
@@ -3,8 +3,7 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstmad.la
 
 libgstmad_la_SOURCES = gstmad.c        
-
 libgstmad_la_CFLAGS = $(GST_CFLAGS)
-libgstmad_la_LIBADD = $(MAD_LIBS) 
+libgstmad_la_LIBADD = $(GST_LIBS) $(MAD_LIBS) 
 
 noinst_HEADERS = gstmad.h

diff --git a/ext/mpeg2dec/Makefile.am b/ext/mpeg2dec/Makefile.am
index ca50757..e6b2b7c 100644 (file)
--- a/ext/mpeg2dec/Makefile.am
+++ b/ext/mpeg2dec/Makefile.am
@@ -1,6 +1,6 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstmpeg2dec.la
+plugin_LTLIBRARIES = libgstmpeg2dec.la
 
 if HAVE_CPU_I386
 ARCHFLAGS = -m486
@@ -9,13 +9,13 @@ ARCHFLAGS =
 endif
 
 libgstmpeg2dec_la_SOURCES = gstmpeg2dec.c
-libgstmpeg2dec_la_LIBADD = -lmpeg2 -lmpeg2dec
 libgstmpeg2dec_la_CFLAGS = $(GST_CFLAGS) -O3 $(ARCHFLAGS) $(FOMIT_FRAME_POINTER) -ffast-math
+libgstmpeg2dec_la_LIBADD = $(GST_LIBS) -lmpeg2 -lmpeg2dec
 
 #
 # Use the following if you use mpeg2dec from CVS
 #
-#libgstmpeg2dec_la_LIBADD = -lmpeg2 -lcpuaccel
+#libgstmpeg2dec_la_LIBADD = $(GST_LIBS) -lmpeg2 -lcpuaccel
 
 noinst_HEADERS = gstmpeg2dec.h
 
@@ -27,4 +27,3 @@ noinst_HEADERS = gstmpeg2dec.h
 
 #CFLAGS += -pg -Wall -fprofile-arcs -ftest-coverage
 #CFLAGS += -pg -Wall -O3
-

diff --git a/ext/sidplay/Makefile.am b/ext/sidplay/Makefile.am
index b4cea3b..cb9e71a 100644 (file)
--- a/ext/sidplay/Makefile.am
+++ b/ext/sidplay/Makefile.am
@@ -3,8 +3,7 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstsid.la
 
 libgstsid_la_SOURCES = gstsiddec.cc
+libgstsid_la_CXXFLAGS = $(GST_CFLAGS) $(SIDPLAY_CFLAGS)
+libgstsid_la_LIBADD = $(GST_LIBS) $(SIDPLAY_LIBS) 
 
 noinst_HEADERS = gstsiddec.h
-libgstsid_la_CXXFLAGS = $(SIDPLAY_CFLAGS) $(GST_CFLAGS)
-
-libgstsid_la_LIBADD = $(SIDPLAY_LIBS) 

diff --git a/gst/ac3parse/Makefile.am b/gst/ac3parse/Makefile.am
index 169adec..ba875bb 100644 (file)
--- a/gst/ac3parse/Makefile.am
+++ b/gst/ac3parse/Makefile.am
@@ -1,11 +1,12 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstac3parse.la
+plugin_LTLIBRARIES = libgstac3parse.la
 
 libgstac3parse_la_SOURCES = gstac3parse.c
 
 noinst_HEADERS = gstac3parse.h
 
 libgstac3parse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS)
+libgstac3parse_la_LIBADD = $(GST_LIBS)
 
 EXTRA_DIST = README

diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am
index 4823c99..e1c938f 100644 (file)
--- 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/synaesthesia/Makefile.am b/gst/synaesthesia/Makefile.am
index 20e26b4..8332752 100644 (file)
--- a/gst/synaesthesia/Makefile.am
+++ b/gst/synaesthesia/Makefile.am
@@ -1,10 +1,10 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstsynaesthesia.la
+plugin_LTLIBRARIES = libgstsynaesthesia.la
 
 libgstsynaesthesia_la_SOURCES = core.c gstsynaesthesia.c
 libgstsynaesthesia_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS)
-libgstsynaesthesia_la_LIBADD = $(GTK_LIBS)
+libgstsynaesthesia_la_LIBADD = $(GST_LIBS) $(GTK_LIBS)
 
 noinst_HEADERS = core.h gstsynaesthesia.h