summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am6
-rw-r--r--docs/sysvinit/meson.build7
-rw-r--r--docs/var-log/meson.build7
-rw-r--r--meson.build39
-rw-r--r--src/hostname/meson.build10
-rw-r--r--src/journal-remote/meson.build16
-rw-r--r--src/locale/meson.build8
-rw-r--r--src/machine/meson.build3
-rw-r--r--src/network/meson.build8
-rw-r--r--src/resolve/meson.build6
-rw-r--r--src/shared/meson.build17
-rw-r--r--src/test/meson.build51
-rw-r--r--units/meson.build4
13 files changed, 74 insertions, 108 deletions
diff --git a/Makefile.am b/Makefile.am
index 8339625a62..f5f2793f5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5599,6 +5599,9 @@ GENERAL_ALIASES += \
nodist_pkgsysconf_DATA += \
src/resolve/resolved.conf
+dist_rootlibexec_DATA += \
+ src/resolve/resolv.conf
+
libnss_resolve_la_SOURCES = \
src/nss-resolve/nss-resolve.sym \
src/nss-resolve/nss-resolve.c
@@ -5737,9 +5740,6 @@ EXTRA_DIST += \
units/systemd-resolved.service.m4.in \
src/resolve/resolved.conf.in
-dist_rootlibexec_DATA += \
- src/resolve/resolv.conf
-
# ------------------------------------------------------------------------------
if ENABLE_NETWORKD
rootlibexec_PROGRAMS += \
diff --git a/docs/sysvinit/meson.build b/docs/sysvinit/meson.build
index 36b2f6f98c..a8f5b519a3 100644
--- a/docs/sysvinit/meson.build
+++ b/docs/sysvinit/meson.build
@@ -2,5 +2,8 @@ file = configure_file(
input : 'README.in',
output : 'README',
configuration : substs)
-install_data(file,
- install_dir : sysvinit_path)
+
+if conf.get('HAVE_SYSV_COMPAT', 0) == 1
+ install_data(file,
+ install_dir : sysvinit_path)
+endif
diff --git a/docs/var-log/meson.build b/docs/var-log/meson.build
index 43078c40e9..c833f0f5b0 100644
--- a/docs/var-log/meson.build
+++ b/docs/var-log/meson.build
@@ -2,5 +2,8 @@ file = configure_file(
input : 'README.in',
output : 'README',
configuration : substs)
-install_data(file,
- install_dir : varlogdir)
+
+if conf.get('HAVE_SYSV_COMPAT', 0) == 1
+ install_data(file,
+ install_dir : varlogdir)
+endif
diff --git a/meson.build b/meson.build
index fa0ef168f8..79843c7319 100644
--- a/meson.build
+++ b/meson.build
@@ -1197,8 +1197,7 @@ executable('systemd',
systemd_sources,
include_directories : includes,
link_with : [libcore,
- libshared,
- libudev],
+ libshared],
dependencies : [threads,
librt,
libseccomp,
@@ -1213,7 +1212,6 @@ exe = executable('systemd-analyze',
systemd_analyze_sources,
include_directories : includes,
link_with : [libcore,
- libudev,
libshared],
dependencies : [threads,
librt,
@@ -1229,8 +1227,7 @@ executable('systemd-journald',
systemd_journald_sources,
include_directories : includes,
link_with : [libjournal_core,
- libshared,
- libudev],
+ libshared],
dependencies : [threads,
libxz,
liblz4,
@@ -1243,8 +1240,7 @@ exe = executable('systemd-cat',
systemd_cat_sources,
include_directories : includes,
link_with : [libjournal_core,
- libshared,
- libudev],
+ libshared],
dependencies : [threads],
install_rpath : rootlibexecdir,
install : true)
@@ -1253,8 +1249,7 @@ public_programs += [exe]
exe = executable('journalctl',
journalctl_sources,
include_directories : includes,
- link_with : [libshared,
- libudev],
+ link_with : [libshared],
dependencies : [threads,
libqrencode,
libxz,
@@ -1326,8 +1321,7 @@ if conf.get('HAVE_BLKID', 0) == 1
'src/gpt-auto-generator/gpt-auto-generator.c',
'src/basic/blkid-util.h',
include_directories : includes,
- link_with : [libshared,
- libudev],
+ link_with : [libshared],
dependencies : libblkid,
install_rpath : rootlibexecdir,
install : true,
@@ -1378,8 +1372,7 @@ if conf.get('ENABLE_LOGIND', 0) == 1
systemd_logind_sources,
include_directories : includes,
link_with : [liblogind_core,
- libshared,
- libudev],
+ libshared],
dependencies : [threads,
libacl],
install_rpath : rootlibexecdir,
@@ -1389,8 +1382,7 @@ if conf.get('ENABLE_LOGIND', 0) == 1
exe = executable('loginctl',
loginctl_sources,
include_directories : includes,
- link_with : [libshared,
- libudev],
+ link_with : [libshared],
dependencies : [threads,
liblz4,
libxz],
@@ -1478,8 +1470,7 @@ if conf.get('ENABLE_BACKLIGHT', 0) == 1
executable('systemd-backlight',
'src/backlight/backlight.c',
include_directories : includes,
- link_with : [libshared,
- libudev],
+ link_with : [libshared],
install_rpath : rootlibexecdir,
install : true,
install_dir : rootlibexecdir)
@@ -1489,8 +1480,7 @@ if conf.get('ENABLE_RFKILL', 0) == 1
executable('systemd-rfkill',
'src/rfkill/rfkill.c',
include_directories : includes,
- link_with : [libshared,
- libudev],
+ link_with : [libshared],
install_rpath : rootlibexecdir,
install : true,
install_dir : rootlibexecdir)
@@ -1988,8 +1978,7 @@ executable('systemd-initctl',
exe = executable('systemd-mount',
'src/mount/mount-tool.c',
include_directories : includes,
- link_with : [libshared,
- libudev],
+ link_with : [libshared],
install_rpath : rootlibexecdir,
install : true)
public_programs += [exe]
@@ -2113,8 +2102,7 @@ public_programs += [exe]
executable('systemd-shutdown',
systemd_shutdown_sources,
include_directories : includes,
- link_with : [libshared,
- libudev],
+ link_with : [libshared],
install_rpath : rootlibexecdir,
install : true,
install_dir : rootlibexecdir)
@@ -2159,9 +2147,7 @@ exe = executable('systemd-nspawn',
'src/core/loopback-setup.c',
'src/core/loopback-setup.h',
include_directories : [includes, include_directories('src/nspawn')],
- link_with : [libfirewall,
- libshared,
- libudev],
+ link_with : [libshared],
dependencies : [libacl,
libblkid,
libseccomp,
@@ -2175,7 +2161,6 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
systemd_networkd_sources,
include_directories : includes,
link_with : [libnetworkd_core,
- libfirewall,
libsystemd_network,
libudev_internal,
libshared],
diff --git a/src/hostname/meson.build b/src/hostname/meson.build
index 68275ba8f5..7cb5fc135a 100644
--- a/src/hostname/meson.build
+++ b/src/hostname/meson.build
@@ -1,9 +1,9 @@
-install_data('org.freedesktop.hostname1.conf',
- install_dir : dbuspolicydir)
-install_data('org.freedesktop.hostname1.service',
- install_dir : dbussystemservicedir)
-
if conf.get('ENABLE_HOSTNAMED', 0) == 1
+ install_data('org.freedesktop.hostname1.conf',
+ install_dir : dbuspolicydir)
+ install_data('org.freedesktop.hostname1.service',
+ install_dir : dbussystemservicedir)
+
custom_target(
'org.freedesktop.hostname1.policy',
input : 'org.freedesktop.hostname1.policy.in',
diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index 394be7068c..072fa14548 100644
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -37,13 +37,13 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1
configuration : substs)
install_data(journal_remote_conf,
install_dir : pkgsysconfdir)
-endif
-install_data('browse.html',
- install_dir : join_paths(pkgdatadir, 'gatewayd'))
+ install_data('browse.html',
+ install_dir : join_paths(pkgdatadir, 'gatewayd'))
-meson.add_install_script('sh', '-c',
- mkdir_p.format('/var/log/journal/remote'))
-meson.add_install_script('sh', '-c',
- 'chown 0:0 $DESTDIR/var/log/journal/remote &&
- chmod 755 $DESTDIR/var/log/journal/remote || :')
+ meson.add_install_script('sh', '-c',
+ mkdir_p.format('/var/log/journal/remote'))
+ meson.add_install_script('sh', '-c',
+ 'chown 0:0 $DESTDIR/var/log/journal/remote &&
+ chmod 755 $DESTDIR/var/log/journal/remote || :')
+endif
diff --git a/src/locale/meson.build b/src/locale/meson.build
index f722e0ed92..d03af4c0e2 100644
--- a/src/locale/meson.build
+++ b/src/locale/meson.build
@@ -27,9 +27,11 @@ endif
kbd_model_map = join_paths(meson.current_source_dir(), 'kbd-model-map')
language_fallback_map = join_paths(meson.current_source_dir(), 'language-fallback-map')
-install_data('kbd-model-map',
- 'language-fallback-map',
- install_dir : pkgdatadir)
+if conf.get('ENABLE_LOCALED', 0) == 1
+ install_data('kbd-model-map',
+ 'language-fallback-map',
+ install_dir : pkgdatadir)
+endif
tests += [
[['src/locale/test-keymap-util.c',
diff --git a/src/machine/meson.build b/src/machine/meson.build
index 4ecb1cdb93..953774fdb6 100644
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -39,8 +39,7 @@ endif
tests += [
[['src/machine/test-machine-tables.c'],
[libmachine_core,
- libshared,
- libudev],
+ libshared],
[threads],
'ENABLE_MACHINED'],
]
diff --git a/src/network/meson.build b/src/network/meson.build
index 94bbb156aa..771aa68ec1 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -128,9 +128,8 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
[libnetworkd_core,
libudev_internal,
libsystemd_network,
- libshared,
- libfirewall],
- [libiptc]],
+ libshared],
+ []],
[['src/network/test-network-tables.c',
'src/network/test-network-tables.c',
@@ -139,8 +138,7 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
libudev_internal,
libudev_core,
libsystemd_network,
- libshared,
- libfirewall],
+ libshared],
[],
'', '', [],
[network_include_dir] + libudev_core_includes],
diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 46a417e766..347ffaaeca 100644
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -135,10 +135,10 @@ if conf.get('ENABLE_RESOLVED', 0) == 1
configuration : substs)
install_data(resolved_conf,
install_dir : pkgsysconfdir)
-endif
-install_data('resolv.conf',
- install_dir : rootlibexecdir)
+ install_data('resolv.conf',
+ install_dir : rootlibexecdir)
+endif
tests += [
[['src/resolve/test-resolve-tables.c',
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 8968127d3f..0747f76649 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -34,6 +34,7 @@ shared_sources = '''
efivars.h
fdset.c
fdset.h
+ firewall-util.h
fstab-util.c
fstab-util.h
gcrypt-util.c
@@ -114,6 +115,10 @@ if conf.get('HAVE_SECCOMP', 0) == 1
shared_sources += ['seccomp-util.c']
endif
+if conf.get('HAVE_LIBIPTC', 0) == 1
+ shared_sources += ['firewall-util.c']
+endif
+
libshared_name = 'systemd-shared-@0@'.format(meson.project_version())
libshared = shared_library(
@@ -152,21 +157,9 @@ libshared_static = static_library(
libcap,
libacl,
libcryptsetup,
- libiptc,
libseccomp,
libselinux,
libidn,
libxz,
liblz4,
libblkid])
-
-if conf.get('HAVE_LIBIPTC', 0) == 1
- libfirewall = static_library(
- 'firewall',
- 'firewall-util.h',
- 'firewall-util.c',
- include_directories : includes,
- dependencies : [libiptc])
-else
- libfirewall = []
-endif
diff --git a/src/test/meson.build b/src/test/meson.build
index 6c0fd4dca9..4ae1210fe1 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -55,8 +55,7 @@ tests += [
[['src/test/test-job-type.c'],
[libcore,
- libshared,
- libudev],
+ libshared],
[threads,
librt,
libseccomp,
@@ -66,8 +65,7 @@ tests += [
[['src/test/test-ns.c'],
[libcore,
- libshared,
- libudev],
+ libshared],
[threads,
librt,
libseccomp,
@@ -88,8 +86,7 @@ tests += [
[['src/test/test-hostname.c'],
[libcore,
- libshared,
- libudev],
+ libshared],
[threads,
librt,
libseccomp,
@@ -110,8 +107,7 @@ tests += [
[['src/test/test-unit-name.c'],
[libcore,
- libshared,
- libudev],
+ libshared],
[threads,
librt,
libseccomp,
@@ -121,8 +117,7 @@ tests += [
[['src/test/test-unit-file.c'],
[libcore,
- libshared,
- libudev],
+ libshared],
[threads,
librt,
libseccomp,
@@ -285,8 +280,7 @@ tests += [
[['src/test/test-namespace.c'],
[libcore,
- libshared,
- libudev],
+ libshared],
[threads,
libblkid]],
@@ -415,8 +409,7 @@ tests += [
[['src/test/test-firewall-util.c'],
- [libfirewall,
- libshared],
+ [libshared],
[],
'HAVE_LIBIPTC'],
@@ -461,8 +454,7 @@ tests += [
[['src/test/test-cgroup-mask.c'],
[libcore,
- libshared,
- libudev],
+ libshared],
[threads,
librt,
libseccomp,
@@ -492,8 +484,7 @@ tests += [
[['src/test/test-path.c'],
[libcore,
- libshared,
- libudev],
+ libshared],
[threads,
librt,
libseccomp,
@@ -503,8 +494,7 @@ tests += [
[['src/test/test-execute.c'],
[libcore,
- libshared,
- libudev],
+ libshared],
[threads,
librt,
libseccomp,
@@ -532,8 +522,7 @@ tests += [
[['src/test/test-sched-prio.c'],
[libcore,
- libshared,
- libudev],
+ libshared],
[threads,
librt,
libseccomp,
@@ -564,8 +553,7 @@ tests += [
[]],
[['src/test/test-libudev.c'],
- [libshared,
- libudev],
+ [libshared],
[]],
[['src/test/test-udev.c'],
@@ -615,8 +603,7 @@ tests += [
[['src/journal/test-journal-syslog.c'],
[libjournal_core,
- libshared,
- libudev],
+ libshared],
[threads,
libxz,
liblz4,
@@ -818,8 +805,7 @@ tests += [
'src/libsystemd-network/dhcp-internal.h',
'src/systemd/sd-dhcp-client.h'],
[libshared,
- libsystemd_network,
- libudev],
+ libsystemd_network],
[]],
[['src/libsystemd-network/test-dhcp-server.c'],
@@ -855,8 +841,7 @@ tests += [
'src/systemd/sd-dhcp6-client.h',
'src/systemd/sd-ndisc.h'],
[libshared,
- libsystemd_network,
- libudev],
+ libsystemd_network],
[]],
[['src/libsystemd-network/test-dhcp6-client.c',
@@ -865,8 +850,7 @@ tests += [
'src/libsystemd-network/dhcp6-internal.h',
'src/systemd/sd-dhcp6-client.h'],
[libshared,
- libsystemd_network,
- libudev],
+ libsystemd_network],
[]],
[['src/libsystemd-network/test-lldp.c'],
@@ -889,7 +873,6 @@ tests += [
[['src/login/test-login-tables.c'],
[liblogind_core,
- libshared,
- libudev],
+ libshared],
[threads]],
]
diff --git a/units/meson.build b/units/meson.build
index 0cc5f8861a..9411891c7f 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -80,8 +80,8 @@ units = [
'sockets.target.wants/'],
['systemd-initctl.socket', '',
'sockets.target.wants/'],
- ['systemd-journal-gatewayd.socket', ''],
- ['systemd-journal-remote.socket', ''],
+ ['systemd-journal-gatewayd.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'],
+ ['systemd-journal-remote.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'],
['systemd-journald-audit.socket', '',
'sockets.target.wants/'],
['systemd-journald-dev-log.socket', '',
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-21 18:08:42 +0000