From 2cd4c7e2b9481c95b4869c792612ad3882658525 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 16 Oct 2008 15:07:00 +0000 Subject: [PATCH] Don't install static libs for plugins. Fixes #550851 for base. Original commit message from CVS: * ext/alsa/Makefile.am: * ext/cdparanoia/Makefile.am: * ext/gio/Makefile.am: * ext/gnomevfs/Makefile.am: * ext/libvisual/Makefile.am: * ext/ogg/Makefile.am: * ext/pango/Makefile.am: * ext/theora/Makefile.am: * ext/vorbis/Makefile.am: * gst/adder/Makefile.am: * gst/audioconvert/Makefile.am: * gst/audiorate/Makefile.am: * gst/audioresample/Makefile.am: * gst/audiotestsrc/Makefile.am: * gst/ffmpegcolorspace/Makefile.am: * gst/gdp/Makefile.am: * gst/playback/Makefile.am: * gst/subparse/Makefile.am: * gst/tcp/Makefile.am: * gst/typefind/Makefile.am: * gst/videorate/Makefile.am: * gst/videoscale/Makefile.am: * gst/videotestsrc/Makefile.am: * gst/volume/Makefile.am: * sys/v4l/Makefile.am: * sys/ximage/Makefile.am: * sys/xvimage/Makefile.am: Don't install static libs for plugins. Fixes #550851 for base. --- ChangeLog | 31 +++++++++++++++++++++++++++++++ ext/alsa/Makefile.am | 1 + ext/cdparanoia/Makefile.am | 1 + ext/gio/Makefile.am | 1 + ext/gnomevfs/Makefile.am | 1 + ext/libvisual/Makefile.am | 2 ++ ext/ogg/Makefile.am | 2 ++ ext/pango/Makefile.am | 2 ++ ext/theora/Makefile.am | 2 ++ ext/vorbis/Makefile.am | 1 + gst/adder/Makefile.am | 1 + gst/audioconvert/Makefile.am | 1 + gst/audiorate/Makefile.am | 2 ++ gst/audioresample/Makefile.am | 2 ++ gst/audiotestsrc/Makefile.am | 1 + gst/ffmpegcolorspace/Makefile.am | 1 + gst/gdp/Makefile.am | 1 + gst/playback/Makefile.am | 4 ++++ gst/subparse/Makefile.am | 1 + gst/tcp/Makefile.am | 1 + gst/typefind/Makefile.am | 2 ++ gst/videorate/Makefile.am | 2 ++ gst/videoscale/Makefile.am | 1 + gst/videotestsrc/Makefile.am | 1 + gst/volume/Makefile.am | 1 + sys/v4l/Makefile.am | 1 + sys/ximage/Makefile.am | 1 + sys/xvimage/Makefile.am | 1 + 28 files changed, 69 insertions(+) diff --git a/ChangeLog b/ChangeLog index ad48e12..1b87b53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2008-10-16 Stefan Kost + + * ext/alsa/Makefile.am: + * ext/cdparanoia/Makefile.am: + * ext/gio/Makefile.am: + * ext/gnomevfs/Makefile.am: + * ext/libvisual/Makefile.am: + * ext/ogg/Makefile.am: + * ext/pango/Makefile.am: + * ext/theora/Makefile.am: + * ext/vorbis/Makefile.am: + * gst/adder/Makefile.am: + * gst/audioconvert/Makefile.am: + * gst/audiorate/Makefile.am: + * gst/audioresample/Makefile.am: + * gst/audiotestsrc/Makefile.am: + * gst/ffmpegcolorspace/Makefile.am: + * gst/gdp/Makefile.am: + * gst/playback/Makefile.am: + * gst/subparse/Makefile.am: + * gst/tcp/Makefile.am: + * gst/typefind/Makefile.am: + * gst/videorate/Makefile.am: + * gst/videoscale/Makefile.am: + * gst/videotestsrc/Makefile.am: + * gst/volume/Makefile.am: + * sys/v4l/Makefile.am: + * sys/ximage/Makefile.am: + * sys/xvimage/Makefile.am: + Don't install static libs for plugins. Fixes #550851 for base. + 2008-10-16 Wim Taymans * gst/audiotestsrc/gstaudiotestsrc.c: (gst_audio_test_src_init): diff --git a/ext/alsa/Makefile.am b/ext/alsa/Makefile.am index 1b87fe9..38cde48 100644 --- a/ext/alsa/Makefile.am +++ b/ext/alsa/Makefile.am @@ -23,6 +23,7 @@ libgstalsa_la_LIBADD = \ $(ALSA_LIBS) libgstalsa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstalsa_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstalsa.h \ diff --git a/ext/cdparanoia/Makefile.am b/ext/cdparanoia/Makefile.am index 48b6728..aef3581 100644 --- a/ext/cdparanoia/Makefile.am +++ b/ext/cdparanoia/Makefile.am @@ -8,5 +8,6 @@ libgstcdparanoia_la_LIBADD = \ $(GST_LIBS) \ $(CDPARANOIA_LIBS) libgstcdparanoia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstcdparanoia_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstcdparanoiasrc.h diff --git a/ext/gio/Makefile.am b/ext/gio/Makefile.am index cb864a1..6425110 100644 --- a/ext/gio/Makefile.am +++ b/ext/gio/Makefile.am @@ -15,6 +15,7 @@ libgstgio_la_SOURCES = \ libgstgio_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GIO_CFLAGS) libgstgio_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GIO_LIBS) libgstgio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GIO_LDFLAGS) +libgstgio_la_LIBTOOLFLAGS = --tag=disable-static # headers we need but don't want installed noinst_HEADERS = \ diff --git a/ext/gnomevfs/Makefile.am b/ext/gnomevfs/Makefile.am index 626c47d..f87a94b 100644 --- a/ext/gnomevfs/Makefile.am +++ b/ext/gnomevfs/Makefile.am @@ -12,6 +12,7 @@ libgstgnomevfs_la_LIBADD = \ $(top_builddir)/gst-libs/gst/tag/libgsttag-$(GST_MAJORMINOR).la \ $(GST_BASE_LIBS) $(GNOME_VFS_LIBS) libgstgnomevfs_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstgnomevfs_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstgnomevfs.h \ diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am index d2b5ca8..d5d0213 100644 --- a/ext/libvisual/Makefile.am +++ b/ext/libvisual/Makefile.am @@ -4,3 +4,5 @@ libgstlibvisual_la_SOURCES = visual.c libgstlibvisual_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBVISUAL_CFLAGS) libgstlibvisual_la_LIBADD = $(GST_BASE_LIBS) $(LIBVISUAL_LIBS) libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstlibvisual_la_LIBTOOLFLAGS = --tag=disable-static + diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am index 61f3519..dbb050c 100644 --- a/ext/ogg/Makefile.am +++ b/ext/ogg/Makefile.am @@ -18,3 +18,5 @@ libgstogg_la_LIBADD = \ $(GST_BASE_LIBS) \ $(OGG_LIBS) libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstogg_la_LIBTOOLFLAGS = --tag=disable-static + diff --git a/ext/pango/Makefile.am b/ext/pango/Makefile.am index cc81beb..197ed33 100644 --- a/ext/pango/Makefile.am +++ b/ext/pango/Makefile.am @@ -24,3 +24,5 @@ libgstpango_la_LIBADD = \ $(GST_LIBS) \ $(PANGO_LIBS) libgstpango_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstpango_la_LIBTOOLFLAGS = --tag=disable-static + diff --git a/ext/theora/Makefile.am b/ext/theora/Makefile.am index 23b0efd..434f267 100644 --- a/ext/theora/Makefile.am +++ b/ext/theora/Makefile.am @@ -9,3 +9,5 @@ libgsttheora_la_LIBADD = \ $(GST_LIBS) \ $(THEORA_LIBS) libgsttheora_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgsttheora_la_LIBTOOLFLAGS = --tag=disable-static + diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am index 64b16a7..21355f2 100644 --- a/ext/vorbis/Makefile.am +++ b/ext/vorbis/Makefile.am @@ -11,5 +11,6 @@ libgstvorbis_la_LIBADD = \ $(GST_LIBS) \ $(VORBIS_LIBS) $(VORBISENC_LIBS) libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstvorbis_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = vorbisenc.h vorbisdec.h vorbisparse.h vorbistag.h diff --git a/gst/adder/Makefile.am b/gst/adder/Makefile.am index 12393c7..de878c9 100644 --- a/gst/adder/Makefile.am +++ b/gst/adder/Makefile.am @@ -4,5 +4,6 @@ libgstadder_la_SOURCES = gstadder.c libgstadder_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstadder_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) +libgstadder_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstadder.h diff --git a/gst/audioconvert/Makefile.am b/gst/audioconvert/Makefile.am index 9b61520..94978bb 100644 --- a/gst/audioconvert/Makefile.am +++ b/gst/audioconvert/Makefile.am @@ -12,6 +12,7 @@ libgstaudioconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudioconvert_la_LIBADD = \ $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) +libgstaudioconvert_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstaudioconvert.h \ diff --git a/gst/audiorate/Makefile.am b/gst/audiorate/Makefile.am index df92648..212bd18 100644 --- a/gst/audiorate/Makefile.am +++ b/gst/audiorate/Makefile.am @@ -4,3 +4,5 @@ libgstaudiorate_la_SOURCES = gstaudiorate.c libgstaudiorate_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstaudiorate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudiorate_la_LIBADD = $(GST_LIBS) +libgstaudiorate_la_LIBTOOLFLAGS = --tag=disable-static + diff --git a/gst/audioresample/Makefile.am b/gst/audioresample/Makefile.am index f9c4c52..cacde0f 100644 --- a/gst/audioresample/Makefile.am +++ b/gst/audioresample/Makefile.am @@ -19,3 +19,5 @@ libgstaudioresample_la_SOURCES = gstaudioresample.c $(resample_SOURCES) libgstaudioresample_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS) libgstaudioresample_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS) libgstaudioresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstaudioresample_la_LIBTOOLFLAGS = --tag=disable-static + diff --git a/gst/audiotestsrc/Makefile.am b/gst/audiotestsrc/Makefile.am index d419f7b..af7564d 100644 --- a/gst/audiotestsrc/Makefile.am +++ b/gst/audiotestsrc/Makefile.am @@ -4,5 +4,6 @@ libgstaudiotestsrc_la_SOURCES = gstaudiotestsrc.c libgstaudiotestsrc_la_CFLAGS = $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS) libgstaudiotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudiotestsrc_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_CONTROLLER_LIBS) $(LIBM) +libgstaudiotestsrc_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstaudiotestsrc.h diff --git a/gst/ffmpegcolorspace/Makefile.am b/gst/ffmpegcolorspace/Makefile.am index bb4fceb..2893fc4 100644 --- a/gst/ffmpegcolorspace/Makefile.am +++ b/gst/ffmpegcolorspace/Makefile.am @@ -12,6 +12,7 @@ libgstffmpegcolorspace_la_SOURCES = \ libgstffmpegcolorspace_la_CFLAGS = $(GST_CFLAGS) libgstffmpegcolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstffmpegcolorspace_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) +libgstffmpegcolorspace_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstffmpegcolorspace.h \ diff --git a/gst/gdp/Makefile.am b/gst/gdp/Makefile.am index 260ce80..b42a955 100644 --- a/gst/gdp/Makefile.am +++ b/gst/gdp/Makefile.am @@ -8,6 +8,7 @@ libgstgdp_la_SOURCES = \ libgstgdp_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstgdp_la_LIBADD = $(GST_BASE_LIBS) $(GST_GDP_LIBS) libgstgdp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstgdp_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstgdppay.h \ diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am index 2b8525c..f4e4b6a 100644 --- a/gst/playback/Makefile.am +++ b/gst/playback/Makefile.am @@ -27,6 +27,7 @@ libgstplaybin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstplaybin_la_LIBADD = \ $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ $(GST_LIBS) +libgstplaybin_la_LIBTOOLFLAGS = --tag=disable-static libgstdecodebin_la_SOURCES = gstdecodebin.c nodist_libgstdecodebin_la_SOURCES = $(built_sources) @@ -35,6 +36,7 @@ libgstdecodebin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdecodebin_la_LIBADD = \ $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ $(GST_LIBS) +libgstdecodebin_la_LIBTOOLFLAGS = --tag=disable-static libgstdecodebin2_la_SOURCES = gstdecodebin2.c gsturidecodebin.c gstfactorylists.c gstplay-enum.c nodist_libgstdecodebin2_la_SOURCES = $(built_sources) @@ -43,12 +45,14 @@ libgstdecodebin2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdecodebin2_la_LIBADD = \ $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ $(GST_LIBS) +libgstdecodebin2_la_LIBTOOLFLAGS = --tag=disable-static libgstqueue2_la_SOURCES = gstqueue2.c nodist_libgstqueue2_la_SOURCES = $(built_sources) libgstqueue2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstqueue2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstqueue2_la_LIBADD = $(GST_LIBS) +libgstqueue2_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstplaybasebin.h \ diff --git a/gst/subparse/Makefile.am b/gst/subparse/Makefile.am index e958242..1227c26 100644 --- a/gst/subparse/Makefile.am +++ b/gst/subparse/Makefile.am @@ -20,6 +20,7 @@ libgstsubparse_la_SOURCES = \ libgstsubparse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgstsubparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstsubparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) +libgstsubparse_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstssaparse.h \ diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am index 09a566e..5effb07 100644 --- a/gst/tcp/Makefile.am +++ b/gst/tcp/Makefile.am @@ -26,6 +26,7 @@ nodist_libgsttcp_la_SOURCES = \ libgsttcp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -DGST_ENABLE_NEW libgsttcp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgsttcp_la_LIBADD = $(GST_BASE_LIBS) $(GST_GDP_LIBS) $(GST_LIBS) +libgsttcp_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gsttcpplugin.h \ diff --git a/gst/typefind/Makefile.am b/gst/typefind/Makefile.am index 7f63b06..28891df 100644 --- a/gst/typefind/Makefile.am +++ b/gst/typefind/Makefile.am @@ -4,3 +4,5 @@ libgsttypefindfunctions_la_SOURCES = gsttypefindfunctions.c libgsttypefindfunctions_la_CFLAGS = $(GST_CFLAGS) libgsttypefindfunctions_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgsttypefindfunctions_la_LIBADD = $(GST_LIBS) +libgsttypefindfunctions_la_LIBTOOLFLAGS = --tag=disable-static + diff --git a/gst/videorate/Makefile.am b/gst/videorate/Makefile.am index d49831b..8dd9d78 100644 --- a/gst/videorate/Makefile.am +++ b/gst/videorate/Makefile.am @@ -6,3 +6,5 @@ libgstvideorate_la_SOURCES = gstvideorate.c libgstvideorate_la_CFLAGS = $(GST_CFLAGS) libgstvideorate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideorate_la_LIBADD = $(GST_LIBS) +libgstvideorate_la_LIBTOOLFLAGS = --tag=disable-static + diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am index 10a62bb..359e238 100644 --- a/gst/videoscale/Makefile.am +++ b/gst/videoscale/Makefile.am @@ -11,6 +11,7 @@ libgstvideoscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideoscale_la_LIBADD = \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS) +libgstvideoscale_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstvideoscale.h \ diff --git a/gst/videotestsrc/Makefile.am b/gst/videotestsrc/Makefile.am index eb79fee..9403a11 100644 --- a/gst/videotestsrc/Makefile.am +++ b/gst/videotestsrc/Makefile.am @@ -7,5 +7,6 @@ libgstvideotestsrc_la_SOURCES = \ libgstvideotestsrc_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS) libgstvideotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideotestsrc_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS) +libgstvideotestsrc_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstvideotestsrc.h videotestsrc.h diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am index 43b6ec9..393b2ef 100644 --- a/gst/volume/Makefile.am +++ b/gst/volume/Makefile.am @@ -10,6 +10,7 @@ libgstvolume_la_LIBADD = \ $(GST_CONTROLLER_LIBS) \ $(GST_LIBS) \ $(LIBOIL_LIBS) +libgstvolume_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstvolume.h diff --git a/sys/v4l/Makefile.am b/sys/v4l/Makefile.am index 0fc783d..fc10694 100644 --- a/sys/v4l/Makefile.am +++ b/sys/v4l/Makefile.am @@ -27,6 +27,7 @@ libgstvideo4linux_la_LIBADD = \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(GST_BASE_LIBS) $(GST_LIBS) $(xv_libs) libgstvideo4linux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstvideo4linux_la_LIBTOOLFLAGS = --tag=disable-static 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 01280fc..69f9bbc 100644 --- a/sys/ximage/Makefile.am +++ b/sys/ximage/Makefile.am @@ -9,5 +9,6 @@ libgstximagesink_la_LIBADD = \ $(X_LIBS) $(XSHM_LIBS) libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstximagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la +libgstximagesink_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = ximagesink.h diff --git a/sys/xvimage/Makefile.am b/sys/xvimage/Makefile.am index f36dc8e..fbff4d8 100644 --- a/sys/xvimage/Makefile.am +++ b/sys/xvimage/Makefile.am @@ -10,5 +10,6 @@ libgstxvimagesink_la_LIBADD = \ $(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS) $(LIBM) libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstxvimagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la +libgstxvimagesink_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = xvimagesink.h -- 2.7.4