Permalink
Browse files

buildsys: only include log2_tab per library for shared builds

Fix linking failures with -all_load due to multiple log2_tabs

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
  • Loading branch information...
1 parent 523b12a commit 03148fd1743fca98c2f4b5920b796f381e820045 @michaelni michaelni committed with cehoyos Mar 4, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 libavcodec/Makefile
  2. +1 −1 libavformat/Makefile
  3. +1 −1 libswresample/Makefile
View
@@ -25,7 +25,6 @@ OBJS = allcodecs.o \
fmtconvert.o \
imgconvert.o \
jrevdct.o \
- log2_tab.o \
mathtables.o \
options.o \
parser.o \
@@ -70,6 +69,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
View
@@ -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
View
@@ -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

0 comments on commit 03148fd

Please sign in to comment.