From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 31 Dec 2011 02:16:08 +0000 (+0100)
Subject: logind: move logind into its own subdirectory
X-Git-Tag: v38~139
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4bba9156da3e1df2cee24d10d7cd88c776ef4179;ds=sidebyside

logind: move logind into its own subdirectory
---

diff --git a/Makefile.am b/Makefile.am
index 6629d91b9..f8735dee8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -231,7 +231,7 @@ lib_LTLIBRARIES = \
 
 pkginclude_HEADERS = \
 	src/sd-daemon.h \
-	src/sd-login.h \
+	src/login/sd-login.h \
         src/sd-id128.h \
         src/journal/sd-journal.h
 
@@ -792,12 +792,12 @@ EXTRA_DIST += \
         src/pager.h \
         src/sysfs-show.h \
         src/polkit.h \
-        src/logind.h \
-        src/logind-device.h \
-        src/logind-seat.h \
-        src/logind-session.h \
-        src/logind-user.h \
-        src/logind-acl.h \
+        src/login/logind.h \
+        src/login/logind-device.h \
+        src/login/logind-seat.h \
+        src/login/logind-session.h \
+        src/login/logind-user.h \
+        src/login/logind-acl.h \
         src/dbus-loop.h \
         src/spawn-agent.h \
         src/journal/journal-def.h \
@@ -1018,7 +1018,7 @@ test_strv_LDADD = \
 	libsystemd-basic.la
 
 test_login_SOURCES = \
-	src/test-login.c
+	src/login/test-login.c
 
 test_login_CFLAGS = \
 	$(AM_CFLAGS)
@@ -1230,25 +1230,25 @@ systemd_timedated_LDADD = \
 	$(DBUS_LIBS)
 
 systemd_logind_SOURCES = \
-	src/logind.c \
-	src/logind-dbus.c \
-        src/logind-device.c \
-        src/logind-seat.c \
-        src/logind-seat-dbus.c \
-        src/logind-session.c \
-        src/logind-session-dbus.c \
-        src/logind-user.c \
-        src/logind-user-dbus.c \
+	src/login/logind.c \
+	src/login/logind-dbus.c \
+        src/login/logind-device.c \
+        src/login/logind-seat.c \
+        src/login/logind-seat-dbus.c \
+        src/login/logind-session.c \
+        src/login/logind-session-dbus.c \
+        src/login/logind-user.c \
+        src/login/logind-user-dbus.c \
         src/dbus-common.c \
         src/dbus-loop.c \
         src/cgroup-util.c \
         src/polkit.c
 
 nodist_systemd_logind_SOURCES = \
-        src/logind-gperf.c
+        src/login/logind-gperf.c
 
 EXTRA_DIST += \
-        src/logind-gperf.gperf
+        src/login/logind-gperf.gperf
 
 systemd_logind_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1264,15 +1264,15 @@ systemd_logind_LDADD = \
         $(ACL_LIBS)
 
 systemd_uaccess_SOURCES = \
-	src/uaccess.c
+	src/login/uaccess.c
 
 if HAVE_ACL
 systemd_logind_SOURCES += \
-	src/logind-acl.c \
+	src/login/logind-acl.c \
         src/acl-util.c
 
 systemd_uaccess_SOURCES += \
-	src/logind-acl.c \
+	src/login/logind-acl.c \
         src/acl-util.c
 endif
 
@@ -1519,7 +1519,7 @@ systemctl_LDADD = \
 	$(DBUS_LIBS)
 
 systemd_loginctl_SOURCES = \
-	src/loginctl.c \
+	src/login/loginctl.c \
 	src/dbus-common.c \
 	src/cgroup-show.c \
 	src/cgroup-util.c \
@@ -1720,7 +1720,7 @@ libsystemd-daemon-uninstall-hook:
 	rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
 
 libsystemd_login_la_SOURCES = \
-        src/sd-login.c \
+        src/login/sd-login.c \
         src/cgroup-util.c
 
 libsystemd_login_la_CFLAGS = \
@@ -1886,7 +1886,7 @@ CLEANFILES = \
         src/load-fragment-gperf.gperf \
         src/load-fragment-gperf.c \
         src/load-fragment-gperf-nulstr.c \
-        src/logind-gperf.c
+        src/login/logind-gperf.c
 
 if HAVE_VALAC
 CLEANFILES += \
diff --git a/src/login/Makefile b/src/login/Makefile
new file mode 120000
index 000000000..d0b0e8e00
--- /dev/null
+++ b/src/login/Makefile
@@ -0,0 +1 @@
+../Makefile
\ No newline at end of file
diff --git a/src/loginctl.c b/src/login/loginctl.c
similarity index 100%
rename from src/loginctl.c
rename to src/login/loginctl.c
diff --git a/src/logind-acl.c b/src/login/logind-acl.c
similarity index 100%
rename from src/logind-acl.c
rename to src/login/logind-acl.c
diff --git a/src/logind-acl.h b/src/login/logind-acl.h
similarity index 100%
rename from src/logind-acl.h
rename to src/login/logind-acl.h
diff --git a/src/logind-dbus.c b/src/login/logind-dbus.c
similarity index 100%
rename from src/logind-dbus.c
rename to src/login/logind-dbus.c
diff --git a/src/logind-device.c b/src/login/logind-device.c
similarity index 100%
rename from src/logind-device.c
rename to src/login/logind-device.c
diff --git a/src/logind-device.h b/src/login/logind-device.h
similarity index 100%
rename from src/logind-device.h
rename to src/login/logind-device.h
diff --git a/src/logind-gperf.gperf b/src/login/logind-gperf.gperf
similarity index 100%
rename from src/logind-gperf.gperf
rename to src/login/logind-gperf.gperf
diff --git a/src/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
similarity index 100%
rename from src/logind-seat-dbus.c
rename to src/login/logind-seat-dbus.c
diff --git a/src/logind-seat.c b/src/login/logind-seat.c
similarity index 100%
rename from src/logind-seat.c
rename to src/login/logind-seat.c
diff --git a/src/logind-seat.h b/src/login/logind-seat.h
similarity index 100%
rename from src/logind-seat.h
rename to src/login/logind-seat.h
diff --git a/src/logind-session-dbus.c b/src/login/logind-session-dbus.c
similarity index 100%
rename from src/logind-session-dbus.c
rename to src/login/logind-session-dbus.c
diff --git a/src/logind-session.c b/src/login/logind-session.c
similarity index 100%
rename from src/logind-session.c
rename to src/login/logind-session.c
diff --git a/src/logind-session.h b/src/login/logind-session.h
similarity index 100%
rename from src/logind-session.h
rename to src/login/logind-session.h
diff --git a/src/logind-user-dbus.c b/src/login/logind-user-dbus.c
similarity index 100%
rename from src/logind-user-dbus.c
rename to src/login/logind-user-dbus.c
diff --git a/src/logind-user.c b/src/login/logind-user.c
similarity index 100%
rename from src/logind-user.c
rename to src/login/logind-user.c
diff --git a/src/logind-user.h b/src/login/logind-user.h
similarity index 100%
rename from src/logind-user.h
rename to src/login/logind-user.h
diff --git a/src/logind.c b/src/login/logind.c
similarity index 100%
rename from src/logind.c
rename to src/login/logind.c
diff --git a/src/logind.h b/src/login/logind.h
similarity index 100%
rename from src/logind.h
rename to src/login/logind.h
diff --git a/src/sd-login.c b/src/login/sd-login.c
similarity index 100%
rename from src/sd-login.c
rename to src/login/sd-login.c
diff --git a/src/sd-login.h b/src/login/sd-login.h
similarity index 100%
rename from src/sd-login.h
rename to src/login/sd-login.h
diff --git a/src/test-login.c b/src/login/test-login.c
similarity index 100%
rename from src/test-login.c
rename to src/login/test-login.c
diff --git a/src/uaccess.c b/src/login/uaccess.c
similarity index 100%
rename from src/uaccess.c
rename to src/login/uaccess.c