diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-12-19 11:35:01 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-12-21 17:01:02 +0100 |
| commit | 37e4d7a8553c6f43217950fa428ac270378c20b0 (patch) | |
| tree | 0978b8620aa55c2533d5b82e0454f5f6f32ef2c5 | |
| parent | sd-bus: drop check for selinux before calling getsockopt(SO_PEERSEC) (diff) | |
| download | systemd-37e4d7a8553c6f43217950fa428ac270378c20b0.tar.xz systemd-37e4d7a8553c6f43217950fa428ac270378c20b0.zip | |
meson: rename libsystemd_internal to libsystem_static
We already use the "_static" suffix for libshared_static ("shared" is the name
of the library, "static" is the format) and other libs, so let's rename for
consistency.
Also change libsystemd_static_sources to libsystemd_sources, since the same
list is used for both and shorter is better.
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | src/libsystemd/meson.build | 6 | ||||
| -rw-r--r-- | src/libudev/meson.build | 2 | ||||
| -rw-r--r-- | src/shared/meson.build | 2 | ||||
| -rw-r--r-- | src/test/meson.build | 4 | ||||
| -rw-r--r-- | src/udev/meson.build | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/meson.build b/meson.build index 11b73bcb19..9dabf342d2 100644 --- a/meson.build +++ b/meson.build @@ -1258,7 +1258,7 @@ libjournal_core = static_library( libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym) libsystemd = shared_library( 'systemd', - libsystemd_internal_sources, + libsystemd_sources, journal_internal_sources, version : libsystemd_version, include_directories : includes, @@ -1338,7 +1338,7 @@ foreach tuple : [['myhostname', 'ENABLE_MYHOSTNAME'], '-shared', '-Wl,--version-script=' + version_script_arg, '-Wl,--undefined'], - link_with : [libsystemd_internal, + link_with : [libsystemd_static, libbasic], dependencies : [threads, librt], @@ -1576,7 +1576,7 @@ if conf.get('ENABLE_LOGIND') == 1 include_directories : includes, link_args : ['-shared', '-Wl,--version-script=' + version_script_arg], - link_with : [libsystemd_internal, + link_with : [libsystemd_static, libshared_static], dependencies : [threads, libpam, diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build index 4abf50b111..b305af159c 100644 --- a/src/libsystemd/meson.build +++ b/src/libsystemd/meson.build @@ -17,7 +17,7 @@ sd_login_c = files('sd-login/sd-login.c') -libsystemd_internal_sources = files(''' +libsystemd_sources = files(''' sd-bus/bus-bloom.c sd-bus/bus-bloom.h sd-bus/bus-common-errors.c @@ -93,9 +93,9 @@ libsystemd_internal_sources = files(''' sd-utf8/sd-utf8.c '''.split()) + sd_login_c -libsystemd_internal = static_library( +libsystemd_static = static_library( 'systemd', - libsystemd_internal_sources, + libsystemd_sources, install : false, include_directories : includes, link_with : libbasic, diff --git a/src/libudev/meson.build b/src/libudev/meson.build index 30d6721b60..09cf762c27 100644 --- a/src/libudev/meson.build +++ b/src/libudev/meson.build @@ -41,7 +41,7 @@ libudev = shared_library( link_args : ['-shared', '-Wl,--version-script=' + libudev_sym_path], link_with : [libbasic, - libsystemd_internal], + libsystemd_static], dependencies : [threads], link_depends : libudev_sym, install : true, diff --git a/src/shared/meson.build b/src/shared/meson.build index 06a944c49d..4620eaa007 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -164,7 +164,7 @@ libshared = shared_library( shared_sources, basic_sources, journal_internal_sources, - libsystemd_internal_sources, + libsystemd_sources, libudev_sources, include_directories : includes, link_args : ['-shared', diff --git a/src/test/meson.build b/src/test/meson.build index 6bb5bd629e..dcec53fa51 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -67,7 +67,7 @@ tests += [ 'src/test/test-helper.c'], [libcore, libudev, - libsystemd_internal], + libsystemd_static], [threads, librt, libseccomp, @@ -772,7 +772,7 @@ tests += [ [['src/libsystemd/sd-bus/test-bus-error.c'], [libshared_static, - libsystemd_internal], + libsystemd_static], []], [['src/libsystemd/sd-bus/test-bus-track.c'], diff --git a/src/udev/meson.build b/src/udev/meson.build index 3b2c7b5e12..fc06d6f85a 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -113,7 +113,7 @@ if get_option('link-udev-shared') udev_rpath = rootlibexecdir else udev_link_with = [libshared_static, - libsystemd_internal] + libsystemd_static] udev_rpath = '' endif |