39 files changed, 235 insertions, 106 deletions
diff --git a/src/grp-login/Makefile b/src/grp-login/Makefile
index d03408cf11..381d653166 100644
--- a/src/grp-login/Makefile
+++ b/src/grp-login/Makefile
@@ -24,82 +24,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_LOGIND),)
-systemd_logind_SOURCES = \
-	src/login/logind.c \
-	src/login/logind.h
-
-nodist_systemd_logind_SOURCES = \
-	src/login/logind-gperf.c
-
-systemd_logind_LDADD = \
-	liblogind-core.la
-
-liblogind_core_la_SOURCES = \
-	src/login/logind-core.c \
-	src/login/logind-device.c \
-	src/login/logind-device.h \
-	src/login/logind-button.c \
-	src/login/logind-button.h \
-	src/login/logind-action.c \
-	src/login/logind-action.h \
-	src/login/logind-seat.c \
-	src/login/logind-seat.h \
-	src/login/logind-session.c \
-	src/login/logind-session.h \
-	src/login/logind-session-device.c \
-	src/login/logind-session-device.h \
-	src/login/logind-user.c \
-	src/login/logind-user.h \
-	src/login/logind-inhibit.c \
-	src/login/logind-inhibit.h \
-	src/login/logind-dbus.c \
-	src/login/logind-session-dbus.c \
-	src/login/logind-seat-dbus.c \
-	src/login/logind-user-dbus.c \
-	src/login/logind-utmp.c \
-	src/login/logind-acl.h
-
-liblogind_core_la_LIBADD = \
-	libshared.la
-
-ifneq ($(HAVE_ACL),)
-liblogind_core_la_SOURCES += \
-	src/login/logind-acl.c
-endif # HAVE_ACL
-
-noinst_LTLIBRARIES += \
-	liblogind-core.la
-
-rootlibexec_PROGRAMS += \
-	systemd-logind
-
-loginctl_SOURCES = \
-	src/login/loginctl.c \
-	src/login/sysfs-show.h \
-	src/login/sysfs-show.c
-
-loginctl_LDADD = \
-	libshared.la
-
-rootbin_PROGRAMS += \
-	loginctl
-
-dist_bashcompletion_data += \
-	shell-completion/bash/loginctl
-
-dist_zshcompletion_data += \
-	shell-completion/zsh/_loginctl \
-	shell-completion/zsh/_systemd-inhibit
-
-systemd_inhibit_SOURCES = \
-	src/login/inhibit.c
-
-systemd_inhibit_LDADD = \
-	libshared.la
-
-rootbin_PROGRAMS += \
-	systemd-inhibit
-
 test_login_SOURCES = \
 	src/libsystemd/sd-login/test-login.c
 
@@ -132,36 +56,6 @@ tests += \
 	test-login-tables \
 	test-login-shared
 
-ifneq ($(HAVE_PAM),)
-pam_systemd_la_SOURCES = \
-	src/login/pam_systemd.sym \
-	src/login/pam_systemd.c
-
-pam_systemd_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(PAM_CFLAGS)
-
-pam_systemd_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
-	-module \
-	-export-dynamic \
-	-avoid-version \
-	-shared \
-	-Wl,--version-script=$(srcdir)/pam_systemd.sym
-
-pam_systemd_la_LIBADD = \
-	libshared.la \
-	$(PAM_LIBS)
-
-pamlib_LTLIBRARIES = \
-	pam_systemd.la
-
-dist_pamconf_DATA = \
-	src/login/systemd-user
-
-EXTRA_DIST += \
-	src/login/systemd-user.m4
-endif # HAVE_PAM
 
 nodist_systemunit_DATA += \
 	units/systemd-logind.service
diff --git a/src/grp-login/liblogind-core/Makefile b/src/grp-login/liblogind-core/Makefile
new file mode 100644
index 0000000000..1575518aec
--- /dev/null
+++ b/src/grp-login/liblogind-core/Makefile
@@ -0,0 +1,62 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+liblogind_core_la_SOURCES = \
+	src/login/logind-core.c \
+	src/login/logind-device.c \
+	src/login/logind-device.h \
+	src/login/logind-button.c \
+	src/login/logind-button.h \
+	src/login/logind-action.c \
+	src/login/logind-action.h \
+	src/login/logind-seat.c \
+	src/login/logind-seat.h \
+	src/login/logind-session.c \
+	src/login/logind-session.h \
+	src/login/logind-session-device.c \
+	src/login/logind-session-device.h \
+	src/login/logind-user.c \
+	src/login/logind-user.h \
+	src/login/logind-inhibit.c \
+	src/login/logind-inhibit.h \
+	src/login/logind-dbus.c \
+	src/login/logind-session-dbus.c \
+	src/login/logind-seat-dbus.c \
+	src/login/logind-user-dbus.c \
+	src/login/logind-utmp.c \
+	src/login/logind-acl.h
+
+liblogind_core_la_LIBADD = \
+	libshared.la
+
+ifneq ($(HAVE_ACL),)
+liblogind_core_la_SOURCES += \
+	src/login/logind-acl.c
+endif # HAVE_ACL
+
+noinst_LTLIBRARIES += \
+	liblogind-core.la
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/logind-acl.c b/src/grp-login/liblogind-core/logind-acl.c
index 0cef88a82d..0cef88a82d 100644
--- a/src/grp-login/logind-acl.c
+++ b/src/grp-login/liblogind-core/logind-acl.c
diff --git a/src/grp-login/logind-acl.h b/src/grp-login/liblogind-core/logind-acl.h
index 1286c6a3cd..1286c6a3cd 100644
--- a/src/grp-login/logind-acl.h
+++ b/src/grp-login/liblogind-core/logind-acl.h
diff --git a/src/grp-login/logind-action.c b/src/grp-login/liblogind-core/logind-action.c
index 9a8089f97c..9a8089f97c 100644
--- a/src/grp-login/logind-action.c
+++ b/src/grp-login/liblogind-core/logind-action.c
diff --git a/src/grp-login/logind-action.h b/src/grp-login/liblogind-core/logind-action.h
index fb40ae48d2..fb40ae48d2 100644
--- a/src/grp-login/logind-action.h
+++ b/src/grp-login/liblogind-core/logind-action.h
diff --git a/src/grp-login/logind-button.c b/src/grp-login/liblogind-core/logind-button.c
index acf7504a2e..acf7504a2e 100644
--- a/src/grp-login/logind-button.c
+++ b/src/grp-login/liblogind-core/logind-button.c
diff --git a/src/grp-login/logind-button.h b/src/grp-login/liblogind-core/logind-button.h
index f30cba2959..f30cba2959 100644
--- a/src/grp-login/logind-button.h
+++ b/src/grp-login/liblogind-core/logind-button.h
diff --git a/src/grp-login/logind-core.c b/src/grp-login/liblogind-core/logind-core.c
index cbf8d757fe..cbf8d757fe 100644
--- a/src/grp-login/logind-core.c
+++ b/src/grp-login/liblogind-core/logind-core.c
diff --git a/src/grp-login/logind-dbus.c b/src/grp-login/liblogind-core/logind-dbus.c
index 90dcd94710..90dcd94710 100644
--- a/src/grp-login/logind-dbus.c
+++ b/src/grp-login/liblogind-core/logind-dbus.c
diff --git a/src/grp-login/logind-device.c b/src/grp-login/liblogind-core/logind-device.c
index eb5edd1cd5..eb5edd1cd5 100644
--- a/src/grp-login/logind-device.c
+++ b/src/grp-login/liblogind-core/logind-device.c
diff --git a/src/grp-login/logind-device.h b/src/grp-login/liblogind-core/logind-device.h
index 927068e00a..927068e00a 100644
--- a/src/grp-login/logind-device.h
+++ b/src/grp-login/liblogind-core/logind-device.h
diff --git a/src/grp-login/logind-gperf.gperf b/src/grp-login/liblogind-core/logind-gperf.gperf
index 6bd08adc05..6bd08adc05 100644
--- a/src/grp-login/logind-gperf.gperf
+++ b/src/grp-login/liblogind-core/logind-gperf.gperf
diff --git a/src/grp-login/logind-inhibit.c b/src/grp-login/liblogind-core/logind-inhibit.c
index 6c78e0dddc..6c78e0dddc 100644
--- a/src/grp-login/logind-inhibit.c
+++ b/src/grp-login/liblogind-core/logind-inhibit.c
diff --git a/src/grp-login/logind-inhibit.h b/src/grp-login/liblogind-core/logind-inhibit.h
index 70de199c60..70de199c60 100644
--- a/src/grp-login/logind-inhibit.h
+++ b/src/grp-login/liblogind-core/logind-inhibit.h
diff --git a/src/grp-login/logind-seat-dbus.c b/src/grp-login/liblogind-core/logind-seat-dbus.c
index f934a5326a..f934a5326a 100644
--- a/src/grp-login/logind-seat-dbus.c
+++ b/src/grp-login/liblogind-core/logind-seat-dbus.c
diff --git a/src/grp-login/logind-seat.c b/src/grp-login/liblogind-core/logind-seat.c
index aec67718a1..aec67718a1 100644
--- a/src/grp-login/logind-seat.c
+++ b/src/grp-login/liblogind-core/logind-seat.c
diff --git a/src/grp-login/logind-seat.h b/src/grp-login/liblogind-core/logind-seat.h
index 9a4fbc5bc5..9a4fbc5bc5 100644
--- a/src/grp-login/logind-seat.h
+++ b/src/grp-login/liblogind-core/logind-seat.h
diff --git a/src/grp-login/logind-session-dbus.c b/src/grp-login/liblogind-core/logind-session-dbus.c
index 22dea5db1f..22dea5db1f 100644
--- a/src/grp-login/logind-session-dbus.c
+++ b/src/grp-login/liblogind-core/logind-session-dbus.c
diff --git a/src/grp-login/logind-session-device.c b/src/grp-login/liblogind-core/logind-session-device.c
index 4055a23277..4055a23277 100644
--- a/src/grp-login/logind-session-device.c
+++ b/src/grp-login/liblogind-core/logind-session-device.c
diff --git a/src/grp-login/logind-session-device.h b/src/grp-login/liblogind-core/logind-session-device.h
index 7c8503583f..7c8503583f 100644
--- a/src/grp-login/logind-session-device.h
+++ b/src/grp-login/liblogind-core/logind-session-device.h
diff --git a/src/grp-login/logind-session.c b/src/grp-login/liblogind-core/logind-session.c
index 11a83106b1..11a83106b1 100644
--- a/src/grp-login/logind-session.c
+++ b/src/grp-login/liblogind-core/logind-session.c
diff --git a/src/grp-login/logind-session.h b/src/grp-login/liblogind-core/logind-session.h
index ffb7cd2d41..ffb7cd2d41 100644
--- a/src/grp-login/logind-session.h
+++ b/src/grp-login/liblogind-core/logind-session.h
diff --git a/src/grp-login/logind-user-dbus.c b/src/grp-login/liblogind-core/logind-user-dbus.c
index af6392e025..af6392e025 100644
--- a/src/grp-login/logind-user-dbus.c
+++ b/src/grp-login/liblogind-core/logind-user-dbus.c
diff --git a/src/grp-login/logind-user.c b/src/grp-login/liblogind-core/logind-user.c
index a826321bf0..a826321bf0 100644
--- a/src/grp-login/logind-user.c
+++ b/src/grp-login/liblogind-core/logind-user.c
diff --git a/src/grp-login/logind-user.h b/src/grp-login/liblogind-core/logind-user.h
index 4f0966dc77..4f0966dc77 100644
--- a/src/grp-login/logind-user.h
+++ b/src/grp-login/liblogind-core/logind-user.h
diff --git a/src/grp-login/logind-utmp.c b/src/grp-login/liblogind-core/logind-utmp.c
index 47599fd466..47599fd466 100644
--- a/src/grp-login/logind-utmp.c
+++ b/src/grp-login/liblogind-core/logind-utmp.c
diff --git a/src/grp-login/loginctl/Makefile b/src/grp-login/loginctl/Makefile
new file mode 100644
index 0000000000..7c8c3d91a0
--- /dev/null
+++ b/src/grp-login/loginctl/Makefile
@@ -0,0 +1,41 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+loginctl_SOURCES = \
+	src/login/loginctl.c \
+	src/login/sysfs-show.h \
+	src/login/sysfs-show.c
+
+loginctl_LDADD = \
+	libshared.la
+
+rootbin_PROGRAMS += \
+	loginctl
+
+dist_bashcompletion_data += \
+	shell-completion/bash/loginctl
+
+dist_zshcompletion_data += shell-completion/zsh/_loginctl
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/loginctl.c b/src/grp-login/loginctl/loginctl.c
index f3f57b4b13..f3f57b4b13 100644
--- a/src/grp-login/loginctl.c
+++ b/src/grp-login/loginctl/loginctl.c
diff --git a/src/grp-login/sysfs-show.c b/src/grp-login/loginctl/sysfs-show.c
index 29785e2f11..29785e2f11 100644
--- a/src/grp-login/sysfs-show.c
+++ b/src/grp-login/loginctl/sysfs-show.c
diff --git a/src/grp-login/sysfs-show.h b/src/grp-login/loginctl/sysfs-show.h
index 3e94bc3ed5..3e94bc3ed5 100644
--- a/src/grp-login/sysfs-show.h
+++ b/src/grp-login/loginctl/sysfs-show.h
diff --git a/src/grp-login/pam_systemd/Makefile b/src/grp-login/pam_systemd/Makefile
new file mode 100644
index 0000000000..8c87421bb0
--- /dev/null
+++ b/src/grp-login/pam_systemd/Makefile
@@ -0,0 +1,56 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+ifneq ($(HAVE_PAM),)
+pam_systemd_la_SOURCES = \
+	src/login/pam_systemd.sym \
+	src/login/pam_systemd.c
+
+pam_systemd_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(PAM_CFLAGS)
+
+pam_systemd_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-module \
+	-export-dynamic \
+	-avoid-version \
+	-shared \
+	-Wl,--version-script=$(srcdir)/pam_systemd.sym
+
+pam_systemd_la_LIBADD = \
+	libshared.la \
+	$(PAM_LIBS)
+
+pamlib_LTLIBRARIES = \
+	pam_systemd.la
+
+dist_pamconf_DATA = \
+	src/login/systemd-user
+
+EXTRA_DIST += \
+	src/login/systemd-user.m4
+endif # HAVE_PAM
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/pam_systemd.c b/src/grp-login/pam_systemd/pam_systemd.c
index 98dc201340..98dc201340 100644
--- a/src/grp-login/pam_systemd.c
+++ b/src/grp-login/pam_systemd/pam_systemd.c
diff --git a/src/grp-login/pam_systemd.sym b/src/grp-login/pam_systemd/pam_systemd.sym
index 23ff75f688..23ff75f688 100644
--- a/src/grp-login/pam_systemd.sym
+++ b/src/grp-login/pam_systemd/pam_systemd.sym
diff --git a/src/grp-login/systemd-inhibit/Makefile b/src/grp-login/systemd-inhibit/Makefile
new file mode 100644
index 0000000000..93440da575
--- /dev/null
+++ b/src/grp-login/systemd-inhibit/Makefile
@@ -0,0 +1,37 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+dist_zshcompletion_data += shell-completion/zsh/_systemd-inhibit
+
+systemd_inhibit_SOURCES = \
+	src/login/inhibit.c
+
+systemd_inhibit_LDADD = \
+	libshared.la
+
+rootbin_PROGRAMS += \
+	systemd-inhibit
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/inhibit.c b/src/grp-login/systemd-inhibit/inhibit.c
index 905e757a32..905e757a32 100644
--- a/src/grp-login/inhibit.c
+++ b/src/grp-login/systemd-inhibit/inhibit.c
diff --git a/src/grp-login/systemd-logind/Makefile b/src/grp-login/systemd-logind/Makefile
new file mode 100644
index 0000000000..9dd5855e88
--- /dev/null
+++ b/src/grp-login/systemd-logind/Makefile
@@ -0,0 +1,39 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+systemd_logind_SOURCES = \
+	src/login/logind.c \
+	src/login/logind.h
+
+nodist_systemd_logind_SOURCES = \
+	src/login/logind-gperf.c
+
+systemd_logind_LDADD = \
+	liblogind-core.la
+
+rootlibexec_PROGRAMS += \
+	systemd-logind
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/logind.c b/src/grp-login/systemd-logind/logind.c
index 925c04a344..925c04a344 100644
--- a/src/grp-login/logind.c
+++ b/src/grp-login/systemd-logind/logind.c
diff --git a/src/grp-login/logind.h b/src/grp-login/systemd-logind/logind.h
index 9d43c2e7ee..9d43c2e7ee 100644
--- a/src/grp-login/logind.h
+++ b/src/grp-login/systemd-logind/logind.h