mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-10-29 05:40:23 -04:00
build-sys: meson: change daemon-only to client
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/659>
This commit is contained in:
parent
4cf4a1fd5b
commit
6928714b64
7 changed files with 16 additions and 16 deletions
|
|
@ -14,7 +14,7 @@ if get_option('daemon')
|
||||||
]
|
]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if not get_option('daemon-only')
|
if get_option('client')
|
||||||
manpages += [
|
manpages += [
|
||||||
['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
|
['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
|
||||||
['pactl', '1'],
|
['pactl', '1'],
|
||||||
|
|
|
||||||
14
meson.build
14
meson.build
|
|
@ -820,18 +820,18 @@ check_dep = dependency('check', version : '>= 0.9.10', required : get_option('te
|
||||||
if get_option('doxygen')
|
if get_option('doxygen')
|
||||||
subdir('doxygen')
|
subdir('doxygen')
|
||||||
endif
|
endif
|
||||||
if not get_option('daemon-only')
|
if get_option('client')
|
||||||
subdir('po')
|
subdir('po')
|
||||||
endif
|
endif
|
||||||
if get_option('man')
|
if get_option('man')
|
||||||
subdir('man')
|
subdir('man')
|
||||||
endif
|
endif
|
||||||
subdir('shell-completion/bash')
|
subdir('shell-completion/bash')
|
||||||
if not get_option('daemon-only')
|
if get_option('client')
|
||||||
subdir('shell-completion/zsh')
|
subdir('shell-completion/zsh')
|
||||||
endif
|
endif
|
||||||
subdir('src')
|
subdir('src')
|
||||||
if not get_option('daemon-only')
|
if get_option('client')
|
||||||
subdir('vala')
|
subdir('vala')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
@ -840,7 +840,7 @@ configure_file(output : 'config.h', configuration : cdata)
|
||||||
|
|
||||||
# pkg-config files
|
# pkg-config files
|
||||||
|
|
||||||
if not get_option('daemon-only')
|
if get_option('client')
|
||||||
|
|
||||||
pc_cdata = configuration_data()
|
pc_cdata = configuration_data()
|
||||||
|
|
||||||
|
|
@ -874,11 +874,11 @@ foreach file : pc_files
|
||||||
install_dir : pkgconfigdir)
|
install_dir : pkgconfigdir)
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
endif # !daemon-only
|
endif # client
|
||||||
|
|
||||||
# CMake files
|
# CMake files
|
||||||
|
|
||||||
if not get_option('daemon-only')
|
if get_option('client')
|
||||||
|
|
||||||
m4 = find_program('m4', required: true)
|
m4 = find_program('m4', required: true)
|
||||||
|
|
||||||
|
|
@ -908,7 +908,7 @@ configure_file(
|
||||||
install_dir : cmakedir,
|
install_dir : cmakedir,
|
||||||
)
|
)
|
||||||
|
|
||||||
endif # !daemon-only
|
endif # client
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
option('daemon',
|
option('daemon',
|
||||||
type : 'boolean', value : true,
|
type : 'boolean', value : true,
|
||||||
description : 'Enable building and installation of pulseaudio daemon and supporting configuration files')
|
description : 'Enable building and installation of pulseaudio daemon and supporting configuration files')
|
||||||
option('daemon-only',
|
option('client',
|
||||||
type : 'boolean', value : false,
|
type : 'boolean', value : true,
|
||||||
description : 'Build and install only the pulseaudio daemon and supporting configuration files, relying on a system installation of libpulse')
|
description : 'Build and install pulseaudio client libraries and utilities')
|
||||||
option('doxygen',
|
option('doxygen',
|
||||||
type : 'boolean', value : true,
|
type : 'boolean', value : true,
|
||||||
description : 'Enable building and installation of documentation generated with doxygen')
|
description : 'Enable building and installation of documentation generated with doxygen')
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ if bashcompletiondir != 'no'
|
||||||
]
|
]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if not get_option('daemon-only')
|
if get_option('client')
|
||||||
aliases += [
|
aliases += [
|
||||||
'pacat',
|
'pacat',
|
||||||
'pactl',
|
'pactl',
|
||||||
|
|
|
||||||
|
|
@ -188,7 +188,7 @@ else
|
||||||
endif
|
endif
|
||||||
# FIXME: Do SIMD things
|
# FIXME: Do SIMD things
|
||||||
|
|
||||||
if get_option('daemon-only')
|
if not get_option('client')
|
||||||
libpulsecommon_dep = cc.find_library('pulsecommon-' + pa_version_major_minor, dirs : privlibdir, required : true)
|
libpulsecommon_dep = cc.find_library('pulsecommon-' + pa_version_major_minor, dirs : privlibdir, required : true)
|
||||||
libpulse_dep = dependency('libpulse', required : true)
|
libpulse_dep = dependency('libpulse', required : true)
|
||||||
libpulse_simple_dep = dependency('libpulse-simple', required : true)
|
libpulse_simple_dep = dependency('libpulse-simple', required : true)
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ default_tests += [
|
||||||
[ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep ] ],
|
[ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep ] ],
|
||||||
]
|
]
|
||||||
|
|
||||||
if not get_option('daemon-only')
|
if get_option('client')
|
||||||
default_tests += [
|
default_tests += [
|
||||||
[ 'mainloop-test', 'mainloop-test.c',
|
[ 'mainloop-test', 'mainloop-test.c',
|
||||||
[ check_dep, libpulse_dep, libpulsecommon_dep ] ],
|
[ check_dep, libpulse_dep, libpulsecommon_dep ] ],
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
if not get_option('daemon-only')
|
if get_option('client')
|
||||||
pacat_sources = [
|
pacat_sources = [
|
||||||
'pacat.c',
|
'pacat.c',
|
||||||
]
|
]
|
||||||
|
|
@ -74,7 +74,7 @@ if get_option('daemon')
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if not get_option('daemon-only')
|
if get_option('client')
|
||||||
if x11_dep.found()
|
if x11_dep.found()
|
||||||
pax11publish_sources = [
|
pax11publish_sources = [
|
||||||
'pax11publish.c',
|
'pax11publish.c',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue