Merge commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751'

[ffmpeg] / libavutil / Makefile

diff --git a/libavutil/Makefile b/libavutil/Makefile
index abfd10f8bd43e5f8ca2e59fe27f94a9202d1a5e5..6fa810e7446ef9abd27fed849162b20d5dafa808 100644 (file)
--- 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