more

2 files changed, 118 insertions, 104 deletions

diff --git a/Makefile.am b/Makefile.am
index 39d6503d7b..75864e0c73 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -163,15 +163,15 @@ TESTS = $(tests)
 else
 noinst_PROGRAMS =
 TESTS =
-endif
+endif # ENABLE_TESTS
 if ENABLE_BASH_COMPLETION
 dist_bashcompletion_DATA = $(dist_bashcompletion_data)
 nodist_bashcompletion_DATA = $(nodist_bashcompletion_data)
-endif
+endif # ENABLE_BASH_COMPLETION
 if ENABLE_ZSH_COMPLETION
 dist_zshcompletion_DATA = $(dist_zshcompletion_data)
 nodist_zshcompletion_DATA = $(nodist_zshcompletion_data)
-endif
+endif # ENABLE_ZSH_COMPLETION
 udevlibexec_PROGRAMS =
 gperf_gperf_sources =
 
@@ -472,7 +472,7 @@ rootlibexec_PROGRAMS = \
 if HAVE_UTMP
 rootlibexec_PROGRAMS += \
 	systemd-update-utmp
-endif
+endif # HAVE_UTMP
 
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator \
@@ -628,7 +628,7 @@ if HAVE_UTMP
 nodist_systemunit_DATA += \
 	units/systemd-update-utmp.service \
 	units/systemd-update-utmp-runlevel.service
-endif
+endif # HAVE_UTMP
 
 dist_userunit_DATA = \
 	units/user/basic.target \
@@ -685,7 +685,7 @@ nodist_systemunit_DATA += \
 systemgenerator_PROGRAMS += \
 	systemd-sysv-generator \
 	systemd-rc-local-generator
-endif
+endif # HAVE_SYSV_COMPAT
 
 EXTRA_DIST += \
 	src/systemctl/systemd-sysv-install.SKELETON \
@@ -752,7 +752,7 @@ noinst_DATA += \
 	$(HTML_FILES) \
 	$(HTML_ALIAS) \
 	docs/html/man
-endif
+endif # ENABLE_MANPAGES
 
 CLEANFILES += \
 	$(man_MANS) \
@@ -770,7 +770,7 @@ man/index.html: man/systemd.index.html
 if HAVE_PYTHON
 noinst_DATA += \
 	man/index.html
-endif
+endif # HAVE_PYTHON
 
 CLEANFILES += \
 	man/index.html
@@ -1113,19 +1113,19 @@ libshared_la_SOURCES = \
 if HAVE_UTMP
 libshared_la_SOURCES += \
 	src/shared/utmp-wtmp.c
-endif
+endif # HAVE_UTMP
 
 if HAVE_SECCOMP
 libshared_la_SOURCES += \
 	src/shared/seccomp-util.h \
 	src/shared/seccomp-util.c
-endif
+endif # HAVE_SECCOMP
 
 if HAVE_ACL
 libshared_la_SOURCES += \
 	src/shared/acl-util.c \
 	src/shared/acl-util.h
-endif
+endif # HAVE_ACL
 
 libshared_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1156,7 +1156,7 @@ libfirewall_la_CFLAGS = \
 
 libfirewall_la_LIBADD = \
 	$(LIBIPTC_LIBS)
-endif
+endif # HAVE_LIBIPTC
 
 #@discard.mk -------------------------------------------------------------------
 if ENABLE_LDCONFIG
@@ -1165,7 +1165,7 @@ dist_systemunit_DATA += \
 
 SYSINIT_TARGET_WANTS += \
 	ldconfig.service
-endif
+endif # ENABLE_LDCONFIG
 
 #@src/libcore/Makefile ---------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1404,7 +1404,7 @@ src/basic/cap-from-name.h: src/basic/cap-from-name.gperf
 audit_list_includes = -include linux/audit.h -include missing.h
 if HAVE_AUDIT
 audit_list_includes += -include libaudit.h
-endif
+endif # HAVE_AUDIT
 
 src/journal/audit_type-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -1484,12 +1484,12 @@ manual_tests += \
 if HAVE_LIBIPTC
 manual_tests += \
 	test-firewall-util
-endif
+endif # HAVE_LIBIPTC
 
 if HAVE_KMOD
 manual_tests += \
 	test-netlink-manual
-endif
+endif # HAVE_KMOD
 
 tests += \
 	test-engine \
@@ -1567,7 +1567,7 @@ tests += \
 if HAVE_ACL
 tests += \
 	test-acl-util
-endif
+endif # HAVE_ACL
 
 EXTRA_DIST += \
 	test/a.service \
@@ -1744,7 +1744,7 @@ test_boot_timestamp_SOURCES = \
 
 test_boot_timestamp_LDADD = \
 	libshared.la
-endif
+endif # ENABLE_EFI
 
 test_unit_name_SOURCES = \
 	src/test/test-unit-name.c
@@ -2094,7 +2094,7 @@ test_firewall_util_LDADD = \
 	libfirewall.la \
 	libshared.la \
 	$(LIBIPTC_LIBS)
-endif
+endif # HAVE_LIBIPTC
 
 test_netlink_manual_SOURCES = \
 	src/test/test-netlink-manual.c
@@ -2325,7 +2325,7 @@ coverage-sync: coverage
 else
 lcov-run lcov-report:
 	echo "Need to reconfigure with --enable-coverage"
-endif
+endif # ENABLE_COVERAGE
 
 #@src/systemd-analyze/Makefile -------------------------------------------------
 systemd_analyze_SOURCES = \
@@ -2408,8 +2408,8 @@ nodist_systemunit_DATA += \
 
 SYSINIT_TARGET_WANTS += \
 	kmod-static-nodes.service
-endif
-endif
+endif # ENABLE_TMPFILES
+endif # HAVE_KMOD
 
 EXTRA_DIST += \
 	units/systemd-modules-load.service.in \
@@ -2450,7 +2450,7 @@ dist_tmpfiles_DATA = \
 if HAVE_SYSV_COMPAT
 dist_tmpfiles_DATA += \
 	tmpfiles.d/legacy.conf
-endif
+endif # HAVE_SYSV_COMPAT
 
 SYSINIT_TARGET_WANTS += \
 	systemd-tmpfiles-setup-dev.service \
@@ -2465,7 +2465,7 @@ TIMERS_TARGET_WANTS += \
 INSTALL_DIRS += \
 	$(tmpfilesdir) \
 	$(sysconfdir)/tmpfiles.d
-endif
+endif # ENABLE_TMPFILES
 
 EXTRA_DIST += \
 	tmpfiles.d/systemd.conf.m4 \
@@ -2498,11 +2498,11 @@ nodist_sysusers_DATA = \
 if HAVE_REMOTE
 nodist_sysusers_DATA += \
 	sysusers.d/systemd-remote.conf
-endif
+endif # HAVE_REMOTE
 
 INSTALL_DIRS += \
 	$(sysusersdir)
-endif
+endif # ENABLE_SYSUSERS
 
 EXTRA_DIST += \
 	units/systemd-sysusers.service.in \
@@ -2518,7 +2518,7 @@ if HAVE_PAM
 dist_factory_pam_DATA = \
 	factory/etc/pam.d/system-auth \
 	factory/etc/pam.d/other
-endif
+endif # HAVE_PAM
 
 #@src/systemd-firstboot/Makefile -----------------------------------------------
 if ENABLE_FIRSTBOOT
@@ -2537,7 +2537,7 @@ nodist_systemunit_DATA += \
 
 SYSINIT_TARGET_WANTS += \
 	systemd-firstboot.service
-endif
+endif # ENABLE_FIRSTBOOT
 
 EXTRA_DIST += \
 	units/systemd-firstboot.service.in
@@ -2656,7 +2656,7 @@ nodist_systemunit_DATA += \
 	units/systemd-hibernate.service \
 	units/systemd-hibernate-resume@.service \
 	units/systemd-hybrid-sleep.service
-endif
+endif # ENABLE_HIBERNATE
 
 EXTRA_DIST += \
 	units/systemd-hibernate.service.in \
@@ -2690,9 +2690,10 @@ dist_bashcompletion_data += \
 
 dist_zshcompletion_data += \
 	shell-completion/zsh/_bootctl
-endif
-
+endif # HAVE_BLKID
+endif # ENABLE_EFI
 #@src/grp-boot/systemd-boot/Makefile -------------------------------------------
+if ENABLE_EFI
 if HAVE_GNUEFI
 efi_cppflags = \
 	$(EFI_CPPFLAGS) \
@@ -2724,13 +2725,13 @@ efi_cflags += \
 	-mno-mmx \
 	-DEFI_FUNCTION_WRAPPER \
 	-DGNU_EFI_USE_MS_ABI
-endif
+endif # ARCH_X86_64
 
 if ARCH_IA32
 efi_cflags += \
 	-mno-sse \
 	-mno-mmx
-endif
+endif # ARCH_IA32
 
 efi_ldflags = \
 	$(EFI_LDFLAGS) \
@@ -2749,9 +2750,9 @@ efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa
 EFI_FORMAT = -O binary
 else
 EFI_FORMAT = --target=efi-app-$(EFI_ARCH)
-endif
-endif
-endif
+endif # ARCH_AARCH64
+endif # HAVE_GNUEFI
+endif # ENABLE_EFI
 
 # ------------------------------------------------------------------------------
 systemd_boot_headers = \
@@ -2791,8 +2792,8 @@ $(systemd_boot_solib): $(systemd_boot_objects)
 $(systemd_boot): $(systemd_boot_solib)
 	$(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
 	  -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
-endif
-endif
+endif # HAVE_GNUEFI
+endif # ENABLE_EFI
 
 CLEANFILES += $(systemd_boot_objects) $(systemd_boot_solib) $(systemd_boot)
 
@@ -2839,8 +2840,8 @@ $(stub_solib): $(stub_objects)
 $(stub): $(stub_solib)
 	$(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
 	  -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
-endif
-endif
+endif # HAVE_GNUEFI
+endif # ENABLE_EFI
 
 CLEANFILES += $(stub_objects) $(stub_solib) $(stub)
 
@@ -2872,7 +2873,7 @@ systemd_gpt_auto_generator_LDADD = \
 systemd_gpt_auto_generator_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(BLKID_CFLAGS)
-endif
+endif # HAVE_BLKID
 
 #@src/systemd-dbus1-generator/Makefile -----------------------------------------
 systemgenerator_PROGRAMS +=  \
@@ -3026,7 +3027,7 @@ systemd_nspawn_LDADD = \
 if HAVE_LIBIPTC
 systemd_nspawn_LDADD += \
 	libfirewall.la
-endif
+endif # HAVE_LIBIPTC
 
 #@src/systemd-run/Makefile -----------------------------------------------------
 systemd_run_SOURCES = \
@@ -3090,7 +3091,7 @@ bus-proxyd-set-cap-hook:
 	-$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd
 
 INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
-endif
+endif # HAVE_SMACK
 
 #@src/systemd-tty-ask-password-agent/Makefile ----------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
@@ -3750,12 +3751,12 @@ libudev_core_la_SOURCES += \
 
 dist_udevrules_DATA += \
 	rules/80-drivers.rules
-endif
+endif # HAVE_KMOD
 
 if HAVE_BLKID
 libudev_core_la_SOURCES += \
 	src/udev/udev-builtin-blkid.c
-endif
+endif # HAVE_BLKID
 
 if HAVE_ACL
 libudev_core_la_SOURCES += \
@@ -3763,7 +3764,7 @@ libudev_core_la_SOURCES += \
 	src/login/logind-acl.c \
 	src/libsystemd/sd-login/sd-login.c \
 	src/systemd/sd-login.h
-endif
+endif # HAVE_ACL
 
 systemd_udevd_SOURCES = \
 	src/udev/udevd.c
@@ -3831,7 +3832,7 @@ INSTALL_DATA_HOOKS += \
 
 hwdb-remove-hook:
 	-test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
-endif
+endif # ENABLE_HWDB
 
 EXTRA_DIST += \
 	units/systemd-hwdb-update.service.in \
@@ -3850,9 +3851,9 @@ TESTS += \
 if HAVE_SYSV_COMPAT
 TESTS += \
 	test/sysv-generator-test.py
-endif
-endif
-endif
+endif # HAVE_SYSV_COMPAT
+endif # HAVE_PYTHON
+endif # ENABLE_TESTS
 
 manual_tests += \
 	test-libudev \
@@ -3875,7 +3876,7 @@ test_udev_LDADD = \
 if ENABLE_TESTS
 check_DATA += \
 	test/sys
-endif
+endif # ENABLE_TESTS
 
 # packed sysfs test tree
 test/sys:
@@ -4033,12 +4034,12 @@ systemd_journal_remote_LDADD += \
 if ENABLE_TMPFILES
 dist_tmpfiles_DATA += \
 	tmpfiles.d/systemd-remote.conf
-endif
+endif # ENABLE_TMPFILES
 
 if HAVE_GNUTLS
 systemd_journal_remote_LDADD += \
 	$(GNUTLS_LIBS)
-endif
+endif # HAVE_GNUTLS
 
 # systemd-journal-remote make sense mostly with full crypto stack
 dist_systemunit_DATA += \
@@ -4061,7 +4062,7 @@ EXTRA_DIST += \
 	units/systemd-journal-remote.service.in \
 	src/journal-remote/journal-remote.conf.in \
 	src/journal-remote/log-generator.py
-endif
+endif # HAVE_MICROHTTPD
 
 if HAVE_LIBCURL
 rootlibexec_PROGRAMS += \
@@ -4085,7 +4086,7 @@ nodist_systemunit_DATA += \
 
 nodist_pkgsysconf_DATA += \
 	src/journal-remote/journal-upload.conf
-endif
+endif # HAVE_LIBCURL
 
 EXTRA_DIST += \
 	units/systemd-journal-upload.service.in \
@@ -4113,7 +4114,7 @@ journalctl_CFLAGS += \
 
 journalctl_LDADD += \
 	$(QRENCODE_LIBS)
-endif
+endif # HAVE_QRENCODE
 
 test_journal_SOURCES = \
 	src/journal/test-journal.c
@@ -4289,7 +4290,7 @@ if HAVE_COMPRESSION
 tests += \
 	test-compress \
 	test-compress-benchmark
-endif
+endif # HAVE_COMPRESSION
 
 #@src/libsystemd/libsystemd-journal-internal/Makefile
 pkginclude_HEADERS += \
@@ -4338,7 +4339,7 @@ libsystemd_journal_internal_la_CFLAGS += \
 
 libsystemd_journal_internal_la_LIBADD += \
 	$(XZ_LIBS)
-endif
+endif # HAVE_XZ
 
 if HAVE_LZ4
 libsystemd_journal_internal_la_CFLAGS += \
@@ -4346,7 +4347,7 @@ libsystemd_journal_internal_la_CFLAGS += \
 
 libsystemd_journal_internal_la_LIBADD += \
 	$(LZ4_LIBS)
-endif
+endif # HAVE_LZ4
 
 if HAVE_GCRYPT
 libsystemd_journal_internal_la_SOURCES += \
@@ -4362,7 +4363,7 @@ libsystemd_journal_internal_la_LIBADD += \
 libsystemd_journal_internal_la_CFLAGS += \
 	$(GCRYPT_CFLAGS) \
 	-Wno-pointer-arith
-endif
+endif # HAVE_GCRYPT
 
 noinst_LTLIBRARIES += \
 	libsystemd-journal-internal.la
@@ -4439,7 +4440,7 @@ systemd_journal_gatewayd_LDADD = \
 if HAVE_GNUTLS
 systemd_journal_gatewayd_LDADD += \
 	$(GNUTLS_LIBS)
-endif
+endif # HAVE_GNUTLS
 
 systemd_journal_gatewayd_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -4458,7 +4459,7 @@ nodist_systemunit_DATA += \
 dist_gatewayddocumentroot_DATA = \
 	src/journal-remote/browse.html
 
-endif
+endif # HAVE_MICROHTTPD
 
 EXTRA_DIST += \
 	units/systemd-journal-gatewayd.service.in
@@ -4488,7 +4489,7 @@ systemd_coredump_SOURCES += \
 
 systemd_coredump_LDADD += \
 	$(ELFUTILS_LIBS)
-endif
+endif # HAVE_ELFUTILS
 
 nodist_systemunit_DATA += \
 	units/systemd-coredump@.service
@@ -4540,7 +4541,7 @@ nodist_sysctl_DATA = \
 
 CLEANFILES += \
 	sysctl.d/50-coredump.conf
-endif
+endif # ENABLE_COREDUMP
 
 EXTRA_DIST += \
 	sysctl.d/50-coredump.conf.in \
@@ -4572,7 +4573,7 @@ SYSINIT_TARGET_WANTS += \
 	systemd-binfmt.service \
 	proc-sys-fs-binfmt_misc.automount
 
-endif
+endif # ENABLE_BINFMT
 
 EXTRA_DIST += \
 	units/systemd-binfmt.service.in
@@ -4596,7 +4597,7 @@ nodist_systemunit_DATA += \
 
 SYSINIT_TARGET_WANTS += \
 	systemd-vconsole-setup.service
-endif
+endif # ENABLE_VCONSOLE
 
 EXTRA_DIST += \
 	src/vconsole/90-vconsole.rules.in \
@@ -4623,7 +4624,7 @@ dist_pkgsysconf_DATA += \
 
 nodist_systemunit_DATA += \
 	units/systemd-bootchart.service
-endif
+endif # ENABLE_BOOTCHART
 
 EXTRA_DIST += \
 	units/systemd-bootchart.service.in
@@ -4641,7 +4642,7 @@ systemd_quotacheck_SOURCES = \
 
 systemd_quotacheck_LDADD = \
 	libshared.la
-endif
+endif # ENABLE_QUOTACHECK
 
 EXTRA_DIST += \
 	units/systemd-quotacheck.service.in
@@ -4666,7 +4667,7 @@ systemd_random_seed_LDADD = \
 SYSINIT_TARGET_WANTS += \
 	systemd-random-seed.service
 
-endif
+endif # ENABLE_RANDOMSEED
 
 EXTRA_DIST += \
 	units/systemd-random-seed.service.in
@@ -4684,7 +4685,7 @@ systemd_backlight_SOURCES = \
 
 systemd_backlight_LDADD = \
 	libshared.la
-endif
+endif # ENABLE_BACKLIGHT
 
 EXTRA_DIST += \
 	units/systemd-backlight@.service.in
@@ -4705,7 +4706,7 @@ systemd_rfkill_SOURCES = \
 
 systemd_rfkill_LDADD = \
 	libshared.la
-endif
+endif # ENABLE_RFKILL
 
 EXTRA_DIST += \
 	units/systemd-rfkill.service.in
@@ -4742,7 +4743,7 @@ systemd_cryptsetup_generator_LDADD = \
 SYSINIT_TARGET_WANTS += \
 	cryptsetup.target
 
-endif
+endif # HAVE_LIBCRYPTSETUP
 
 #@src/hostname/Makefile --------------------------------------------------------
 if ENABLE_HOSTNAMED
@@ -4790,7 +4791,7 @@ dist_bashcompletion_data += \
 
 dist_zshcompletion_data += \
 	shell-completion/zsh/_hostnamectl
-endif
+endif # ENABLE_HOSTNAMED
 
 polkitpolicy_in_files += \
 	src/hostname/org.freedesktop.hostname1.policy.in
@@ -4860,7 +4861,7 @@ dist_bashcompletion_data += \
 
 dist_zshcompletion_data += \
 	shell-completion/zsh/_localectl
-endif
+endif # ENABLE_LOCALED
 
 .PHONY: update-kbd-model-map
 
@@ -4870,7 +4871,7 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-localed.service.in
 
-#@src/systemd-timedate/Makefile ------------------------------------------------
+#@src/grp-timedate/systemd-timedated/Makefile ----------------------------------
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
 	src/timedate/timedated.c
@@ -4902,6 +4903,9 @@ SYSTEM_UNIT_ALIASES += \
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.timedate1.busname
 
+endif # ENABLE_TIMEDATED
+#@src/grp-timedate/timedatectl/Makefile
+if ENABLE_TIMEDATED
 timedatectl_SOURCES = \
 	src/timedate/timedatectl.c
 
@@ -4916,7 +4920,8 @@ dist_bashcompletion_data += \
 
 dist_zshcompletion_data += \
 	shell-completion/zsh/_timedatectl
-endif
+endif # ENABLE_TIMEDATED
+#@src/grp-timedate/systemd-timedated/Makefile
 
 polkitpolicy_in_files += \
 	src/timedate/org.freedesktop.timedate1.policy.in
@@ -4954,7 +4959,7 @@ GENERAL_ALIASES += \
 nodist_pkgsysconf_DATA += \
 	src/timesync/timesyncd.conf
 
-endif
+endif # ENABLE_TIMESYNCD
 
 gperf_gperf_sources += \
 	src/timesync/timesyncd-gperf.gperf
@@ -4983,7 +4988,7 @@ libnss_myhostname_la_LIBADD = \
 
 lib_LTLIBRARIES += \
 	libnss_myhostname.la
-endif
+endif # HAVE_MYHOSTNAME
 
 #@src/grp-machine/systemd-machined/Makefile ------------------------------------
 if ENABLE_MACHINED
@@ -5061,6 +5066,10 @@ SYSTEM_UNIT_ALIASES += \
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.machine1.busname
 
+endif # ENABLE_MACHINED
+#@src/grp-machine/nss-mymachines/Makefile
+if ENABLE_MACHINED
+
 libnss_mymachines_la_SOURCES = \
 	src/nss-mymachines/nss-mymachines.sym \
 	src/nss-mymachines/nss-mymachines.c
@@ -5080,7 +5089,8 @@ libnss_mymachines_la_LIBADD = \
 lib_LTLIBRARIES += \
 	libnss_mymachines.la
 
-endif
+endif # ENABLE_MACHINED
+#@src/grp-machine/systemd-machined/Makefile
 
 polkitpolicy_in_files += \
 	src/machine/org.freedesktop.machine1.policy.in
@@ -5242,13 +5252,13 @@ test_qcow2_LDADD = \
 	libshared.la \
 	$(ZLIB_LIBS)
 
-endif
-endif
-endif
-endif
-endif
+endif # HAVE_GCRYPT
+endif # HAVE_BZIP2
+endif # HAVE_ZLIB
+endif # HAVE_XZ
+endif # HAVE_LIBCURL
 
-endif
+endif # ENABLE_IMPORTD
 
 polkitpolicy_in_files += \
 	src/import/org.freedesktop.import1.policy.in
@@ -5428,7 +5438,7 @@ test_dnssec_complex_SOURCES = \
 test_dnssec_complex_LDADD = \
 	libshared.la
 
-endif
+endif # ENABLE_RESOLVED
 
 gperf_txt_sources += \
 	src/resolve/dns_type-list.txt
@@ -5454,7 +5464,7 @@ systemd_networkd_LDADD = \
 if HAVE_LIBIPTC
 systemd_networkd_LDADD += \
 	libfirewall.la
-endif
+endif # HAVE_LIBIPTC
 
 noinst_LTLIBRARIES += \
 	libnetworkd-core.la
@@ -5558,7 +5568,7 @@ test_network_LDADD = \
 if HAVE_LIBIPTC
 test_network_LDADD += \
 	libfirewall.la
-endif
+endif # HAVE_LIBIPTC
 
 test_network_tables_SOURCES = \
 	src/network/test-network-tables.c \
@@ -5571,7 +5581,7 @@ test_network_tables_LDADD = \
 if HAVE_LIBIPTC
 test_network_tables_LDADD += \
 	libfirewall.la
-endif
+endif # HAVE_LIBIPTC
 
 tests += \
 	test-network \
@@ -5604,7 +5614,7 @@ SYSTEM_UNIT_ALIASES += \
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.network1.busname
 
-endif
+endif # ENABLE_NETWORKD
 
 gperf_gperf_sources += \
 	src/network/networkd-network-gperf.gperf \
@@ -5658,7 +5668,7 @@ liblogind_core_la_LIBADD = \
 if HAVE_ACL
 liblogind_core_la_SOURCES += \
 	src/login/logind-acl.c
-endif
+endif # HAVE_ACL
 
 noinst_LTLIBRARIES += \
 	liblogind-core.la
@@ -5754,7 +5764,7 @@ dist_pamconf_DATA = \
 
 EXTRA_DIST += \
 	src/login/systemd-user.m4
-endif
+endif # HAVE_PAM
 
 nodist_systemunit_DATA += \
 	units/systemd-logind.service
@@ -5797,7 +5807,7 @@ nodist_udevrules_DATA += \
 	src/login/71-seat.rules \
 	src/login/73-seat-late.rules
 
-endif
+endif # ENABLE_LOGIND
 
 polkitpolicy_in_files += \
 	src/login/org.freedesktop.login1.policy.in
@@ -5828,7 +5838,7 @@ nodist_systemunit_DATA += \
 MULTI_USER_TARGET_WANTS += \
 	systemd-user-sessions.service
 
-endif
+endif # HAVE_PAM
 
 EXTRA_DIST += \
 	units/systemd-user-sessions.service.in
@@ -5983,7 +5993,7 @@ compat-lib-uninstall-hook:
 
 INSTALL_EXEC_HOOKS += compat-lib-install-hook
 UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook
-endif
+endif # ENABLE_COMPAT_LIBS
 
 EXTRA_DIST += \
 	src/compat-libs/linkwarning.h \
@@ -6126,7 +6136,7 @@ if ENABLE_POLKIT
 nodist_polkitpolicy_DATA = \
 	$(polkitpolicy_files) \
 	$(polkitpolicy_in_in_files:.policy.in.in=.policy)
-endif
+endif # ENABLE_POLKIT
 
 EXTRA_DIST += \
 	$(polkitpolicy_in_files) \
@@ -6202,7 +6212,7 @@ docs/var-log/README: docs/var-log/README.in
 CLEANFILES += \
 	docs/sysvinit/README \
 	docs/var-log/README
-endif
+endif # HAVE_SYSV_COMPAT
 
 EXTRA_DIST += \
 	docs/sysvinit/README.in \
@@ -6219,11 +6229,11 @@ GRAPHICAL_TARGET_WANTS += \
 	systemd-update-utmp-runlevel.service
 RESCUE_TARGET_WANTS += \
 	systemd-update-utmp-runlevel.service
-endif
+endif # HAVE_SYSV_COMPAT
 
 SYSINIT_TARGET_WANTS += \
 	systemd-update-utmp.service
-endif
+endif # HAVE_UTMP
 
 SYSINIT_TARGET_WANTS += \
 	systemd-update-done.service
@@ -6255,7 +6265,7 @@ SYSTEM_UNIT_ALIASES += \
 	multi-user.target runlevel4.target \
 	graphical.target runlevel5.target \
 	reboot.target runlevel6.target
-endif
+endif # HAVE_SYSV_COMPAT
 
 SYSTEM_UNIT_ALIASES += \
 	graphical.target default.target \
@@ -6288,7 +6298,7 @@ INSTALL_DIRS += \
 	$(systemunitdir)/runlevel3.target.wants \
 	$(systemunitdir)/runlevel4.target.wants \
 	$(systemunitdir)/runlevel5.target.wants
-endif
+endif # HAVE_SYSV_COMPAT
 
 INSTALL_DIRS += \
 	$(prefix)/lib/modules-load.d \
@@ -6344,7 +6354,7 @@ else
 DISTCHECK_CONFIGURE_FLAGS += \
 	--with-sysvinit-path= \
 	--with-sysvrcnd-path=
-endif
+endif # HAVE_SYSV_COMPAT
 
 if ENABLE_SPLIT_USR
 DISTCHECK_CONFIGURE_FLAGS += \
@@ -6352,7 +6362,7 @@ DISTCHECK_CONFIGURE_FLAGS += \
 else
 DISTCHECK_CONFIGURE_FLAGS += \
 	--disable-split-usr
-endif
+endif # ENABLE_SPLIT_USR
 
 .PHONY: dist-check-help
 
diff --git a/move.sh b/move.sh
index 2ec0723073..a17fe4f14b 100755
--- a/move.sh
+++ b/move.sh
@@ -58,7 +58,6 @@ move_files() (
 		reply-password
 		rfkill
 		run
-		timedate
 		timesync
 		tmpfiles
 		tty-ask-password-agent
@@ -177,6 +176,11 @@ move_files() (
 	mv  src/{libbus-proxy-core,systemd-bus-proxyd}/bus-proxyd.c
 	mkdir src/systemd-stdio-bridge
 	mv  src/{libbus-proxy-core,systemd-stdio-bridge}/stdio-bridge.c
+
+	mkdir src/grp-timedate
+	mv -T src/timedate src/grp-timedate/systemd-timedated
+	mkdir src/grp-timedate/timedatectl
+	mv -T src/grp-timedate/{systemd-timedated,timedatectl}/timedatectl.c
 )
 
 breakup_makefile() (