diff options
| author | Rodger Combs <rodger.combs@gmail.com> | 2015-07-01 14:20:08 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 21:40:16 +0200 |
| commit | c190fdf65de80f22b9d549b458d2bb817965095e (patch) | |
| tree | 5b9d3280a8242b3ed85c3e7c489fade73afe36a2 | |
| parent | 06a0d5ef5ce3fd9236a9fa0ff0f37ea4107b747d (diff) | |
| download | ffmpeg-c190fdf65de80f22b9d549b458d2bb817965095e.tar.gz | |
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 <michaelni@gmx.at>
| -rw-r--r-- | libavutil/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
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 |