Skip to content
Snippets Groups Projects
Commit 03d00bbc authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'wip/t29490-pv-wrap-lib' into 'master'

build: Separate most of pv-wrap into a convenience library

See merge request !346
parents 80b53bf8 11c7bdfc
No related branches found
No related tags found
1 merge request!346build: Separate most of pv-wrap into a convenience library
......@@ -208,8 +208,8 @@ executable(
install_rpath : pv_rpath,
)
executable(
'pressure-vessel-wrap',
pressure_vessel_wrap_lib = static_library(
'pressure-vessel-wrap-lib',
sources : [
'bwrap.c',
'bwrap.h',
......@@ -228,7 +228,6 @@ executable(
'graphics-provider.h',
'runtime.c',
'runtime.h',
'wrap.c',
'wrap-flatpak.c',
'wrap-flatpak.h',
'wrap-pipewire.c',
......@@ -246,6 +245,24 @@ executable(
json_glib,
],
include_directories : pv_include_dirs,
)
pressure_vessel_wrap_lib_dep = declare_dependency(
link_with : pressure_vessel_wrap_lib,
sources : [launcher1[1], systemd_dbus[1]],
)
executable(
'pressure-vessel-wrap',
sources : [
'wrap.c',
],
c_args : pv_c_args,
dependencies : [
gio_unix,
libglnx_dep,
pressure_vessel_wrap_lib_dep,
],
include_directories : pv_include_dirs,
install : true,
install_dir : pv_bindir,
build_rpath : pv_rpath,
......
......@@ -56,7 +56,7 @@ foreach test_name : compiled_tests
gio_unix,
libglnx_dep,
test_utils_static_libsteamrt_dep,
pressure_vessel_utils_dep,
pressure_vessel_wrap_lib_dep,
],
include_directories : pv_include_dirs,
install : false,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment