meson: rename extract+objects to export+import

We have two concepts: a list of files that should be extracted from an
intermediate build artifact to be used in a later build artifact, and for a
given artifact, a list "donors". The first list was called "extract", because
it is passed to the .extract_objects() meson function, and the second was
called "objects", because that is the meson parameter to specify pre-built
objects files (6350d2dbd97746440b9c8303ddc140ffda568732). But this naming is
confusing: we don't care about the 'extract' step, this is something internal
to the build machinery. And 'objects' is a very generic term.

Let's use 'export' for the stuff that is "exported" for other binaries to use,
and 'import' to say where to import from. Those terms are symmetrical and the
association between them should be intuitive. (If you think the terms are
actually assymetrical, there are precedents for confusing the import with the
import sources. E.g. in modern English, turkeys are called so because they were
imported from the Americas and guineafowls were imported from Africa via
Türkiye and all that foreign stuff is alike.)

diff --git a/meson.build b/meson.build
index 1ce4c95368da356160b642c9437ed49ec7aa3bad..0c54ef2408691e6dd2c52459b319eccf3b37fbed 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1815,7 +1815,7 @@ catalogs = []
 modules = [] # nss, pam, and other plugins
 executables = []
 executables_by_name = {}
-objects_by_name = {}
+exported_by_name = {}
 fuzzer_exes = []
 sources = []
 
@@ -2276,7 +2276,7 @@ foreach dict : executables
                 continue
         endif
 
-        exe_sources = dict.get('sources', []) + dict.get('extract', [])
+        exe_sources = dict.get('sources', []) + dict.get('export', [])
 
         foreach bpf_name : dict.get('bpf_programs', [])
                 if bpf_name in bpf_programs_by_name
@@ -2287,7 +2287,7 @@ foreach dict : executables
         kwargs = {}
         foreach key, val : dict
                 if key in ['name', 'dbus', 'public', 'conditions', 'type', 'suite',
-                           'timeout', 'parallel', 'objects', 'sources', 'extract',
+                           'timeout', 'parallel', 'sources', 'import', 'export',
                            'include_directories', 'build_by_default', 'install',
                            'bpf_programs']
                         continue
@@ -2305,9 +2305,9 @@ foreach dict : executables
                 include_directories += fs.parent(exe_sources[0])
         endif
 
-        foreach val : dict.get('objects', [])
-                obj = objects_by_name[val]
-                kwargs += { 'objects' : kwargs.get('objects', []) + obj['objects'] }
+        foreach val : dict.get('import', [])
+                obj = exported_by_name[val]
+                kwargs += { 'objects' : kwargs.get('objects', []) + obj['exported'] }
                 include_directories += obj['include_directories']
         endforeach
 
@@ -2354,11 +2354,11 @@ foreach dict : executables
                 sources += exe_sources
         endif
 
-        if dict.has_key('extract')
-                objects_by_name += {
+        if dict.has_key('export')
+                exported_by_name += {
                         name : {
-                                'objects' : exe.extract_objects(dict['extract']),
-                                'include_directories' : fs.parent(dict['extract'][0]),
+                                'exported' : exe.extract_objects(dict['export']),
+                                'include_directories' : fs.parent(dict['export'][0]),
                         }
                 }
         endif

diff --git a/src/analyze/meson.build b/src/analyze/meson.build
index a8232eb851cd2aee9bffcb2b1733ed5b802b7c07..bd8dc7ccdd5869b850d12f48c789b8a6fdcc09e1 100644 (file)
--- a/src/analyze/meson.build
+++ b/src/analyze/meson.build
@@ -49,7 +49,7 @@ executables += [
                 'name' : 'systemd-analyze',
                 'public' : conf.get('ENABLE_ANALYZE') == 1,
                 'sources' : systemd_analyze_sources,
-                'extract' : systemd_analyze_extract_sources,
+                'export' : systemd_analyze_extract_sources,
                 'include_directories' : core_includes,
                 'link_with' : [
                         libcore,
@@ -63,6 +63,6 @@ executables += [
         },
         core_test_template + {
                 'sources' : files('test-verify.c'),
-                'objects' : ['systemd-analyze'],
+                'import' : ['systemd-analyze'],
         },
 ]

diff --git a/src/busctl/meson.build b/src/busctl/meson.build
index 9aee5b0d252eb5fe791f700a8b1997e808b581f5..d878bf518685a809a65c2c9d9200271499f3d5f6 100644 (file)
--- a/src/busctl/meson.build
+++ b/src/busctl/meson.build
@@ -12,10 +12,10 @@ executables += [
                 'name' : 'busctl',
                 'public' : true,
                 'sources' : busctl_sources,
-                'extract' : busctl_extract_sources,
+                'export' : busctl_extract_sources,
         },
         test_template + {
                 'sources' : files('test-busctl-introspect.c'),
-                'objects' : ['busctl'],
+                'import' : ['busctl'],
         },
 ]

diff --git a/src/coredump/meson.build b/src/coredump/meson.build
index b1286f80ff6791f109e1b5f577f0fe34b1f7d0de..b8f6e4d97bda84d32bf837b0ce05a5aa72652552 100644 (file)
--- a/src/coredump/meson.build
+++ b/src/coredump/meson.build
@@ -36,7 +36,7 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-coredump',
                 'sources' : systemd_coredump_sources,
-                'extract' : systemd_coredump_extract_sources,
+                'export' : systemd_coredump_extract_sources,
                 'link_with' : [libshared],
                 'dependencies' : [
                         common_dependencies,
@@ -52,7 +52,7 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-coredump-vacuum.c'),
-                'objects' : ['systemd-coredump'],
+                'import' : ['systemd-coredump'],
                 'type' : 'manual',
         },
 ]

diff --git a/src/hibernate-resume/meson.build b/src/hibernate-resume/meson.build
index e18f60e3b47bb1f8138517c04d7613f843b28fef..b864d9fd84e0f01afdd8b0d211c3add6e0c2a8a8 100644 (file)
--- a/src/hibernate-resume/meson.build
+++ b/src/hibernate-resume/meson.build
@@ -8,11 +8,11 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-hibernate-resume',
                 'sources' : files('hibernate-resume.c'),
-                'extract' : files('hibernate-resume-config.c'),
+                'export' : files('hibernate-resume-config.c'),
         },
         generator_template + {
                 'name' : 'systemd-hibernate-resume-generator',
                 'sources' : files('hibernate-resume-generator.c'),
-                'objects' : ['systemd-hibernate-resume'],
+                'import' : ['systemd-hibernate-resume'],
         },
 ]

diff --git a/src/home/meson.build b/src/home/meson.build
index 2713b0463514b8f6397085e955d7730a863c8538..693a5e706f246ae37ae127c84433d2c317751e50 100644 (file)
--- a/src/home/meson.build
+++ b/src/home/meson.build
@@ -66,13 +66,13 @@ executables += [
                 'name' : 'systemd-homed',
                 'dbus' : true,
                 'sources' : systemd_homed_sources,
-                'extract' : systemd_homed_extract_sources,
+                'export' : systemd_homed_extract_sources,
                 'dependencies' : libopenssl_cflags,
         },
         libexec_template + {
                 'name' : 'systemd-homework',
                 'sources' : systemd_homework_sources,
-                'objects' : ['systemd-homed'],
+                'import' : ['systemd-homed'],
                 'dependencies' : [
                         libblkid_cflags,
                         libcryptsetup_cflags,
@@ -86,8 +86,8 @@ executables += [
                 'name' : 'homectl',
                 'public' : true,
                 'sources' : homectl_sources,
-                'extract' : homectl_extract,
-                'objects' : ['systemd-homed'],
+                'export' : homectl_extract,
+                'import' : ['systemd-homed'],
                 'dependencies' : [
                         libfido2_cflags,
                         libopenssl_cflags,
@@ -96,7 +96,7 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-homectl-prompts.c'),
-                'objects' : ['homectl'],
+                'import' : ['homectl'],
                 'type' : 'manual',
         },
         test_template + {

diff --git a/src/imds/meson.build b/src/imds/meson.build
index 9167600b651ef19873e7881733447e2570d468d3..ca54acd3f31e63c6ee8bcf0c18aa199e85d592d6 100644 (file)
--- a/src/imds/meson.build
+++ b/src/imds/meson.build
@@ -9,7 +9,7 @@ executables += [
                 'name' : 'systemd-imdsd',
                 'public' : true,
                 'sources' : files('imdsd.c'),
-                'extract' : files('imds-util.c'),
+                'export' : files('imds-util.c'),
                 'dependencies' : [
                         libcurl_cflags,
                 ],
@@ -20,12 +20,12 @@ executables += [
                 'sources' : files(
                         'imds-tool.c',
                         'imds-tool-metrics.c'),
-                'objects' : ['systemd-imdsd'],
+                'import' : ['systemd-imdsd'],
         },
         generator_template + {
                 'name' : 'systemd-imds-generator',
                 'sources' : files('imds-generator.c'),
-                'objects' : ['systemd-imdsd'],
+                'import' : ['systemd-imdsd'],
         },
 ]
 

diff --git a/src/import/meson.build b/src/import/meson.build
index e141ffb9750f5b6a8736d1433a66ff4f787f983a..54caa928dce98370fcf7734fe53485503f3c2c55 100644 (file)
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -12,7 +12,7 @@ executables += [
                         'importd.c',
                         'oci-util.c',
                 ),
-                'extract' : files(
+                'export' : files(
                         'oci-util.c',
                         'import-common.c',
                         'qcow2-util.c',
@@ -33,7 +33,7 @@ executables += [
                         'pull-raw.c',
                         'pull-tar.c',
                 ),
-                'objects' : ['systemd-importd'],
+                'import' : ['systemd-importd'],
                 'dependencies' : [
                         libcurl_cflags,
                         libopenssl_cflags,
@@ -47,7 +47,7 @@ executables += [
                         'import-raw.c',
                         'import-tar.c',
                 ),
-                'objects' : ['systemd-importd'],
+                'import' : ['systemd-importd'],
         },
         libexec_template + {
                 'name' : 'systemd-import-fs',
@@ -55,7 +55,7 @@ executables += [
                 'sources' : files(
                         'import-fs.c',
                 ),
-                'objects' : ['systemd-importd'],
+                'import' : ['systemd-importd'],
         },
         libexec_template + {
                 'name' : 'systemd-export',
@@ -65,13 +65,13 @@ executables += [
                         'export-tar.c',
                         'export-raw.c',
                 ),
-                'objects' : ['systemd-importd'],
+                'import' : ['systemd-importd'],
         },
         executable_template + {
                 'name' : 'importctl',
                 'public' : true,
                 'sources' : files('importctl.c'),
-                'objects': ['systemd-importd'],
+                'import' : ['systemd-importd'],
         },
         generator_template + {
                 'name' : 'systemd-import-generator',
@@ -86,12 +86,12 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-qcow2.c'),
-                'objects' : ['systemd-importd'],
+                'import' : ['systemd-importd'],
                 'type' : 'manual',
         },
         test_template + {
                 'sources' : files('test-oci-util.c'),
-                'objects': ['systemd-importd'],
+                'import' : ['systemd-importd'],
         },
 ]
 

diff --git a/src/integritysetup/meson.build b/src/integritysetup/meson.build
index 4f3601e68193866d47d5eb5f0793ba8397add066..7f29c031b8d4a69a75a6dc81a72423b1f6540ce1 100644 (file)
--- a/src/integritysetup/meson.build
+++ b/src/integritysetup/meson.build
@@ -8,12 +8,12 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-integritysetup',
                 'sources' : files('integritysetup.c'),
-                'extract' : files('integrity-util.c'),
+                'export' : files('integrity-util.c'),
                 'dependencies' : libcryptsetup_cflags,
         },
         generator_template + {
                 'name' : 'systemd-integritysetup-generator',
                 'sources' : files('integritysetup-generator.c'),
-                'objects' : ['systemd-integritysetup'],
+                'import' : ['systemd-integritysetup'],
         },
 ]

diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index 1338a3e673cefdb3ace28b612959b5f95d5fe7d4..a69858665f6f156f8ae0a2796444af001be87f3a 100644 (file)
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -46,7 +46,7 @@ executables += [
                 # Instead, we make sure we don't install it when the remote feature is disabled.
                 'install' : conf.get('ENABLE_REMOTE') == 1,
                 'sources' : systemd_journal_remote_sources,
-                'extract' : systemd_journal_remote_extract_sources,
+                'export' : systemd_journal_remote_extract_sources,
                 'dependencies' : common_deps + [libmicrohttpd_cflags],
         },
         libexec_template + {
@@ -57,8 +57,8 @@ executables += [
                         'HAVE_LIBCURL',
                 ],
                 'sources' : systemd_journal_upload_sources,
-                'extract' : systemd_journal_upload_extract_sources,
-                'objects' : ['systemd-journal-remote'],
+                'export' : systemd_journal_upload_extract_sources,
+                'import' : ['systemd-journal-remote'],
                 'dependencies' : [
                         common_deps,
                         libcurl_cflags,
@@ -67,11 +67,11 @@ executables += [
         test_template + {
                 'sources' : files('test-journal-header-util.c'),
                 'conditions' : ['ENABLE_REMOTE', 'HAVE_LIBCURL'],
-                'objects' : ['systemd-journal-upload'],
+                'import' : ['systemd-journal-upload'],
         },
         fuzz_template + {
                 'sources' : files('fuzz-journal-remote.c'),
-                'objects' : ['systemd-journal-remote'],
+                'import' : ['systemd-journal-remote'],
                 'dependencies' : common_deps + [libmicrohttpd_cflags],
         },
 ]

diff --git a/src/journal/meson.build b/src/journal/meson.build
index 41561deb8b3b7b53f842799c841ba7c67a02e2ba..703e9c9fe437c3a48bf9752e91cefbf712515ec6 100644 (file)
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -78,11 +78,11 @@ else
 endif
 
 journal_test_template = test_template + {
-        'objects' : ['systemd-journald'],
+        'import' : ['systemd-journald'],
 }
 
 journal_fuzz_template = fuzz_template + {
-        'objects' : [
+        'import' : [
                 'fuzz-journald-audit',
                 'systemd-journald',
         ],
@@ -93,7 +93,7 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-journald',
                 'sources' : systemd_journald_sources,
-                'extract' : systemd_journald_extract_sources,
+                'export' : systemd_journald_extract_sources,
                 'dependencies' : [
                         libacl_cflags,
                         libaudit_cflags,
@@ -117,7 +117,7 @@ executables += [
                 'name' : 'systemd-cat',
                 'public' : true,
                 'sources' : files('cat.c'),
-                'objects' : ['systemd-journald'],
+                'import' : ['systemd-journald'],
         },
         executable_template + {
                 'name' : 'journalctl',
@@ -168,8 +168,8 @@ executables += [
         fuzz_template + {
                 'sources' : files('fuzz-journald-audit.c'),
                 # fuzz-journald-util.c is shared with the other fuzzers below.
-                'extract' : files('fuzz-journald-util.c'),
-                'objects' : ['systemd-journald'],
+                'export' : files('fuzz-journald-util.c'),
+                'import' : ['systemd-journald'],
         },
         journal_fuzz_template + {
                 'sources' : files('fuzz-journald-kmsg.c'),

diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build
index 7340bed03855fb5bd70320e4e0863b611021716a..2ac7d29fffe0a030515dcb829135957dc93e572c 100644 (file)
--- a/src/libsystemd-network/meson.build
+++ b/src/libsystemd-network/meson.build
@@ -116,11 +116,11 @@ executables += [
         },
         network_test_template + {
                 'sources' : files('test-ndisc-ra.c'),
-                'extract' : files('icmp6-test-util.c'),
+                'export' : files('icmp6-test-util.c'),
         },
         network_test_template + {
                 'sources' : files('test-ndisc-rs.c'),
-                'objects' : ['test-ndisc-ra'],
+                'import' : ['test-ndisc-ra'],
         },
         network_test_template + {
                 'sources' : files('test-ndisc-send.c'),
@@ -146,6 +146,6 @@ executables += [
         },
         network_fuzz_template + {
                 'sources' : files('fuzz-ndisc-rs.c'),
-                'objects' : ['test-ndisc-ra'],
+                'import' : ['test-ndisc-ra'],
         },
 ]

diff --git a/src/locale/meson.build b/src/locale/meson.build
index 2f99bb8d8072ae263908ef1f86e58590fbc0b5cf..fa3651ace074e2afcf87ed531df45f791486fe3f 100644 (file)
--- a/src/locale/meson.build
+++ b/src/locale/meson.build
@@ -29,7 +29,7 @@ executables += [
                 'name' : 'systemd-localed',
                 'dbus' : true,
                 'sources' : systemd_localed_sources,
-                'extract' : systemd_localed_extract_sources,
+                'export' : systemd_localed_extract_sources,
                 'dependencies' : libxkbcommon_deps,
         },
         executable_template + {
@@ -39,7 +39,7 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-localed-util.c'),
-                'objects' : ['systemd-localed'],
+                'import' : ['systemd-localed'],
                 'dependencies' : libxkbcommon_deps,
         },
 ]

diff --git a/src/login/meson.build b/src/login/meson.build
index effb44c3a8314372be24cd9a784a4bf3c7dee533..e718e1f44f2f24a010f808d20200916f46864d8f 100644 (file)
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -47,7 +47,7 @@ executables += [
                 'name' : 'systemd-logind',
                 'dbus' : true,
                 'sources' : systemd_logind_sources,
-                'extract' : systemd_logind_extract_sources,
+                'export' : systemd_logind_extract_sources,
                 'dependencies' : [
                         libacl_cflags,
                 ],
@@ -77,7 +77,7 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-login-tables.c'),
-                'objects' : ['systemd-logind'],
+                'import' : ['systemd-logind'],
         },
         test_template + {
                 'sources' : files('test-session-properties.c'),

diff --git a/src/machine/meson.build b/src/machine/meson.build
index fc16e9f5c5f32d31b4cdd1ca43e04d29af1d5032..40cab032ecd908808c7e78c36ffc0ffdf8adcfe9 100644 (file)
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -26,7 +26,7 @@ executables += [
                 'name' : 'systemd-machined',
                 'dbus' : true,
                 'sources' : systemd_machined_sources,
-                'extract' : systemd_machined_extract_sources,
+                'export' : systemd_machined_extract_sources,
         },
         executable_template + {
                 'name' : 'machinectl',
@@ -40,7 +40,7 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-machine-tables.c'),
-                'objects' : ['systemd-machined'],
+                'import' : ['systemd-machined'],
         },
 ]
 

diff --git a/src/network/meson.build b/src/network/meson.build
index b620e512df77609c56090dc963db62a824fccb03..53e2fa149626709e701d004a952ef0c17c955ac6 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -178,7 +178,7 @@ network_test_template = test_template + {
                 networkd_link_with,
                 libsystemd_network,
         ],
-        'objects' : ['systemd-networkd'],
+        'import' : ['systemd-networkd'],
         'include_directories' : network_includes,
 }
 
@@ -188,7 +188,7 @@ network_fuzz_template = fuzz_template + {
                 networkd_link_with,
                 libsystemd_network,
         ],
-        'objects' : ['systemd-networkd'],
+        'import' : ['systemd-networkd'],
         'include_directories' : network_includes,
 }
 
@@ -198,7 +198,7 @@ executables += [
                 'dbus' : true,
                 'conditions' : ['ENABLE_NETWORKD'],
                 'sources' : systemd_networkd_sources,
-                'extract' : systemd_networkd_extract_sources,
+                'export' : systemd_networkd_extract_sources,
                 'include_directories' : network_includes,
                 'link_with' : [
                         libsystemd_network,
@@ -235,12 +235,12 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-network-generator',
                 'sources' : files('generator/network-generator-main.c'),
-                'extract' : files('generator/network-generator.c'),
+                'export' : files('generator/network-generator.c'),
                 'link_with' : networkd_link_with,
         },
         test_template + {
                 'sources' : files('generator/test-network-generator.c'),
-                'objects' : ['systemd-network-generator'],
+                'import' : ['systemd-network-generator'],
                 'suite' : 'network',
         },
         network_test_template + {

diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build
index 95bc461cc5a08c9ca3af101ddb9bf9d4f4ca1694..c362aff4ac033fd60717c96dffd4c7e72a3f11c8 100644 (file)
--- a/src/nspawn/meson.build
+++ b/src/nspawn/meson.build
@@ -31,7 +31,7 @@ nspawn_extract_sources += nspawn_gperf_c
 
 nspawn_common_template = {
         'dependencies' : libseccomp_cflags,
-        'objects' : ['systemd-nspawn'],
+        'import' : ['systemd-nspawn'],
 }
 nspawn_test_template = test_template + nspawn_common_template
 nspawn_fuzz_template = fuzz_template + nspawn_common_template
@@ -41,7 +41,7 @@ executables += [
                 'name' : 'systemd-nspawn',
                 'public' : true,
                 'sources' : nspawn_sources,
-                'extract' : nspawn_extract_sources,
+                'export' : nspawn_extract_sources,
                 'include_directories' : [
                         include_directories('.'),
                         executable_template['include_directories'],

diff --git a/src/nsresourced/meson.build b/src/nsresourced/meson.build
index 2037d06bc8a412e8c4031dddc253fa4b77863950..1e950250bbcdfc8e2fc141c7981ca51249be20c8 100644 (file)
--- a/src/nsresourced/meson.build
+++ b/src/nsresourced/meson.build
@@ -23,7 +23,7 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-nsresourced',
                 'sources' : systemd_nsresourced_sources,
-                'extract' : systemd_nsresourced_extract_sources,
+                'export' : systemd_nsresourced_extract_sources,
                 'dependencies' : [
                         libbpf_cflags,
                 ],
@@ -32,13 +32,13 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-nsresourcework',
                 'sources' : systemd_nsresourcework_sources,
-                'objects' : ['systemd-nsresourced'],
+                'import' : ['systemd-nsresourced'],
                 'bpf_programs': ['userns-restrict'],
         },
         test_template + {
                 'sources' : test_userns_restrict_sources,
                 'conditions' : ['HAVE_VMLINUX_H'],
-                'objects' : ['systemd-nsresourced'],
+                'import' : ['systemd-nsresourced'],
                 'bpf_programs': ['userns-restrict'],
         },
 ]

diff --git a/src/oom/meson.build b/src/oom/meson.build
index 95541e5542c6a174aae6e36bb062ee2f1ab5b190..96ab9bd8237294abc2f17339d2bd7870e7981a94 100644 (file)
--- a/src/oom/meson.build
+++ b/src/oom/meson.build
@@ -19,7 +19,7 @@ executables += [
                 'name' : 'systemd-oomd',
                 'dbus' : true,
                 'sources' : systemd_oomd_sources,
-                'extract' : systemd_oomd_extract_sources,
+                'export' : systemd_oomd_extract_sources,
                 'dependencies' : libatomic,
         },
         executable_template + {
@@ -29,7 +29,7 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-oomd-util.c'),
-                'objects' : ['systemd-oomd'],
+                'import' : ['systemd-oomd'],
                 'dependencies' : libatomic,
         },
 ]

diff --git a/src/repart/meson.build b/src/repart/meson.build
index 721fe73b9ae9e4ddb10f33852aa6e5eb61b5bf59..d7c2edf0d532f2bc97d72ecad35e0b14c7740dde 100644 (file)
--- a/src/repart/meson.build
+++ b/src/repart/meson.build
@@ -8,7 +8,7 @@ executables += [
         executable_template + {
                 'name' : 'systemd-repart',
                 'public' : true,
-                'extract' : files(
+                'export' : files(
                         'iso9660.c',
                         'repart.c',
                         'repart-list-candidate-devices.c',
@@ -25,7 +25,7 @@ executables += [
         executable_template + {
                 'name' : 'systemd-repart.standalone',
                 'public' : true,
-                'objects' : ['systemd-repart'],
+                'import' : ['systemd-repart'],
                 'link_with' : [
                         libc_wrapper_static,
                         libbasic_static,

diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 019c4b7bb06c4c9f5282172e49abfb249da6ee0d..1e0e7e30f396e1618929acff3b226dd4fe35e36c 100644 (file)
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -74,15 +74,15 @@ resolve_common_template = {
         ],
 }
 
-resolve_test_template = test_template + resolve_common_template + {'objects' : ['systemd-resolved']}
-resolve_fuzz_template = fuzz_template + resolve_common_template + {'objects' : ['systemd-resolved']}
+resolve_test_template = test_template + resolve_common_template + {'import' : ['systemd-resolved']}
+resolve_fuzz_template = fuzz_template + resolve_common_template + {'import' : ['systemd-resolved']}
 
 executables += [
         libexec_template + resolve_common_template + {
                 'name' : 'systemd-resolved',
                 'dbus' : true,
                 'sources' : systemd_resolved_sources,
-                'extract' : systemd_resolved_extract_sources,
+                'export' : systemd_resolved_extract_sources,
         },
         executable_template + resolve_common_template + {
                 'name' : 'resolvectl',
@@ -91,7 +91,7 @@ executables += [
                         'resolvconf-compat.c',
                         'resolvectl.c',
                 ),
-                'objects' : ['systemd-resolved'],
+                'import' : ['systemd-resolved'],
         },
         resolve_test_template + {
                 'sources' : files('test-resolve-tables.c'),

diff --git a/src/shutdown/meson.build b/src/shutdown/meson.build
index 709b0fa69257d9893f4804f096d6ae5f7c41ec80..98669bfdf3fbe2fbf15a5d0b3430ba8b909e030e 100644 (file)
--- a/src/shutdown/meson.build
+++ b/src/shutdown/meson.build
@@ -12,7 +12,7 @@ shutdown_detach_sources = files(
 executables += [
         libexec_template + {
                 'name' : 'systemd-shutdown',
-                'extract' : files(
+                'export' : files(
                         'detach-dm.c',
                         'detach-loopback.c',
                         'detach-md.c',
@@ -22,7 +22,7 @@ executables += [
         },
         libexec_template + {
                 'name' : 'systemd-shutdown.standalone',
-                'objects' : ['systemd-shutdown'],
+                'import' : ['systemd-shutdown'],
                 'link_with' : [
                         libc_wrapper_static,
                         libbasic_static,

diff --git a/src/sleep/meson.build b/src/sleep/meson.build
index 7411aa1cebda0cee11eb6704881e87dab480b51b..663a36e038da57423755478500dcd39cfa0d7ff4 100644 (file)
--- a/src/sleep/meson.build
+++ b/src/sleep/meson.build
@@ -4,11 +4,11 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-sleep',
                 'sources' : files('sleep.c'),
-                'extract' : files('battery-capacity.c'),
+                'export' : files('battery-capacity.c'),
         },
         test_template + {
                 'sources' : files('test-battery-capacity.c'),
-                'objects' : ['systemd-sleep'],
+                'import' : ['systemd-sleep'],
         },
 ]
 

diff --git a/src/ssh-generator/meson.build b/src/ssh-generator/meson.build
index f6babb47d3a4b6d251cc2348075eef22fe0b1237..65e34cfba8b36b5006e40da781ab98723df52bdf 100644 (file)
--- a/src/ssh-generator/meson.build
+++ b/src/ssh-generator/meson.build
@@ -4,7 +4,7 @@ executables += [
         generator_template + {
                 'name' : 'systemd-ssh-generator',
                 'sources' : files('ssh-generator.c'),
-                'extract' : files('ssh-util.c'),
+                'export' : files('ssh-util.c'),
         },
         libexec_template + {
                 'name' : 'systemd-ssh-proxy',
@@ -13,7 +13,7 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-ssh-issue',
                 'sources' : files('ssh-issue.c'),
-                'objects' : ['systemd-ssh-generator'],
+                'import' : ['systemd-ssh-generator'],
         },
 ]
 

diff --git a/src/systemctl/meson.build b/src/systemctl/meson.build
index c287f8a490384e2dc3cf3a998560def05733083b..150435989da4328b33a5c0f1ba68b1a490bb5e14 100644 (file)
--- a/src/systemctl/meson.build
+++ b/src/systemctl/meson.build
@@ -52,7 +52,7 @@ executables += [
                 'name' : 'systemctl',
                 'public' : true,
                 'sources' : systemctl_sources,
-                'extract' : systemctl_extract_sources,
+                'export' : systemctl_extract_sources,
                 'link_with' : systemctl_link_with,
                 'dependencies' : [
                         liblz4_cflags,
@@ -63,7 +63,7 @@ executables += [
         },
         fuzz_template + {
                 'sources' : files('fuzz-systemctl-parse-argv.c'),
-                'objects' : ['systemctl'],
+                'import' : ['systemctl'],
                 'link_with' : systemctl_link_with,
                 'dependencies' : [
                         libselinux_cflags,

diff --git a/src/sysupdate/meson.build b/src/sysupdate/meson.build
index ec873269047e89802c381e2253d6d9f37fceab05..f13e70b49faf52b0d6f27111ff87af32b774d8a5 100644 (file)
--- a/src/sysupdate/meson.build
+++ b/src/sysupdate/meson.build
@@ -29,7 +29,7 @@ executables += [
                 'public' : true,
                 'conditions' : ['ENABLE_SYSUPDATE'],
                 'sources' : systemd_sysupdate_sources,
-                'extract' : systemd_sysupdate_extract_sources,
+                'export' : systemd_sysupdate_extract_sources,
                 'dependencies' : [
                         libfdisk_cflags,
                         libopenssl_cflags,
@@ -45,12 +45,12 @@ executables += [
                 'name' : 'updatectl',
                 'public' : true,
                 'sources' : systemd_updatectl_sources,
-                'objects' : ['systemd-sysupdate'],
+                'import' : ['systemd-sysupdate'],
                 'conditions' : ['ENABLE_SYSUPDATED'],
         },
         test_template + {
                 'sources' : files('test-sysupdate-util.c'),
-                'objects' : ['systemd-sysupdate'],
+                'import' : ['systemd-sysupdate'],
                 'conditions' : ['ENABLE_SYSUPDATE'],
         },
 ]

diff --git a/src/sysusers/meson.build b/src/sysusers/meson.build
index b74ac6aa1a8c4fb7f32345f1cb72878fcd642608..9ff149d72d2d0290740389a196ab7dc0589b0d51 100644 (file)
--- a/src/sysusers/meson.build
+++ b/src/sysusers/meson.build
@@ -8,13 +8,13 @@ executables += [
         executable_template + {
                 'name' : 'systemd-sysusers',
                 'public' : true,
-                'extract' : files('sysusers.c'),
+                'export' : files('sysusers.c'),
                 'dependencies' : libaudit_cflags,
         },
         executable_template + {
                 'name' : 'systemd-sysusers.standalone',
                 'public' : true,
-                'objects' : ['systemd-sysusers'],
+                'import' : ['systemd-sysusers'],
                 'link_with' : [
                         libc_wrapper_static,
                         libbasic_static,

diff --git a/src/test/meson.build b/src/test/meson.build
index d7353ce8e2ce54661302882656274adbed5682c9..2cb18a798a88867620cb755c26b421ed84ffb2c9 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -438,14 +438,14 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-nss-hosts.c'),
-                'extract' : files('nss-test-util.c'),
+                'export' : files('nss-test-util.c'),
                 'dependencies' : libseccomp_cflags,
                 'conditions' : ['ENABLE_NSS'],
                 'timeout' : 120,
         },
         test_template + {
                 'sources' : files('test-nss-users.c'),
-                'objects' : ['test-nss-hosts'],
+                'import' : ['test-nss-hosts'],
                 'conditions' : ['ENABLE_NSS'],
         },
         test_template + {
@@ -463,7 +463,7 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-qmp-client-qemu.c'),
-                'objects' : ['systemd-vmspawn'],
+                'import' : ['systemd-vmspawn'],
                 'conditions' : ['ENABLE_VMSPAWN'],
         },
         test_template + {
@@ -517,12 +517,12 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-varlink-idl-machine.c'),
-                'objects' : ['systemd-machined'],
+                'import' : ['systemd-machined'],
                 'conditions' : ['ENABLE_MACHINED'],
         },
         test_template + {
                 'sources' : files('test-varlink-idl-login.c'),
-                'objects' : ['systemd-logind'],
+                'import' : ['systemd-logind'],
                 'conditions' : ['ENABLE_LOGIND'],
         },
         test_template + {

diff --git a/src/timesync/meson.build b/src/timesync/meson.build
index c42fcd3e7096336d9d3cc38610ec9471f4f669d8..d52b16ef7a5399a66cc9f585b5ef1f42fe9fcaf9 100644 (file)
--- a/src/timesync/meson.build
+++ b/src/timesync/meson.build
@@ -33,19 +33,19 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-timesyncd',
                 'sources' : timesyncd_sources,
-                'extract' : timesyncd_extract_sources,
+                'export' : timesyncd_extract_sources,
                 'link_with' : timesyncd_link_with,
                 'dependencies' : libm,
         },
         libexec_template + {
                 'name' : 'systemd-time-wait-sync',
                 'sources' : files('wait-sync.c'),
-                'objects' : ['systemd-timesyncd'],
+                'import' : ['systemd-timesyncd'],
                 'dependencies' : libm,
         },
         test_template + {
                 'sources' : files('test-timesync.c'),
-                'objects' : ['systemd-timesyncd'],
+                'import' : ['systemd-timesyncd'],
                 'dependencies' : libm,
         },
 ]

diff --git a/src/tmpfiles/meson.build b/src/tmpfiles/meson.build
index fcf2749e4bf2bd2715f19ff5834762051907bdaf..5f661c19259de87c97815deef45e6bd697e9ca9b 100644 (file)
--- a/src/tmpfiles/meson.build
+++ b/src/tmpfiles/meson.build
@@ -10,7 +10,7 @@ executables += [
         executable_template + {
                 'name' : 'systemd-tmpfiles',
                 'public' : true,
-                'extract' : files('tmpfiles.c') +
+                'export' : files('tmpfiles.c') +
                             offline_passwd_c,
                 'dependencies' : [
                         libacl_cflags,
@@ -20,7 +20,7 @@ executables += [
         executable_template + {
                 'name' : 'systemd-tmpfiles.standalone',
                 'public' : true,
-                'objects' : ['systemd-tmpfiles'],
+                'import' : ['systemd-tmpfiles'],
                 'link_with' : [
                         libc_wrapper_static,
                         libbasic_static,

diff --git a/src/udev/meson.build b/src/udev/meson.build
index 6c2232c74c6dc289873b529e8681993a72c208ec..da386ae9c167b7165888618a76b08f4b5f131b39 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -135,7 +135,7 @@ udev_plugin_template = executable_template + {
 }
 
 udev_common_template = {
-        'objects' : ['udevadm'],
+        'import' : ['udevadm'],
         'dependencies' : [
                 libacl_cflags,
                 libblkid_cflags,
@@ -150,7 +150,7 @@ udev_binaries_dict = [
                 'public' : true,
                 'sources' : udevadm_sources +
                             keyboard_keys_from_name_inc,
-                'extract' : udevadm_extract_sources,
+                'export' : udevadm_extract_sources,
                 'include_directories' : [
                         include_directories('.', 'net'),
                         libexec_template['include_directories'],
@@ -176,7 +176,7 @@ udev_binaries_dict = [
         udev_plugin_template + {
                 'name' : 'fido_id',
                 'sources' : files('fido_id/fido_id.c'),
-                'extract' : files('fido_id/fido_id_desc.c'),
+                'export' : files('fido_id/fido_id_desc.c'),
         },
         udev_plugin_template + {
                 'name' : 'iocost',
@@ -211,7 +211,7 @@ executables += udev_binaries_dict
 executables += [
         test_template + {
                 'sources' : files('fido_id/test-fido-id-desc.c'),
-                'objects' : ['fido_id'],
+                'import' : ['fido_id'],
                 'suite' : 'udev',
         },
         udev_test_template + {
@@ -245,7 +245,7 @@ executables += [
         },
         fuzz_template + {
                 'sources' : files('fido_id/fuzz-fido-id-desc.c'),
-                'objects' : ['fido_id'],
+                'import' : ['fido_id'],
         },
         udev_fuzz_template + {
                 'sources' : files('net/fuzz-link-parser.c'),

diff --git a/src/vmspawn/meson.build b/src/vmspawn/meson.build
index 76617cc6d46e3b5cefb30690b232b725c2f27983..f804ff892607de3ff39685835d59acfc713e45a4 100644 (file)
--- a/src/vmspawn/meson.build
+++ b/src/vmspawn/meson.build
@@ -23,14 +23,14 @@ executables += [
                 'name' : 'systemd-vmspawn',
                 'public' : true,
                 'sources' : vmspawn_sources,
-                'extract' : vmspawn_extract_sources,
+                'export' : vmspawn_extract_sources,
         },
         test_template + {
                 'sources' : files('test-vmspawn-util.c'),
-                'objects' : ['systemd-vmspawn'],
+                'import' : ['systemd-vmspawn'],
         },
         test_template + {
                 'sources' : files('test-vmspawn-qemu-config.c'),
-                'objects' : ['systemd-vmspawn'],
+                'import' : ['systemd-vmspawn'],
         },
 ]

diff --git a/src/xdg-autostart-generator/meson.build b/src/xdg-autostart-generator/meson.build
index 752ee9f8abf6c25f1f9471ebf6b598dce6de5c52..110fe3971d2298db273b812489790de915c07062 100644 (file)
--- a/src/xdg-autostart-generator/meson.build
+++ b/src/xdg-autostart-generator/meson.build
@@ -8,7 +8,7 @@ executables += [
         executable_template + {
                 'name' : 'systemd-xdg-autostart-generator',
                 'sources' : files('xdg-autostart-generator.c'),
-                'extract' : files('xdg-autostart-service.c'),
+                'export' : files('xdg-autostart-service.c'),
                 'install_dir' : usergeneratordir,
         },
         libexec_template + {
@@ -17,10 +17,10 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-xdg-autostart.c'),
-                'objects' : ['systemd-xdg-autostart-generator'],
+                'import' : ['systemd-xdg-autostart-generator'],
         },
         fuzz_template + {
                 'sources' : files('fuzz-xdg-desktop.c'),
-                'objects' : ['systemd-xdg-autostart-generator'],
+                'import' : ['systemd-xdg-autostart-generator'],
         },
 ]