Skip to content

Commit 024e908

Browse files
committed
meson: move several definitions related libsystemd to src/libsystemd/meson.build
1 parent 40dbce3 commit 024e908

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

meson.build

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1642,7 +1642,6 @@ subdir('src/shared')
16421642
subdir('src/udev')
16431643
subdir('src/libudev')
16441644

1645-
libsystemd_sym_path = '@0@/@1@'.format(project_source_root, libsystemd_sym)
16461645
libsystemd = shared_library(
16471646
'systemd',
16481647
disable_mempool_c,
@@ -1662,9 +1661,6 @@ libsystemd = shared_library(
16621661
install : true,
16631662
install_dir : rootlibdir)
16641663

1665-
static_libsystemd = get_option('static-libsystemd')
1666-
static_libsystemd_pic = static_libsystemd == 'true' or static_libsystemd == 'pic'
1667-
16681664
install_libsystemd_static = static_library(
16691665
'systemd',
16701666
libsystemd_sources,

src/libsystemd/meson.build

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,11 @@ libsystemd_static = static_library(
170170
librt],
171171
c_args : libsystemd_c_args)
172172

173-
libsystemd_sym = 'src/libsystemd/libsystemd.sym'
173+
libsystemd_sym = files('libsystemd.sym')
174+
libsystemd_sym_path = join_paths(meson.current_source_dir(), 'libsystemd.sym')
175+
176+
static_libsystemd = get_option('static-libsystemd')
177+
static_libsystemd_pic = static_libsystemd == 'true' or static_libsystemd == 'pic'
174178

175179
configure_file(
176180
input : 'libsystemd.pc.in',

0 commit comments

Comments
 (0)