meson: stop building out convenience libraries by default

The meson default for static_library() are:
build_by_default=true, install=false. We never interact with the
static libraries, and we only care about them as a stepping-stone towards
the installable executables or libraries. Thus let's only build them if
they are a dependency of something else we are building.

While at it, let's drop install:false, since this appears to be the default.

This change would have fixed the issue with lib_import_common failing
to build too: we wouldn't attempt to build it.

In practice this changes very little, because we generally only declare static
libraries where there's something in the default target that will make use of
them. But it seems to be a better pattern to set build_by_default to false.

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 891235ff42ed2877c79ef59863b1fa31f8bacfbc..229ac97c69afb76f56cdcfe149da0875dd7609e4 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -428,7 +428,7 @@ libbasic = static_library(
                         libcap,
                         libm],
         c_args : ['-fvisibility=default'],
-        install : false)
+        build_by_default : false)
 
 ############################################################
 
@@ -443,4 +443,5 @@ libbasic_gcrypt = static_library(
         basic_gcrypt_sources,
         include_directories : basic_includes,
         dependencies : [libgcrypt],
-        c_args : ['-fvisibility=default'])
+        c_args : ['-fvisibility=default'],
+        build_by_default : false)

diff --git a/src/core/meson.build b/src/core/meson.build
index 92a811f2f060e076d33a874e6322ea943fc899f2..d229d46779a6e63711ebfa0858fd994ce058b535 100644 (file)
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -184,7 +184,8 @@ libcore = static_library(
                         libapparmor,
                         libselinux,
                         libmount,
-                        libacl])
+                        libacl],
+        build_by_default : false)
 
 core_includes = [includes, include_directories('.')]
 

diff --git a/src/import/meson.build b/src/import/meson.build
index e48e49293e2a9b79436fe2bdfc1633087831ca7b..23f08588170bec773f133fdf33b2c1674f2bc335 100644 (file)
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -45,7 +45,8 @@ if conf.get('ENABLE_IMPORTD') == 1
                 include_directories : includes,
                 dependencies : [libbzip2,
                                 libxz,
-                                libz])
+                                libz],
+                build_by_default : false)
 
         install_data('org.freedesktop.import1.conf',
                      install_dir : dbuspolicydir)

diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index b9f8b472cb149f4d2d88bf70e475fa1bc179cfec..168d0ed6a3009905c6041dc6adafca438f38b41e 100644 (file)
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -31,7 +31,7 @@ libsystemd_journal_remote = static_library(
                         libgnutls,
                         libxz,
                         liblz4],
-        install : false)
+        build_by_default : false)
 
 systemd_journal_remote_sources = files('''
         journal-remote-main.c

diff --git a/src/journal/meson.build b/src/journal/meson.build
index 383ed355fd5e893ef9339cac14ef2b74baac259c..eb66bfd584a13ab0f4b970132d80679a3ceb7e33 100644 (file)
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -36,7 +36,7 @@ libjournal_core = static_library(
         sources,
         include_directories : includes,
         dependencies: threads,
-        install : false)
+        build_by_default : false)
 
 journal_includes = [includes, include_directories('.')]
 

diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build
index 54248a1e6e832094ed184f6a2d67296c1c8e8a73..a7838cdaa1d3b9cbb4505fdd0b54dbd13c44f123 100644 (file)
--- a/src/libsystemd-network/meson.build
+++ b/src/libsystemd-network/meson.build
@@ -49,7 +49,8 @@ sources = files('''
 libsystemd_network = static_library(
         'systemd-network',
         sources,
-        include_directories : includes)
+        include_directories : includes,
+        build_by_default : false)
 
 libsystemd_network_includes = [includes, include_directories('.')]
 

diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 73c0228248d332b3fe2ee1fac75e771e735c2314..124393d3e6796c3d99d8bed4b8714ea9e2e0bf86 100644 (file)
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -166,12 +166,12 @@ libsystemd_c_args = ['-fvisibility=default']
 libsystemd_static = static_library(
         'systemd_static',
         libsystemd_sources,
-        install : false,
         include_directories : libsystemd_includes,
+        c_args : libsystemd_c_args,
         link_with : libbasic,
         dependencies : [threads,
                         librt],
-        c_args : libsystemd_c_args)
+        build_by_default : false)
 
 libsystemd_sym = files('libsystemd.sym')
 libsystemd_sym_path = meson.current_source_dir() / 'libsystemd.sym'

diff --git a/src/libudev/meson.build b/src/libudev/meson.build
index 488ae6248097256d17bc96024d3d0b0623742344..e94b43d9b70dcfa61d1e2877d89524d1388a33ee 100644 (file)
--- a/src/libudev/meson.build
+++ b/src/libudev/meson.build
@@ -28,7 +28,8 @@ libudev_basic = static_library(
         'udev-basic',
         libudev_sources,
         include_directories : includes,
-        c_args : ['-fvisibility=default'])
+        c_args : ['-fvisibility=default'],
+        build_by_default : false)
 
 libudev_static = static_library(
         'udev_static',

diff --git a/src/login/meson.build b/src/login/meson.build
index a583025a1bc67d2435ae0f5f93bc8e95b4c98de1..a78c2bc2dd6e2686581226ad29b76fa5df654270 100644 (file)
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -50,7 +50,8 @@ liblogind_core = static_library(
         'logind-core',
         liblogind_core_sources,
         include_directories : includes,
-        dependencies : [libacl])
+        dependencies : libacl,
+        build_by_default : false)
 
 loginctl_sources = files('''
         loginctl.c

diff --git a/src/machine/meson.build b/src/machine/meson.build
index 9b9ad1d8a9f02c8d8d28afc5ccea64b170ff197d..ef858a5988f4c6d1da8b4d7c00fa70cae4d58fb5 100644 (file)
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -24,7 +24,8 @@ libmachine_core = static_library(
         'machine-core',
         libmachine_core_sources,
         include_directories : includes,
-        dependencies : [threads])
+        dependencies : threads,
+        build_by_default : false)
 
 if conf.get('ENABLE_MACHINED') == 1
         install_data('org.freedesktop.machine1.conf',

diff --git a/src/network/meson.build b/src/network/meson.build
index 04a5f966bb720b9cda64e5ce42831c18ebb35466..5857439c5ab43882ac16b0e5f936f88b6532dee8 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -235,7 +235,8 @@ libnetworkd_core = static_library(
         'networkd-core',
         sources,
         include_directories : network_includes,
-        link_with : [networkd_link_with])
+        link_with : networkd_link_with,
+        build_by_default : false)
 
 if conf.get('ENABLE_NETWORKD') == 1
         install_data('org.freedesktop.network1.conf',

diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build
index d465b3d804cabd1832a604463499c6050b726980..11ac404e9996bc11cceb467b28152ca77d6bc267 100644 (file)
--- a/src/nspawn/meson.build
+++ b/src/nspawn/meson.build
@@ -45,7 +45,8 @@ libnspawn_core = static_library(
         include_directories : includes,
         dependencies : [libacl,
                         libseccomp,
-                        libselinux])
+                        libselinux],
+        build_by_default : false)
 
 systemd_nspawn_sources = files('nspawn.c')
 

diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 4d717f1964130fc002e556486f80c2fb766b2a26..0580fbeec625db19fe273c2ce5df84510b1b46a9 100644 (file)
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -120,7 +120,8 @@ basic_dns_sources += custom_target(
 libsystemd_resolve_core = static_library(
         'systemd-resolve-core',
         basic_dns_sources,
-        include_directories : includes)
+        include_directories : includes,
+        build_by_default : false)
 
 systemd_resolved_sources += custom_target(
         'resolved_gperf.c',

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 562d984fc36f854dc5da7497a6d8e608fa209cdf..5dc58a863d4768ad611b7d64873e383ecacc9c60 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -459,7 +459,8 @@ libshared_static = static_library(
         shared_sources,
         include_directories : includes,
         dependencies : libshared_deps,
-        c_args : ['-fvisibility=default'])
+        c_args : ['-fvisibility=default'],
+        build_by_default : false)
 
 libshared = shared_library(
         libshared_name,

diff --git a/src/timesync/meson.build b/src/timesync/meson.build
index 6d6ddeb28545fad2515263dda8f763c329f37940..83dd7c8f67b64180b1073d2984f5c17bbea56940 100644 (file)
--- a/src/timesync/meson.build
+++ b/src/timesync/meson.build
@@ -32,7 +32,8 @@ libtimesyncd_core = static_library(
         'timesyncd-core',
         sources,
         include_directories : includes,
-        link_with : [timesyncd_link_with])
+        link_with : timesyncd_link_with,
+        build_by_default : false)
 
 custom_target(
         'timesyncd.conf',

diff --git a/src/udev/meson.build b/src/udev/meson.build
index 0b692df3d8a72aa21399f699cdc07f3037f37216..cd0bb6653fb707d09bc670c22c8ff4bce4222481 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -115,7 +115,9 @@ libudevd_core = static_library(
         keyboard_keys_from_name_h,
         include_directories : udev_includes,
         link_with : udev_link_with,
-        dependencies : [libblkid, libkmod])
+        dependencies : [libblkid,
+                        libkmod],
+        build_by_default : false)
 
 udev_progs = [['ata_id/ata_id.c'],
               ['cdrom_id/cdrom_id.c'],