diff options
| author | Stefan Kost <ensonic@users.sourceforge.net> | 2008-11-04 12:49:40 +0000 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sourceforge.net> | 2008-11-04 12:49:40 +0000 |
| commit | 0165bad2a803c193fb252466290e7de8bd808001 (patch) | |
| tree | f7c3301744681b12527c296659b76121c4855540 | |
| parent | 42cf6d213f8c02b5b02c504853c77cb9ed2a0eb0 (diff) | |
ext/: Don't install static libs for plugins. Fixes #550851 for -ffmpeg.
Original commit message from CVS:
* ext/ffmpeg/Makefile.am:
* ext/libpostproc/Makefile.am:
* ext/libswscale/Makefile.am:
Don't install static libs for plugins. Fixes #550851 for -ffmpeg.
| -rw-r--r-- | ChangeLog | 7 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | ext/ffmpeg/Makefile.am | 1 | ||||
| -rw-r--r-- | ext/libpostproc/Makefile.am | 2 | ||||
| -rw-r--r-- | ext/libswscale/Makefile.am | 1 |
5 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2008-11-04 Stefan Kost <ensonic@users.sf.net> + + * ext/ffmpeg/Makefile.am: + * ext/libpostproc/Makefile.am: + * ext/libswscale/Makefile.am: + Don't install static libs for plugins. Fixes #550851 for -ffmpeg. + 2008-10-30 Sebastian Dröge <sebastian.droege@collabora.co.uk> Based on a patch by: Alexis Ballier <aballier at gentoo dot org> diff --git a/common b/common -Subproject 2802bb17517a6cfbbb1be6da61ec19151be0750 +Subproject edfb4b44ea433b0b83b8a2f27a6e0bcbccdc3f2 diff --git a/ext/ffmpeg/Makefile.am b/ext/ffmpeg/Makefile.am index 6a2e969..aa0fba7 100644 --- a/ext/ffmpeg/Makefile.am +++ b/ext/ffmpeg/Makefile.am @@ -17,6 +17,7 @@ libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ $(FFMPEG_CFLAGS) libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS) $(LIBM) $(WIN32_LIBS) -lz -lbz2 libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) +libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static if HAVE_FFMPEG_UNINSTALLED libgstffmpeg_la_DEPENDENCIES = $(FFMPEG_LIBS) diff --git a/ext/libpostproc/Makefile.am b/ext/libpostproc/Makefile.am index b6aded8..80c31c2 100644 --- a/ext/libpostproc/Makefile.am +++ b/ext/libpostproc/Makefile.am @@ -9,3 +9,5 @@ libgstpostproc_la_LIBADD = -lgstvideo-@GST_MAJORMINOR@ \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS) libgstpostproc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) +libgstpostproc_la_LIBTOOLFLAGS = --tag=disable-static + diff --git a/ext/libswscale/Makefile.am b/ext/libswscale/Makefile.am index b06d275..d7204cc 100644 --- a/ext/libswscale/Makefile.am +++ b/ext/libswscale/Makefile.am @@ -9,6 +9,7 @@ libgstffmpegscale_la_LIBADD = $(SWSCALE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) $(LIBOIL_LIBS) $(LIBM) -lz libgstffmpegscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) +libgstffmpegscale_la_LIBTOOLFLAGS = --tag=disable-static if HAVE_FFMPEG_UNINSTALLED libgstffmpegscale_la_DEPENDENCIES = $(SWSCALE_LIBS) |