summaryrefslogtreecommitdiff
path: root/src/grp-login
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-09-13 17:42:21 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-09-13 17:42:21 -0400
commit2762c4a1018fd85d3445e6438d88668a84f63067 (patch)
tree37cbc4d6407d33ce7158797e004a2c4e64fb9906 /src/grp-login
parentb585358da58463ca0e6fa1961e85340f27583f63 (diff)
tidy
Diffstat (limited to 'src/grp-login')
-rw-r--r--src/grp-login/Makefile3
-rw-r--r--src/grp-login/systemd-logind/Makefile22
2 files changed, 11 insertions, 14 deletions
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