meson: move several definitions related libsystemd to src/libsystemd/meson.build

diff --git a/meson.build b/meson.build
index 40604b9f017afc02fc236f06d25119af770e4295..c12b399b5f29af70723faab6c03743f10a36b01f 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1642,7 +1642,6 @@ subdir('src/shared')
 subdir('src/udev')
 subdir('src/libudev')
 
-libsystemd_sym_path = '@0@/@1@'.format(project_source_root, libsystemd_sym)
 libsystemd = shared_library(
         'systemd',
         disable_mempool_c,
@@ -1662,9 +1661,6 @@ libsystemd = shared_library(
         install : true,
         install_dir : rootlibdir)
 
-static_libsystemd = get_option('static-libsystemd')
-static_libsystemd_pic = static_libsystemd == 'true' or static_libsystemd == 'pic'
-
 install_libsystemd_static = static_library(
         'systemd',
         libsystemd_sources,

diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 3843c2aae072e8aaa45a6444dd00714c0dae7e45..b8a9bbe22265703203c255f02a4f96b0daf3aad6 100644 (file)
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -170,7 +170,11 @@ libsystemd_static = static_library(
                         librt],
         c_args : libsystemd_c_args)
 
-libsystemd_sym = 'src/libsystemd/libsystemd.sym'
+libsystemd_sym = files('libsystemd.sym')
+libsystemd_sym_path = join_paths(meson.current_source_dir(), 'libsystemd.sym')
+
+static_libsystemd = get_option('static-libsystemd')
+static_libsystemd_pic = static_libsystemd == 'true' or static_libsystemd == 'pic'
 
 configure_file(
         input : 'libsystemd.pc.in',