From 61cc3529025f81b8f8308993b6f977683bfdc0b0 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Thu, 10 Nov 2011 15:13:34 +0200 Subject: [PATCH] mimic, opencv, vp8, acmmp3dec, linsys: Don't build static plugins Pass --tag=disable-static to libtool everywhere where it's been forgotten https://bugzilla.gnome.org/show_bug.cgi?id=663768 --- ext/mimic/Makefile.am | 1 + ext/opencv/Makefile.am | 1 + ext/vp8/Makefile.am | 1 + sys/acmmp3dec/Makefile.am | 2 +- sys/linsys/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ext/mimic/Makefile.am b/ext/mimic/Makefile.am index 7cf08e468a..b16741449e 100644 --- a/ext/mimic/Makefile.am +++ b/ext/mimic/Makefile.am @@ -5,5 +5,6 @@ libgstmimic_la_SOURCES = gstmimic.c gstmimdec.c gstmimenc.c libgstmimic_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(MIMIC_CFLAGS) libgstmimic_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(MIMIC_LIBS) libgstmimic_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstmimic_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstmimdec.h gstmimenc.h diff --git a/ext/opencv/Makefile.am b/ext/opencv/Makefile.am index a32e16cfa2..d466bbb0b5 100644 --- a/ext/opencv/Makefile.am +++ b/ext/opencv/Makefile.am @@ -36,6 +36,7 @@ libgstopencv_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(OPENCV_LIBS) \ $(GSTPB_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) libgstopencv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstopencv_la_LIBTOOLFLAGS = --tag=disable-static # headers we need but don't want installed noinst_HEADERS = gstopencvvideofilter.h gstopencvutils.h \ diff --git a/ext/vp8/Makefile.am b/ext/vp8/Makefile.am index 474b3cec4e..d839666fda 100644 --- a/ext/vp8/Makefile.am +++ b/ext/vp8/Makefile.am @@ -18,6 +18,7 @@ libgstvp8_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ -lgstvideo-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(VPX_LIBS) libgstvp8_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstvp8_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstvp8dec.h \ diff --git a/sys/acmmp3dec/Makefile.am b/sys/acmmp3dec/Makefile.am index 27c895c545..f927c7233c 100644 --- a/sys/acmmp3dec/Makefile.am +++ b/sys/acmmp3dec/Makefile.am @@ -11,4 +11,4 @@ libgstacmmp3dec_la_LIBADD = \ -lgsttag-$(GST_MAJORMINOR) \ -lmsacm32 libgstacmmp3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS) - +libgstacmmp3dec_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/linsys/Makefile.am b/sys/linsys/Makefile.am index 3362738746..ac7eed003f 100644 --- a/sys/linsys/Makefile.am +++ b/sys/linsys/Makefile.am @@ -23,4 +23,4 @@ libgstlinsys_la_CFLAGS = \ libgstlinsys_la_LDFLAGS = \ $(GST_PLUGIN_LDFLAGS) libgstlinsys_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) - +libgstlinsys_la_LIBTOOLFLAGS = --tag=disable-static