From c190fdf65de80f22b9d549b458d2bb817965095e Mon Sep 17 00:00:00 2001 From: Rodger Combs Date: Wed, 1 Jul 2015 14:20:08 -0500 Subject: [PATCH] lavu: Makefile: skip atomic.c if native atomics are available This prevents a linker warning and skips a useless compilation Signed-off-by: Michael Niedermayer --- libavutil/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/Makefile b/libavutil/Makefile index abfd10f8bd..6fa810e744 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