Browse Source
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>tags/n1.2
Michael Niedermayer
Carl Eugen Hoyos
12 years ago
3 changed files with 3 additions and 3 deletions
Unified View
Diff Options
-
+1 -1libavcodec/Makefile
-
+1 -1libavformat/Makefile
-
+1 -1libswresample/Makefile
+ 1
- 1
libavcodec/Makefile
View File
| @@ -25,7 +25,6 @@ OBJS = allcodecs.o \ | |||||
| fmtconvert.o \ | fmtconvert.o \ | ||||
| imgconvert.o \ | imgconvert.o \ | ||||
| jrevdct.o \ | jrevdct.o \ | ||||
| log2_tab.o \ | |||||
| mathtables.o \ | mathtables.o \ | ||||
| options.o \ | options.o \ | ||||
| parser.o \ | parser.o \ | ||||
| @@ -70,6 +69,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ | |||||
| OBJS-$(CONFIG_RANGECODER) += rangecoder.o | OBJS-$(CONFIG_RANGECODER) += rangecoder.o | ||||
| RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o | RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o | ||||
| OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) | OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) | ||||
| OBJS-$(CONFIG_SHARED) += log2_tab.o | |||||
| OBJS-$(CONFIG_SINEWIN) += sinewin.o | OBJS-$(CONFIG_SINEWIN) += sinewin.o | ||||
| OBJS-$(CONFIG_VAAPI) += vaapi.o | OBJS-$(CONFIG_VAAPI) += vaapi.o | ||||
| OBJS-$(CONFIG_VDPAU) += vdpau.o | OBJS-$(CONFIG_VDPAU) += vdpau.o | ||||
+ 1
- 1
libavformat/Makefile
View File
| @@ -13,7 +13,6 @@ OBJS = allformats.o \ | |||||
| cutils.o \ | cutils.o \ | ||||
| id3v1.o \ | id3v1.o \ | ||||
| id3v2.o \ | id3v2.o \ | ||||
| log2_tab.o \ | |||||
| metadata.o \ | metadata.o \ | ||||
| mux.o \ | mux.o \ | ||||
| options.o \ | options.o \ | ||||
| @@ -48,6 +47,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \ | |||||
| rtpdec_xiph.o \ | rtpdec_xiph.o \ | ||||
| srtp.o | srtp.o | ||||
| OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o | OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o | ||||
| OBJS-$(CONFIG_SHARED) += log2_tab.o | |||||
| # muxers/demuxers | # muxers/demuxers | ||||
| OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o | OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o | ||||
+ 1
- 1
libswresample/Makefile
View File
| @@ -8,11 +8,11 @@ HEADERS = swresample.h \ | |||||
| OBJS = audioconvert.o \ | OBJS = audioconvert.o \ | ||||
| dither.o \ | dither.o \ | ||||
| log2_tab.o \ | |||||
| rematrix.o \ | rematrix.o \ | ||||
| resample.o \ | resample.o \ | ||||
| swresample.o \ | swresample.o \ | ||||
| OBJS-$(CONFIG_LIBSOXR) += soxr_resample.o | OBJS-$(CONFIG_LIBSOXR) += soxr_resample.o | ||||
| OBJS-$(CONFIG_SHARED) += log2_tab.o | |||||
| TESTPROGS = swresample | TESTPROGS = swresample | ||||