Update meson to match wscript state
This commit is contained in:
parent
30994438a1
commit
32b8df4417
|
@ -7,5 +7,6 @@ common_sources = [
|
||||||
]
|
]
|
||||||
|
|
||||||
commonlib = static_library('common', common_sources,
|
commonlib = static_library('common', common_sources,
|
||||||
|
dependencies : [dbus_dep, cdbus_dep],
|
||||||
include_directories : inc,
|
include_directories : inc,
|
||||||
install : false)
|
install : false)
|
||||||
|
|
|
@ -39,7 +39,6 @@ daemon_sources = [
|
||||||
'room_load.c',
|
'room_load.c',
|
||||||
'room_save.c',
|
'room_save.c',
|
||||||
'save.c',
|
'save.c',
|
||||||
'siginfo.c',
|
|
||||||
'studio.c',
|
'studio.c',
|
||||||
'studio_jack_conf.c',
|
'studio_jack_conf.c',
|
||||||
'studio_list.c',
|
'studio_list.c',
|
||||||
|
@ -50,5 +49,5 @@ daemon_sources = [
|
||||||
ladishd = executable('ladishd', daemon_sources,
|
ladishd = executable('ladishd', daemon_sources,
|
||||||
dependencies : deps,
|
dependencies : deps,
|
||||||
include_directories : inc,
|
include_directories : inc,
|
||||||
link_with : [commonlib, cdbuslib, proxieslib, alsapidlib],
|
link_with : [commonlib, proxieslib, alsapidlib],
|
||||||
install : true)
|
install : true)
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
gui_deps = [
|
gui_deps = [
|
||||||
dependency('dbus-glib-1'),
|
dependency('dbus-glib-1'),
|
||||||
|
dbus_dep,
|
||||||
|
cdbus_dep,
|
||||||
]
|
]
|
||||||
|
|
||||||
subdir('flowcanvas')
|
subdir('flowcanvas')
|
||||||
|
@ -38,7 +40,7 @@ gladish_sources = [
|
||||||
gladish = executable('gladish', gladish_sources,
|
gladish = executable('gladish', gladish_sources,
|
||||||
dependencies : [gui_deps, flowcanvas_deps],
|
dependencies : [gui_deps, flowcanvas_deps],
|
||||||
include_directories : [flowcanvas_inc, inc],
|
include_directories : [flowcanvas_inc, inc],
|
||||||
link_with : [flowcanvaslib, proxieslib, cdbuslib, commonlib],
|
link_with : [flowcanvaslib, proxieslib, commonlib],
|
||||||
install : true)
|
install : true)
|
||||||
|
|
||||||
install_data('gladish.ui', install_dir : data_dir)
|
install_data('gladish.ui', install_dir : data_dir)
|
||||||
|
|
|
@ -9,8 +9,8 @@ install_headers([
|
||||||
|
|
||||||
liblash = library('lash', 'lash.c',
|
liblash = library('lash', 'lash.c',
|
||||||
include_directories : [lash_inc, inc],
|
include_directories : [lash_inc, inc],
|
||||||
dependencies : [dbus_dep],
|
dependencies : [dbus_dep, cdbus_dep],
|
||||||
link_with : [cdbuslib, commonlib],
|
link_with : [commonlib],
|
||||||
install : true)
|
install : true)
|
||||||
|
|
||||||
pkg_mod.generate(libraries : liblash,
|
pkg_mod.generate(libraries : liblash,
|
||||||
|
|
15
meson.build
15
meson.build
|
@ -32,13 +32,15 @@ cc = meson.get_compiler('c')
|
||||||
inc = include_directories(meson.build_root().split('/')[-1])
|
inc = include_directories(meson.build_root().split('/')[-1])
|
||||||
lash_inc = include_directories('lash_compat/liblash')
|
lash_inc = include_directories('lash_compat/liblash')
|
||||||
|
|
||||||
dbus_dep = dependency('dbus-1')
|
|
||||||
jack_dep = dependency('jack')
|
jack_dep = dependency('jack')
|
||||||
|
dbus_dep = dependency('dbus-1')
|
||||||
|
cdbus_dep = dependency('cdbus-1')
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
cc.find_library('dl'),
|
cc.find_library('dl'),
|
||||||
cc.find_library('util'),
|
cc.find_library('util'),
|
||||||
dbus_dep,
|
dbus_dep,
|
||||||
|
cdbus_dep,
|
||||||
jack_dep,
|
jack_dep,
|
||||||
dependency('alsa'),
|
dependency('alsa'),
|
||||||
dependency('uuid'),
|
dependency('uuid'),
|
||||||
|
@ -49,7 +51,6 @@ pkg_mod = import('pkgconfig')
|
||||||
|
|
||||||
subdir('common')
|
subdir('common')
|
||||||
subdir('proxies')
|
subdir('proxies')
|
||||||
subdir('cdbus')
|
|
||||||
subdir('alsapid')
|
subdir('alsapid')
|
||||||
|
|
||||||
# ladishd
|
# ladishd
|
||||||
|
@ -59,26 +60,22 @@ if get_option('liblash').enabled()
|
||||||
subdir('lash_compat/liblash')
|
subdir('lash_compat/liblash')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if get_option('pylash').enabled()
|
|
||||||
subdir('lash_compat/pylash')
|
|
||||||
endif
|
|
||||||
|
|
||||||
if get_option('gladish').enabled()
|
if get_option('gladish').enabled()
|
||||||
subdir('gui')
|
subdir('gui')
|
||||||
subdir('art')
|
subdir('art')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install_data(['AUTHORS', 'README', 'NEWS'], install_dir : data_dir)
|
install_data(['AUTHORS', 'README.adoc', 'NEWS'], install_dir : data_dir)
|
||||||
|
|
||||||
install_data('ladish_control',
|
install_data('ladish_control',
|
||||||
install_dir : get_option('prefix') / 'bin')
|
install_dir : get_option('prefix') / 'bin')
|
||||||
|
|
||||||
jmcore = executable('jmcore', 'jmcore.c',
|
jmcore = executable('jmcore', 'jmcore.c',
|
||||||
dependencies : deps,
|
dependencies : deps,
|
||||||
link_with : [commonlib, cdbuslib],
|
link_with : [commonlib],
|
||||||
install : true)
|
install : true)
|
||||||
|
|
||||||
ladiconfd = executable('ladiconfd', 'conf.c',
|
ladiconfd = executable('ladiconfd', 'conf.c',
|
||||||
dependencies : deps,
|
dependencies : deps,
|
||||||
link_with : [commonlib, cdbuslib],
|
link_with : [commonlib],
|
||||||
install : true)
|
install : true)
|
||||||
|
|
|
@ -1,3 +1,2 @@
|
||||||
option('liblash', type : 'feature')
|
option('liblash', type : 'feature')
|
||||||
option('pylash', type : 'feature')
|
|
||||||
option('gladish', type : 'feature')
|
option('gladish', type : 'feature')
|
||||||
|
|
|
@ -14,5 +14,5 @@ proxies_sources = [
|
||||||
|
|
||||||
proxieslib = static_library('proxies', proxies_sources,
|
proxieslib = static_library('proxies', proxies_sources,
|
||||||
include_directories : inc,
|
include_directories : inc,
|
||||||
dependencies : dbus_dep,
|
dependencies : [dbus_dep, cdbus_dep,],
|
||||||
install : false)
|
install : false)
|
||||||
|
|
Loading…
Reference in New Issue