build-sys: Move svolume-*.c to libpulsecore

The various software volume implementations were being built as part of
libpulsecommon for some reason. These should only ever be used in the
daemon, so they should be in libpulsecore.

diff --git a/src/Makefile.am b/src/Makefile.am
index ede970b..56f50dc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -753,8 +753,6 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
                pulsecore/socket-util.c pulsecore/socket-util.h \
                pulsecore/strbuf.c pulsecore/strbuf.h \
                pulsecore/strlist.c pulsecore/strlist.h \
-               pulsecore/svolume_c.c pulsecore/svolume_arm.c \
-               pulsecore/svolume_mmx.c pulsecore/svolume_sse.c \
                pulsecore/tagstruct.c pulsecore/tagstruct.h \
                pulsecore/time-smoother.c pulsecore/time-smoother.h \
                pulsecore/tokenizer.c pulsecore/tokenizer.h \
@@ -1005,6 +1003,8 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES = \
                pulsecore/resampler/trivial.c \
                pulsecore/rtpoll.c pulsecore/rtpoll.h \
                pulsecore/stream-util.c pulsecore/stream-util.h \
+               pulsecore/svolume_c.c pulsecore/svolume_arm.c \
+               pulsecore/svolume_mmx.c pulsecore/svolume_sse.c \
                pulsecore/mix.c pulsecore/mix.h \
                pulsecore/cpu.c pulsecore/cpu.h \
                pulsecore/cpu-arm.c pulsecore/cpu-arm.h \

diff --git a/src/meson.build b/src/meson.build
index 7cd9499..6ce7261 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -61,15 +61,12 @@ libpulsecommon_sources = [
   'pulsecore/socket-util.c',
   'pulsecore/strbuf.c',
   'pulsecore/strlist.c',
-  'pulsecore/svolume_c.c',
-  'pulsecore/svolume_mmx.c',
   'pulsecore/tagstruct.c',
   'pulsecore/thread-posix.c',
   'pulsecore/time-smoother.c',
   'pulsecore/tokenizer.c',
   'pulsecore/usergroup.c',
   'pulsecore/sndfile-util.c',
-  'pulsecore/svolume_arm.c',
 ]
 
 libpulsecommon_headers = [

diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build
index d8e1975..f4cfeb0 100644 (file)
--- a/src/pulsecore/meson.build
+++ b/src/pulsecore/meson.build
@@ -49,6 +49,10 @@ libpulsecore_sources = [
   'source-output.c',
   'start-child.c',
   'stream-util.c',
+  'svolume_arm.c',
+  'svolume_c.c',
+  'svolume_mmx.c',
+  'svolume_sse.c',
   'thread-mq.c',
 ]