[FFmpeg-devel] [PATCH] lavu: Makefile: skip atomic.c if native atomics are available

Rodger Combs rodger.combs at gmail.com
Wed Jul 1 21:20:08 CEST 2015


This prevents a linker warning and skips a useless compilation
---
 libavutil/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavutil/Makefile b/libavutil/Makefile
index abfd10f..6fa810e 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -78,7 +78,6 @@ BUILT_HEADERS = avconfig.h                                              \
 
 OBJS = adler32.o                                                        \
        aes.o                                                            \
-       atomic.o                                                         \
        audio_fifo.o                                                     \
        avstring.o                                                       \
        base64.o                                                         \
@@ -137,6 +136,8 @@ OBJS = adler32.o                                                        \
        xga_font_data.o                                                  \
        xtea.o                                                           \
 
+OBJS-$(!HAVE_ATOMICS_NATIVE)            += atomic.o                     \
+
 OBJS-$(CONFIG_LZO)                      += lzo.o
 OBJS-$(CONFIG_OPENCL)                   += opencl.o opencl_internal.o
 
-- 
2.4.1



More information about the ffmpeg-devel mailing list