further clean up build

Original commit message from CVS:
further clean up build

diff --git a/common b/common
index 1ae49d1..dd85f55 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 1ae49d1ebbfbf1136842cbdf6505f30d809e9ecc
+Subproject commit dd85f550441bd5722b98f4dd304e40826383240f

diff --git a/ext/alsa/Makefile.am b/ext/alsa/Makefile.am
index 00b18d7..5f1d73d 100644 (file)
--- a/ext/alsa/Makefile.am
+++ b/ext/alsa/Makefile.am
@@ -12,11 +12,12 @@ libgstalsa_la_SOURCES = \
        gstalsa.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
+  $(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)
 
 noinst_HEADERS = \
        gstalsa.h \

diff --git a/ext/cdparanoia/Makefile.am b/ext/cdparanoia/Makefile.am
index 0a74a7a..d23c395 100644 (file)
--- a/ext/cdparanoia/Makefile.am
+++ b/ext/cdparanoia/Makefile.am
@@ -2,13 +2,11 @@ plugin_LTLIBRARIES = libgstcdparanoia.la
 
 libgstcdparanoia_la_SOURCES = gstcdparanoiasrc.c
 libgstcdparanoia_la_CFLAGS = $(GST_CFLAGS)
-libgstcdparanoia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstcdparanoia_la_LIBADD = \
-       $(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la \
-       $(CDPARANOIA_LIBS) \
+       $(top_builddir)/gst-libs/gst/cdda/libgstcdda-$(GST_MAJORMINOR).la \
        $(GST_BASE_LIBS) \
-       $(GST_LIBS)
+       $(GST_LIBS) \
+       $(CDPARANOIA_LIBS)
+libgstcdparanoia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstcdparanoiasrc.h
-
-

diff --git a/ext/gnomevfs/Makefile.am b/ext/gnomevfs/Makefile.am
index 4466b97..6ca9ac2 100644 (file)
--- a/ext/gnomevfs/Makefile.am
+++ b/ext/gnomevfs/Makefile.am
@@ -7,8 +7,8 @@ libgstgnomevfs_la_SOURCES = \
        gstgnomevfsuri.c
 
 libgstgnomevfs_la_CFLAGS = $(GST_CFLAGS) $(GNOME_VFS_CFLAGS)
+libgstgnomevfs_la_LIBADD = $(GST_BASE_LIBS) $(GNOME_VFS_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 ae2cb3b..5a4a87a 100644 (file)
--- a/ext/libvisual/Makefile.am
+++ b/ext/libvisual/Makefile.am
@@ -2,7 +2,5 @@ plugin_LTLIBRARIES = libgstlibvisual.la
 
 libgstlibvisual_la_SOURCES = visual.c 
 libgstlibvisual_la_CFLAGS = $(GST_CFLAGS) $(LIBVISUAL_CFLAGS)
+libgstlibvisual_la_LIBADD = $(GST_BASE_LIBS) $(LIBVISUAL_LIBS)
 libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstlibvisual_la_LIBADD = \
-       $(LIBVISUAL_LIBS) \
-        $(GST_BASE_LIBS)

diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am
index 33b260e..c289301 100644 (file)
--- a/ext/ogg/Makefile.am
+++ b/ext/ogg/Makefile.am
@@ -1,5 +1,3 @@
-plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
-
 plugin_LTLIBRARIES = libgstogg.la
 
 libgstogg_la_SOURCES = \
@@ -10,8 +8,8 @@ libgstogg_la_SOURCES = \
        gstoggparse.c
 
 libgstogg_la_CFLAGS = $(GST_CFLAGS) $(OGG_CFLAGS) 
-libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstogg_la_LIBADD = \
-       $(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/riff/libgstriff-$(GST_MAJORMINOR).la \
        $(GST_BASE_LIBS) \
        $(OGG_LIBS)
+libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/ext/pango/Makefile.am b/ext/pango/Makefile.am
index 5d2fc88..8cb348d 100644 (file)
--- a/ext/pango/Makefile.am
+++ b/ext/pango/Makefile.am
@@ -1,4 +1,3 @@
-
 plugin_LTLIBRARIES = libgstpango.la
 
 noinst_HEADERS = \
@@ -18,11 +17,8 @@ libgstpango_la_CFLAGS = \
        $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS) \
        $(PANGO_CFLAGS)
-
 libgstpango_la_LIBADD = \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(PANGO_LIBS)
-
-libgstpango_la_LDFLAGS = \
-       $(GST_PLUGIN_LDFLAGS)
+libgstpango_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/ext/theora/Makefile.am b/ext/theora/Makefile.am
index 3aed389..92ae7eb 100644 (file)
--- a/ext/theora/Makefile.am
+++ b/ext/theora/Makefile.am
@@ -4,8 +4,8 @@ noinst_HEADERS = gsttheoraenc.h gsttheoradec.h gsttheoraparse.h
 
 libgsttheora_la_SOURCES = theora.c theoraenc.c theoradec.c theoraparse.c
 libgsttheora_la_CFLAGS = $(GST_CFLAGS) $(THEORA_CFLAGS)
-libgsttheora_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsttheora_la_LIBADD = \
-       $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/tag/libgsttag-$(GST_MAJORMINOR).la \
        $(GST_LIBS) \
        $(THEORA_LIBS)
+libgsttheora_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am
index 695024f..ce20372 100644 (file)
--- a/ext/vorbis/Makefile.am
+++ b/ext/vorbis/Makefile.am
@@ -2,14 +2,14 @@ plugin_LTLIBRARIES = libgstvorbis.la
 
 libgstvorbis_la_SOURCES = vorbis.c \
        vorbisdec.c vorbisenc.c vorbisparse.c
-libgstvorbis_la_CFLAGS = $(GST_CFLAGS) $(VORBIS_CFLAGS) 
 
+libgstvorbis_la_CFLAGS = $(GST_CFLAGS) $(VORBIS_CFLAGS) 
 ## AM_PATH_VORBIS also sets VORBISENC_LIBS
-libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvorbis_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \
        $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
        $(GST_LIBS) \
        $(VORBIS_LIBS) $(VORBISENC_LIBS)
+libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = vorbisenc.h vorbisdec.h vorbisparse.h

diff --git a/sys/v4l/Makefile.am b/sys/v4l/Makefile.am
index 878aa73..53c45b0 100644 (file)
--- a/sys/v4l/Makefile.am
+++ b/sys/v4l/Makefile.am
@@ -22,10 +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 \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
        $(GST_BASE_LIBS) $(GST_LIBS) $(xv_libs)
+libgstvideo4linux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 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 4d0d58e..6881de4 100644 (file)
--- a/sys/ximage/Makefile.am
+++ b/sys/ximage/Makefile.am
@@ -1,13 +1,13 @@
 plugin_LTLIBRARIES = libgstximagesink.la
 
 libgstximagesink_la_SOURCES =  ximagesink.c ximage.c
-libgstximagesink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(X_CFLAGS)
-libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstximagesink_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS)
 libgstximagesink_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
        $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
        $(GST_BASE_LIBS) \
        $(X_LIBS) $(XSHM_LIBS)
+libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 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 6889a00..3edddb6 100644 (file)
--- a/sys/xvimage/Makefile.am
+++ b/sys/xvimage/Makefile.am
@@ -1,14 +1,14 @@
 plugin_LTLIBRARIES = libgstxvimagesink.la
 
 libgstxvimagesink_la_SOURCES =  xvimagesink.c 
-libgstxvimagesink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(X_CFLAGS)
-libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstxvimagesink_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS)
 libgstxvimagesink_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
        $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS)
+libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstxvimagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la
 
 noinst_HEADERS = xvimagesink.h