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

[Michael Niedermayer]

On Wed, Jul 01, 2015 at 02:20:08PM -0500, Rodger Combs wrote:
> 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

applied

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

There will always be a question for which you do not know the correct answer.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150701/d7f40374/attachment.asc>