tidy

11 files changed, 37 insertions, 60 deletions

diff --git a/src/grp-hostname/hostnamectl/Makefile b/src/grp-hostname/hostnamectl/Makefile
index f684bde523..f43d717260 100644
--- a/src/grp-hostname/hostnamectl/Makefile
+++ b/src/grp-hostname/hostnamectl/Makefile
@@ -40,6 +40,6 @@ dist_bashcompletion_data += \
 dist_zshcompletion_data += \
 	shell-completion/zsh/_hostnamectl
 
-endif
+endif # ENABLE_HOSTNAMED
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-initprogs/grp-sleep/systemd-sleep/Makefile b/src/grp-initprogs/grp-sleep/systemd-sleep/Makefile
index ca484794a0..161d4ebd50 100644
--- a/src/grp-initprogs/grp-sleep/systemd-sleep/Makefile
+++ b/src/grp-initprogs/grp-sleep/systemd-sleep/Makefile
@@ -43,10 +43,10 @@ nodist_systemunit_DATA += \
 endif # ENABLE_HIBERNATE
 
 dist_systemunit_DATA += \
-	units/suspend.target \
+	units/suspend.target
 
 nodist_systemunit_DATA += \
-	units/systemd-suspend.service \
+	units/systemd-suspend.service
 
 EXTRA_DIST += \
 	units/systemd-suspend.service.in \
diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.sysusers b/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.sysusers
index a60fcf4d42..379be0852e 100644
--- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.sysusers
+++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.sysusers
@@ -5,5 +5,4 @@
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
-m4_ifdef(`HAVE_MICROHTTPD',
 u systemd-journal-gateway - "systemd Journal Gateway"
diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile
index a7aa51403e..3c98169647 100644
--- a/src/grp-journal/journalctl/Makefile
+++ b/src/grp-journal/journalctl/Makefile
@@ -23,9 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-rootbin_PROGRAMS += \
-	journalctl
-
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
 	$(AM_CFLAGS)
@@ -49,6 +46,9 @@ journalctl_LDADD += \
 	$(QRENCODE_LIBS)
 endif # HAVE_QRENCODE
 
+rootbin_PROGRAMS += \
+	journalctl
+
 nodist_systemunit_DATA += \
 	units/systemd-journal-flush.service \
 	units/systemd-journal-catalog-update.service
diff --git a/src/grp-login/Makefile b/src/grp-login/Makefile
index 67083f42d5..fe0bab0f81 100644
--- a/src/grp-login/Makefile
+++ b/src/grp-login/Makefile
@@ -23,7 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-ifneq ($(ENABLE_LOGIND),)
 test_login_SOURCES = \
 	src/libsystemd/sd-login/test-login.c
 
@@ -56,8 +55,6 @@ tests += \
 	test-login-tables \
 	test-login-shared
 
-endif # ENABLE_LOGIND
-
 nested.subdirs += loginctl
 nested.subdirs += pam_systemd
 nested.subdirs += systemd-inhibit
diff --git a/src/grp-login/systemd-logind/Makefile b/src/grp-login/systemd-logind/Makefile
index cef1800e27..3c9a0a05ef 100644
--- a/src/grp-login/systemd-logind/Makefile
+++ b/src/grp-login/systemd-logind/Makefile
@@ -23,6 +23,17 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+systemd_logind_SOURCES = \
+	$(_liblogind_core_la_SOURCES) \
+	src/login/logind.c \
+	src/login/logind.h
+
+nodist_systemd_logind_SOURCES = \
+	src/login/logind-gperf.c
+
+systemd_logind_LDADD = \
+	libshared.la
+
 _liblogind_core_la_SOURCES = \
 	src/login/logind-core.c \
 	src/login/logind-device.c \
@@ -53,17 +64,6 @@ _liblogind_core_la_SOURCES += \
 	src/login/logind-acl.c
 endif # HAVE_ACL
 
-systemd_logind_SOURCES = \
-	$(_liblogind_core_la_SOURCES) \
-	src/login/logind.c \
-	src/login/logind.h
-
-nodist_systemd_logind_SOURCES = \
-	src/login/logind-gperf.c
-
-systemd_logind_LDADD = \
-	libshared.la
-
 rootlibexec_PROGRAMS += \
 	systemd-logind
 
diff --git a/src/grp-machine/grp-import/Makefile b/src/grp-machine/grp-import/Makefile
index 5cda3c9a9f..dfa189b317 100644
--- a/src/grp-machine/grp-import/Makefile
+++ b/src/grp-machine/grp-import/Makefile
@@ -23,22 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-ifneq ($(ENABLE_IMPORTD),)
-
-ifneq ($(HAVE_LIBCURL),)
-ifneq ($(HAVE_XZ),)
-ifneq ($(HAVE_ZLIB),)
-ifneq ($(HAVE_BZIP2),)
-ifneq ($(HAVE_GCRYPT),)
-
-endif # HAVE_GCRYPT
-endif # HAVE_BZIP2
-endif # HAVE_ZLIB
-endif # HAVE_XZ
-endif # HAVE_LIBCURL
-
-endif # ENABLE_IMPORTD
-
 nested.subdirs += libimport
 nested.subdirs += systemd-export
 nested.subdirs += systemd-import
diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile
index 52016c3b5d..66ac0b9275 100644
--- a/src/grp-machine/systemd-machined/Makefile
+++ b/src/grp-machine/systemd-machined/Makefile
@@ -23,6 +23,19 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+systemd_machined_SOURCES = \
+	$(_libmachine_core_la_SOURCES) \
+	src/machine/machined.c \
+	src/machine/machined.h
+
+systemd_machined_LDADD = \
+	libsystemd-internal.la \
+	libshared.la \
+	libbasic.la
+
+rootlibexec_PROGRAMS += \
+	systemd-machined
+
 _libmachine_core_la_SOURCES = \
 	src/machine/machine.c \
 	src/machine/machine.h \
@@ -34,18 +47,12 @@ _libmachine_core_la_SOURCES = \
 	src/machine/operation.c \
 	src/machine/operation.h
 
-systemd_machined_SOURCES = \
+test_machine_tables_SOURCES = \
 	$(_libmachine_core_la_SOURCES) \
-	src/machine/machined.c \
-	src/machine/machined.h
-
-systemd_machined_LDADD = \
-	libsystemd-internal.la \
-	libshared.la \
-	libbasic.la
+	src/machine/test-machine-tables.c
 
-rootlibexec_PROGRAMS += \
-	systemd-machined
+tests += \
+	test-machine-tables
 
 nodist_systemunit_DATA += \
 	units/systemd-machined.service
@@ -77,11 +84,4 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-machined.service.in
 
-test_machine_tables_SOURCES = \
-	$(_libmachine_core_la_SOURCES) \
-	src/machine/test-machine-tables.c
-
-tests += \
-	test-machine-tables
-
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-resolve/90-resolved.preset b/src/grp-resolve/90-resolved.preset
index 6033cd7ccc..c5a5063cc1 100644
--- a/src/grp-resolve/90-resolved.preset
+++ b/src/grp-resolve/90-resolved.preset
@@ -5,4 +5,7 @@
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
+# These ones should be enabled by default, even if distributions
+# generally follow a default-off policy.
+
 enable systemd-resolved.service
diff --git a/src/grp-system/systemd/systemd-tmpfs.tmpfiles b/src/grp-system/systemd/systemd-tmpfs.tmpfiles
index 52f6743d56..98050d329d 100644
--- a/src/grp-system/systemd/systemd-tmpfs.tmpfiles
+++ b/src/grp-system/systemd/systemd-tmpfs.tmpfiles
@@ -7,8 +7,6 @@
 
 # See tmpfiles.d(5) for details
 
-# Clear tmp directories separately, to make them easier to override
-
 # Exclude namespace mountpoints created with PrivateTmp=yes
 x /tmp/systemd-private-%b-*
 X /tmp/systemd-private-%b-*/tmp
diff --git a/src/grp-udev/.vimrc b/src/grp-udev/.vimrc
deleted file mode 100644
index 366fbdca4b..0000000000
--- a/src/grp-udev/.vimrc
+++ /dev/null
@@ -1,4 +0,0 @@
-" 'set exrc' in ~/.vimrc will read .vimrc from the current directory
-set tabstop=8
-set shiftwidth=8
-set expandtab