meson: Fix install paths

Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>

diff --git a/src/modules/alsa/meson.build b/src/modules/alsa/meson.build
index 345d679..edf5b2e 100644 (file)
--- a/src/modules/alsa/meson.build
+++ b/src/modules/alsa/meson.build
@@ -26,7 +26,7 @@ if udev_dep.found()
   libalsa_util_headers += [ '../udev-util.h' ]
 endif
 
-libalsa_util = shared_library('libalsa_util',
+libalsa_util = shared_library('alsa-util',
   libalsa_util_sources,
   libalsa_util_headers,
   c_args : [pa_c_args, server_c_args],

diff --git a/src/modules/bluetooth/meson.build b/src/modules/bluetooth/meson.build
index 68cdf11..7056fcd 100644 (file)
--- a/src/modules/bluetooth/meson.build
+++ b/src/modules/bluetooth/meson.build
@@ -20,7 +20,7 @@ if get_option('bluez5-ofono-headset')
   libbluez5_util_sources += [ 'backend-ofono.c' ]
 endif
 
-libbluez5_util = shared_library('libbluez5_util',
+libbluez5_util = shared_library('bluez5-util',
   libbluez5_util_sources,
   libbluez5_util_headers,
   c_args : [pa_c_args, server_c_args],

diff --git a/src/modules/echo-cancel/meson.build b/src/modules/echo-cancel/meson.build
index 7157864..ea984f4 100644 (file)
--- a/src/modules/echo-cancel/meson.build
+++ b/src/modules/echo-cancel/meson.build
@@ -9,7 +9,7 @@ libwebrtc_util_sources = [
   'webrtc.cc'
 ]
 
-libwebrtc_util = static_library('libwebrtc_util',
+libwebrtc_util = static_library('webrtc-util',
   libwebrtc_util_sources,
   cpp_args : [pa_c_args, server_c_args],
   include_directories : [configinc, topinc],

diff --git a/src/modules/raop/meson.build b/src/modules/raop/meson.build
index 0e8d969..58d0148 100644 (file)
--- a/src/modules/raop/meson.build
+++ b/src/modules/raop/meson.build
@@ -14,7 +14,7 @@ libraop_headers = [
   'raop-util.h',
 ]
 
-libraop = shared_library('libraop',
+libraop = shared_library('raop',
   libraop_sources,
   libraop_headers,
   c_args : [pa_c_args, server_c_args],

diff --git a/src/modules/rtp/meson.build b/src/modules/rtp/meson.build
index dc6ab1b..cbb32ad 100644 (file)
--- a/src/modules/rtp/meson.build
+++ b/src/modules/rtp/meson.build
@@ -14,7 +14,7 @@ librtp_headers = [
   'headerlist.h',
 ]
 
-librtp = shared_library('librtp',
+librtp = shared_library('rtp',
   librtp_sources,
   librtp_headers,
   c_args : [pa_c_args, server_c_args],

diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build
index c534392..9901fde 100644 (file)
--- a/src/pulsecore/meson.build
+++ b/src/pulsecore/meson.build
@@ -182,7 +182,7 @@ libpulsecore_dep = declare_dependency(link_with: libpulsecore)
 # Internal libraries for modules
 # TODO: understand 'c_args' and 'dependencies' better, maybe we can remove some
 
-libavahi_wrap = shared_library('avahi_wrap',
+libavahi_wrap = shared_library('avahi-wrap',
   'avahi-wrap.c',
   'avahi-wrap.h',
   c_args : [pa_c_args, server_c_args, database_c_args],
@@ -205,7 +205,7 @@ libcli = shared_library('cli',
 
 libcli_dep = declare_dependency(link_with: libcli)
 
-libprotocol_cli = shared_library('protocol_cli',
+libprotocol_cli = shared_library('protocol-cli',
   'protocol-cli.c',
   'protocol-cli.h',
   c_args : [pa_c_args, server_c_args, database_c_args],
@@ -215,7 +215,7 @@ libprotocol_cli = shared_library('protocol_cli',
   install_dir : modlibexecdir,
 )
 
-libprotocol_http = shared_library('protocol_http',
+libprotocol_http = shared_library('protocol-http',
   ['protocol-http.c', 'mime-type.c'],
   ['protocol-http.h', 'mime-type.h'],
   c_args : [pa_c_args, server_c_args, database_c_args],
@@ -225,7 +225,7 @@ libprotocol_http = shared_library('protocol_http',
   install_dir : modlibexecdir,
 )
 
-libprotocol_native = shared_library('protocol_native',
+libprotocol_native = shared_library('protocol-native',
   'protocol-native.c',
   ['protocol-native.h', 'native-common.h'],
   c_args : [pa_c_args, server_c_args, database_c_args],
@@ -235,7 +235,7 @@ libprotocol_native = shared_library('protocol_native',
   install_dir : modlibexecdir,
 )
 
-libprotocol_simple = shared_library('protocol_simple',
+libprotocol_simple = shared_library('protocol-simple',
   'protocol-simple.c',
   'protocol-simple.h',
   c_args : [pa_c_args, server_c_args, database_c_args],