mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Do not redefine dependency objects

Browse source 
Use the top-level ones.
This commit is contained in:
Emmanuele Bassi 2018-01-24 11:55:28 +00:00 • committed by Wim Taymans
parent a52ba92378
commit f9ed917814
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
spa/meson.build
View file

@ -12,11 +12,10 @@ sbc_dep = dependency('sbc', required : false)
libudev_dep = dependency('libudev') libudev_dep = dependency('libudev')
threads_dep = dependency('threads') threads_dep = dependency('threads')
cc = meson.get_compiler('c') #cc = meson.get_compiler('c')
#dl_lib = cc.find_library('dl', required : false)
dl_lib = cc.find_library('dl', required : true) #pthread_lib = dependencies('threads')
pthread_lib = cc.find_library('pthread', required : true) #mathlib = cc.find_library('m', required : false)
libm = cc.find_library('m', required : true)
spa_inc = include_directories('include') spa_inc = include_directories('include')
spa_libinc = include_directories('.') spa_libinc = include_directories('.')

2
spa/plugins/audiotestsrc/meson.build
View file

@ -3,7 +3,7 @@ audiotestsrc_sources = ['audiotestsrc.c', 'plugin.c']
audiotestsrclib = shared_library('spa-audiotestsrc', audiotestsrclib = shared_library('spa-audiotestsrc',
audiotestsrc_sources, audiotestsrc_sources,
include_directories : [spa_inc, spa_libinc], include_directories : [spa_inc, spa_libinc],
dependencies : libm, dependencies : mathlib,
link_with : spalib, link_with : spalib,
install : true, install : true,
install_dir : '@0@/spa/audiotestsrc'.format(get_option('libdir'))) install_dir : '@0@/spa/audiotestsrc'.format(get_option('libdir')))

6
spa/tests/meson.build
View file

@ -1,11 +1,11 @@
executable('test-mixer', 'test-mixer.c', executable('test-mixer', 'test-mixer.c',
include_directories : [spa_inc ], include_directories : [spa_inc ],
dependencies : [dl_lib, pthread_lib, libm], dependencies : [dl_lib, pthread_lib, mathlib],
link_with : spalib, link_with : spalib,
install : false) install : false)
executable('test-bluez5', 'test-bluez5.c', executable('test-bluez5', 'test-bluez5.c',
include_directories : [spa_inc, spa_libinc ], include_directories : [spa_inc, spa_libinc ],
dependencies : [dl_lib, pthread_lib, libm, dbus_dep], dependencies : [dl_lib, pthread_lib, mathlib, dbus_dep],
link_with : spalib, link_with : spalib,
install : false) install : false)
executable('test-ringbuffer', 'test-ringbuffer.c', executable('test-ringbuffer', 'test-ringbuffer.c',
@ -62,6 +62,6 @@ executable('test-props5', 'test-props5.c',
install : false) install : false)
executable('test-control', 'test-control.c', executable('test-control', 'test-control.c',
include_directories : [spa_inc, spa_libinc ], include_directories : [spa_inc, spa_libinc ],
dependencies : [dl_lib, pthread_lib, libm], dependencies : [dl_lib, pthread_lib, mathlib],
link_with : spalib, link_with : spalib,
install : false) install : false)