[FFmpeg-devel] [PATCH] buildsys: only include log2_tab per library for shared builds

[Michael Niedermayer]

This should fix linking failures due to multiple log2_tabs

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavcodec/Makefile    |    2 +-
 libavformat/Makefile   |    2 +-
 libswresample/Makefile |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index f08c83c..82a80f8 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -25,7 +25,6 @@ OBJS = allcodecs.o                                                      \
        fmtconvert.o                                                     \
        imgconvert.o                                                     \
        jrevdct.o                                                        \
-       log2_tab.o                                                       \
        mathtables.o                                                     \
        options.o                                                        \
        parser.o                                                         \
@@ -69,6 +68,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC)            += mpegvideo_enc.o mpeg12data.o  \
 OBJS-$(CONFIG_RANGECODER)              += rangecoder.o
 RDFT-OBJS-$(CONFIG_HARDCODED_TABLES)   += sin_tables.o
 OBJS-$(CONFIG_RDFT)                    += rdft.o $(RDFT-OBJS-yes)
+OBJS-$(CONFIG_SHARED)                  += log2_tab.o
 OBJS-$(CONFIG_SINEWIN)                 += sinewin.o
 OBJS-$(CONFIG_VAAPI)                   += vaapi.o
 OBJS-$(CONFIG_VDPAU)                   += vdpau.o
diff --git a/libavformat/Makefile b/libavformat/Makefile
index ad70c12..10a373f 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -13,7 +13,6 @@ OBJS = allformats.o         \
        cutils.o             \
        id3v1.o              \
        id3v2.o              \
-       log2_tab.o           \
        metadata.o           \
        mux.o                \
        options.o            \
@@ -48,6 +47,7 @@ OBJS-$(CONFIG_RTPDEC)                    += rdt.o                       \
                                             rtpdec_xiph.o               \
                                             srtp.o
 OBJS-$(CONFIG_RTPENC_CHAIN)              += rtpenc_chain.o rtp.o
+OBJS-$(CONFIG_SHARED)                    += log2_tab.o
 
 # muxers/demuxers
 OBJS-$(CONFIG_A64_MUXER)                 += a64.o rawenc.o
diff --git a/libswresample/Makefile b/libswresample/Makefile
index 9d9f10c..0b75bd0 100644
--- a/libswresample/Makefile
+++ b/libswresample/Makefile
@@ -8,11 +8,11 @@ HEADERS = swresample.h                       \
 
 OBJS = audioconvert.o                        \
        dither.o                              \
-       log2_tab.o                            \
        rematrix.o                            \
        resample.o                            \
        swresample.o                          \
 
 OBJS-$(CONFIG_LIBSOXR) += soxr_resample.o
+OBJS-$(CONFIG_SHARED)  += log2_tab.o
 
 TESTPROGS = swresample
-- 
1.7.9.5