From a1b2ad276b6bfbd63c932699320f0e9798e86977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sun, 6 Dec 2015 11:46:07 +0000 Subject: [PATCH] build: avoid adding assembler source code conditionally MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead, create an extra library and link that one in conditionally. This simplifies compiler language selection for the library. close #15395 Signed-off-by: Diego Elio Pettenò Signed-off-by: Thomas Guillem --- 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 c04b25ce43..da23f7e080 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 -- GitLab