mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-sys: Fix up meson install paths

Browse source 
Brings things in line with the autotools build, and adds ALSA mixer
paths and profile-sets into the meson build system as well.

The module installation path is also now customisable.
This commit is contained in:
Arun Raghavan 2018-10-13 11:50:03 +05:30 • committed by Arun Raghavan
parent 91bb9b77e4
commit 37dbeae031
13 changed files with 49 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile.am
View file

@ -1343,7 +1343,7 @@ dist_alsaprofilesets_DATA = \
if HAVE_UDEV
dist_udevrules_DATA = \
modules/alsa/mixer/profile-sets/90-pulseaudio.rules
modules/alsa/90-pulseaudio.rules
endif
dist_alsapaths_DATA = \

1
src/meson.build
View file

@ -182,6 +182,7 @@ libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
include_directories : [configinc, topinc],
c_args : [pa_c_args],
install : true,
install_dir : privlibdir,
dependencies : [libm_dep, thread_dep, shm_dep, sndfile_dep, dbus_dep, x11_dep, systemd_dep, glib_dep, gtk_dep, asyncns_dep],
implicit_include_directories : false)

0
src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules → src/modules/alsa/90-pulseaudio.rules
View file

5
src/modules/alsa/meson.build
View file

@ -32,5 +32,8 @@ libalsa_util = shared_library('libalsa_util',
c_args : [pa_c_args, server_c_args],
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, alsa_dep, dbus_dep, libm_dep, udev_dep],
install : true
install : true,
install_dir : modlibexecdir,
)
subdir('mixer')

7
src/modules/alsa/mixer/meson.build Normal file
View file

@ -0,0 +1,7 @@
install_subdir('paths',
install_dir : alsadatadir
)
install_subdir('profile-sets',
install_dir : alsadatadir
)

3
src/modules/bluetooth/meson.build
View file

@ -26,5 +26,6 @@ libbluez5_util = shared_library('libbluez5_util',
c_args : [pa_c_args, server_c_args],
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep, sbc_dep],
install : true
install : true,
install_dir : modlibexecdir,
)

3
src/modules/echo-cancel/meson.build
View file

@ -14,5 +14,6 @@ libwebrtc_util = static_library('libwebrtc_util',
cpp_args : [pa_c_args, server_c_args],
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, webrtc_dep],
install : true
install : true,
install_dir : modlibexecdir,
)

1
src/modules/meson.build
View file

@ -261,6 +261,7 @@ foreach m : all_modules
include_directories : [configinc, topinc],
c_args : [pa_c_args, server_c_args, '-DPA_MODULE_NAME=' + name.underscorify()] + extra_flags,
install : true,
install_dir : modlibexecdir,
dependencies : [thread_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep] + extra_deps,
link_args : [ '-Wl,--no-undefined' ],
link_with : extra_libs,

3
src/modules/raop/meson.build
View file

@ -20,5 +20,6 @@ libraop = shared_library('libraop',
c_args : [pa_c_args, server_c_args],
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, librtp_dep, openssl_dep],
install : true
install : true,
install_dir : modlibexecdir,
)

3
src/modules/rtp/meson.build
View file

@ -20,7 +20,8 @@ librtp = shared_library('librtp',
c_args : [pa_c_args, server_c_args],
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep],
install : true
install : true,
install_dir : modlibexecdir,
)
librtp_dep = declare_dependency(link_with: librtp)

19
src/pulsecore/meson.build
View file

@ -172,6 +172,7 @@ libpulsecore = shared_library('pulsecore-' + pa_version_major_minor,
include_directories : [configinc, topinc],
c_args : [pa_c_args, server_c_args],
install : true,
install_dir : privlibdir,
link_with : libpulsecore_simd_lib,
dependencies : [libm_dep, libpulsecommon_dep, libpulse_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep],
implicit_include_directories : false)
@ -188,7 +189,8 @@ libavahi_wrap = shared_library('avahi_wrap',
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, avahi_dep],
implicit_include_directories : false, # pulsecore/poll.h <vs> /usr/include/poll.h
install : true
install : true,
install_dir : modlibexecdir,
)
libcli = shared_library('cli',
@ -197,7 +199,8 @@ libcli = shared_library('cli',
c_args : [pa_c_args, server_c_args, database_c_args],
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep],
install : true
install : true,
install_dir : modlibexecdir,
)
libcli_dep = declare_dependency(link_with: libcli)
@ -208,7 +211,8 @@ libprotocol_cli = shared_library('protocol_cli',
c_args : [pa_c_args, server_c_args, database_c_args],
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libcli_dep],
install : true
install : true,
install_dir : modlibexecdir,
)
libprotocol_http = shared_library('protocol_http',
@ -217,7 +221,8 @@ libprotocol_http = shared_library('protocol_http',
c_args : [pa_c_args, server_c_args, database_c_args],
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep],
install : true
install : true,
install_dir : modlibexecdir,
)
libprotocol_native = shared_library('protocol_native',
@ -226,7 +231,8 @@ libprotocol_native = shared_library('protocol_native',
c_args : [pa_c_args, server_c_args, database_c_args],
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep],
install : true
install : true,
install_dir : modlibexecdir,
)
libprotocol_simple = shared_library('protocol_simple',
@ -235,5 +241,6 @@ libprotocol_simple = shared_library('protocol_simple',
c_args : [pa_c_args, server_c_args, database_c_args],
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep],
install : true
install : true,
install_dir : modlibexecdir,
)