[vlc-devel] [PATCH] build: avoid adding assembler source code conditionally.

[Thomas Guillem]

On Sun, Dec 6, 2015, at 12:46, Diego Elio Pettenò wrote:
> Instead, create an extra library and link that one in conditionally. This
> simplifies compiler language selection for the library.
> 
> close #15395

Merged, thanks!

> 
> Signed-off-by: Diego Elio Pettenò <flameeyes at flameeyes.eu>
> ---
>  modules/audio_filter/Makefile.am | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/modules/audio_filter/Makefile.am
> b/modules/audio_filter/Makefile.am
> index c04b25c..da23f7e 100644
> --- a/modules/audio_filter/Makefile.am
> +++ b/modules/audio_filter/Makefile.am
> @@ -57,8 +57,13 @@ libtrivial_channel_mixer_plugin_la_SOURCES = \
>  libsimple_channel_mixer_plugin_la_SOURCES = \
>  	audio_filter/channel_mixer/simple.c
>  libsimple_channel_mixer_plugin_la_CFLAGS =
> +libsimple_channel_mixer_plugin_la_LIBADD =
> +
>  if HAVE_NEON
> -libsimple_channel_mixer_plugin_la_SOURCES +=
> arm_neon/simple_channel_mixer.S
> +EXTRA_LTLIBRARIES += libsimple_channel_mixer_plugin_arm_neon.la
> +libsimple_channel_mixer_plugin_arm_neon_la_SOURCES =
> arm_neon/simple_channel_mixer.S
> +
> +libsimple_channel_mixer_plugin_la_LIBADD +=
> libsimple_channel_mixer_plugin_arm_neon.la
>  libsimple_channel_mixer_plugin_la_CFLAGS += -DCAN_COMPILE_ARM
>  endif
>  
> -- 
> 2.4.10
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel