From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 17 Mar 2014 17:28:30 +0000 (+0100)
Subject: build-sys: move sd-login src/login → src/libsystemd/sd-login
X-Git-Tag: v212~128
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=58dfc42ecfa95f2b859790d726bfae2feea1faa9;hp=4c63a53ac5190dc8b837c15daefec5772de66bdc

build-sys: move sd-login src/login → src/libsystemd/sd-login

After all, it is ultimately linked to libsystems.so anyway, thus belongs
there and shares very little with the rest of logind, hence let's move
this away.
---

diff --git a/Makefile.am b/Makefile.am
index 4f94587f7..f0cfe46e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -797,7 +797,9 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/generator.h \
 	src/shared/generator.c \
 	src/shared/clean-ipc.h \
-	src/shared/clean-ipc.c
+	src/shared/clean-ipc.c \
+	src/shared/login-shared.c \
+	src/shared/login-shared.h
 
 nodist_libsystemd_shared_la_SOURCES = \
 	src/shared/errno-from-name.h \
@@ -2108,9 +2110,7 @@ libsystemd_internal_la_SOURCES = \
 	src/libsystemd/sd-resolve/resolve-util.h \
 	src/libsystemd/sd-id128/sd-id128.c \
 	src/libsystemd/sd-daemon/sd-daemon.c \
-	src/login/sd-login.c \
-	src/login/login-shared.c \
-	src/login/login-shared.h
+	src/libsystemd/sd-login/sd-login.c
 
 nodist_libsystemd_internal_la_SOURCES = \
 	src/libsystemd/libsystemd.sym \
@@ -2753,10 +2753,8 @@ if HAVE_ACL
 libudev_core_la_SOURCES += \
 	src/udev/udev-builtin-uaccess.c \
 	src/login/logind-acl.c \
-	src/login/sd-login.c \
-	src/systemd/sd-login.h \
-	src/login/login-shared.c \
-	src/login/login-shared.h
+	src/libsystemd/sd-login/sd-login.c \
+	src/systemd/sd-login.h
 
 libudev_core_la_LIBADD += \
 	libsystemd-acl.la
@@ -4221,9 +4219,7 @@ libsystemd_logind_core_la_SOURCES = \
 	src/login/logind-session-dbus.c \
 	src/login/logind-seat-dbus.c \
 	src/login/logind-user-dbus.c \
-	src/login/logind-acl.h \
-	src/login/login-shared.c \
-	src/login/login-shared.h
+	src/login/logind-acl.h
 
 libsystemd_logind_core_la_LIBADD = \
 	libsystemd-label.la \
@@ -4283,7 +4279,7 @@ rootbin_PROGRAMS += \
 	systemd-inhibit
 
 test_login_SOURCES = \
-	src/login/test-login.c
+	src/libsystemd/sd-login/test-login.c
 
 test_login_LDADD = \
 	libsystemd-internal.la \
diff --git a/src/login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
similarity index 100%
rename from src/login/sd-login.c
rename to src/libsystemd/sd-login/sd-login.c
diff --git a/src/login/test-login.c b/src/libsystemd/sd-login/test-login.c
similarity index 100%
rename from src/login/test-login.c
rename to src/libsystemd/sd-login/test-login.c
diff --git a/src/login/login-shared.c b/src/shared/login-shared.c
similarity index 100%
rename from src/login/login-shared.c
rename to src/shared/login-shared.c
diff --git a/src/login/login-shared.h b/src/shared/login-shared.h
similarity index 100%
rename from src/login/login-shared.h
rename to src/shared/login-shared.h