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

build: Convert parts of pressure-vessel into a static library


This reduces repetition between pressure-vessel-wrap and
pressure-vessel-with-lock, and will make it easier to test.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent b7036565
No related branches found
No related tags found
No related merge requests found
......@@ -215,25 +215,40 @@ enums = gnome.mkenums_simple(
sources : headers,
)
executable(
'pressure-vessel-with-lock',
pressure_vessel_utils = static_library(
'pressure-vessel-utils',
sources : [
'src/bwrap-lock.c',
'src/bwrap-lock.h',
'src/glib-backports.c',
'src/glib-backports.h',
'src/flatpak-utils-base.c',
'src/flatpak-utils-base-private.h',
'src/flatpak-utils.c',
'src/flatpak-utils-private.h',
'src/glib-backports.c',
'src/glib-backports.h',
'src/utils.c',
'src/utils.h',
],
dependencies : [
gio_unix,
libglnx.get_variable('libglnx_dep'),
],
include_directories : project_include_dirs,
install: false,
)
executable(
'pressure-vessel-with-lock',
sources : [
'src/with-lock.c',
],
dependencies : [
gio_unix,
libglnx.get_variable('libglnx_dep'),
],
link_with : [
pressure_vessel_utils,
],
include_directories : project_include_dirs,
install : true,
install_dir : get_option('bindir'),
......@@ -246,22 +261,12 @@ executable(
sources : [
'src/bwrap.c',
'src/bwrap.h',
'src/bwrap-lock.c',
'src/bwrap-lock.h',
'src/glib-backports.c',
'src/glib-backports.h',
'src/flatpak-bwrap.c',
'src/flatpak-bwrap-private.h',
'src/flatpak-run.c',
'src/flatpak-run-private.h',
'src/flatpak-utils-base.c',
'src/flatpak-utils-base-private.h',
'src/flatpak-utils.c',
'src/flatpak-utils-private.h',
'src/runtime.c',
'src/runtime.h',
'src/utils.c',
'src/utils.h',
'src/wrap.c',
'src/wrap-interactive.c',
'src/wrap-interactive.h',
......@@ -272,6 +277,9 @@ executable(
xau,
libglnx.get_variable('libglnx_dep'),
],
link_with : [
pressure_vessel_utils,
],
include_directories : project_include_dirs,
install : true,
install_dir : get_option('bindir'),
......@@ -292,18 +300,15 @@ executable(
executable(
'test-cheap-copy',
sources : [
'src/flatpak-utils-base.c',
'src/flatpak-utils-base-private.h',
'src/glib-backports.c',
'src/glib-backports.h',
'src/utils.c',
'src/utils.h',
'tests/cheap-copy.c',
],
dependencies : [
gio_unix,
libglnx.get_variable('libglnx_dep'),
],
link_with : [
pressure_vessel_utils,
],
include_directories : project_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