diff options
| author | Arun Raghavan <arun@arunraghavan.net> | 2019-08-05 14:19:27 +0530 |
|---|---|---|
| committer | Arun Raghavan <arun@arunraghavan.net> | 2019-08-05 14:19:27 +0530 |
| commit | 6a1addf35ca7308833371a69a09769607448c657 (patch) | |
| tree | 53412f4ff430dfe77bf44af0f8a5ebeb07e080b1 | |
| parent | f52baffeb51c5ea10cd65adc26be4a206122f6f9 (diff) | |
| download | pulseaudio-6a1addf35ca7308833371a69a09769607448c657.tar.gz | |
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.
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/meson.build | 3 | ||||
| -rw-r--r-- | src/pulsecore/meson.build | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ede970b2b..56f50dc50 100644 --- 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 7cd949962..6ce7261df 100644 --- 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 d8e1975a9..f4cfeb0e2 100644 --- 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', ] |