From 31c54a6644d247706744c447ee60fc5558d4bf59 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 11 Jun 2006 14:08:54 +0000 Subject: [PATCH] further clean up build Original commit message from CVS: further clean up build --- common | 2 +- ext/alsa/Makefile.am | 7 ++++--- ext/cdparanoia/Makefile.am | 10 ++++------ ext/gnomevfs/Makefile.am | 2 +- ext/libvisual/Makefile.am | 4 +--- ext/ogg/Makefile.am | 6 ++---- ext/pango/Makefile.am | 6 +----- ext/theora/Makefile.am | 4 ++-- ext/vorbis/Makefile.am | 4 ++-- sys/v4l/Makefile.am | 4 ++-- sys/ximage/Makefile.am | 4 ++-- sys/xvimage/Makefile.am | 4 ++-- 12 files changed, 24 insertions(+), 33 deletions(-) diff --git a/common b/common index 1ae49d1ebb..dd85f55044 160000 --- 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 00b18d761f..5f1d73d695 100644 --- 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 0a74a7ae42..d23c39522e 100644 --- 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 4466b971d9..6ca9ac2ff7 100644 --- 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 ae2cb3b191..5a4a87ad08 100644 --- 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 33b260e850..c28930148c 100644 --- 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 5d2fc880eb..8cb348dcc9 100644 --- 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 3aed389e48..92ae7eb1c2 100644 --- 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 695024f2fb..ce2037270d 100644 --- 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 878aa73477..53c45b0ba0 100644 --- 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 4d0d58edd7..6881de421a 100644 --- 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 6889a006ab..3edddb69cb 100644 --- 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