summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-12-31 03:24:31 +0100
committerLennart Poettering <lennart@poettering.net>2011-12-31 03:24:31 +0100
commit4deba285591ad2a388496d9c017da25e68db6f30 (patch)
tree93048a4ec3679990b2294d5a5d36046079e31774
parent4bba9156da3e1df2cee24d10d7cd88c776ef4179 (diff)
logind: move more files into subdirectory
-rw-r--r--Makefile.am12
-rw-r--r--src/.gitignore1
-rw-r--r--src/login/.gitignore1
-rw-r--r--src/login/libsystemd-login.sym (renamed from src/libsystemd-login.sym)0
-rw-r--r--src/login/org.freedesktop.login1.conf (renamed from src/org.freedesktop.login1.conf)0
-rw-r--r--src/login/org.freedesktop.login1.policy.in (renamed from src/org.freedesktop.login1.policy.in)0
-rw-r--r--src/login/org.freedesktop.login1.service (renamed from src/org.freedesktop.login1.service)0
-rw-r--r--src/login/systemd-logind.conf (renamed from src/systemd-logind.conf)0
8 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index f8735dee82..da2e980b13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -258,11 +258,11 @@ endif
dist_pkgsysconf_DATA = \
src/system.conf \
src/user.conf \
- src/systemd-logind.conf
+ src/login/systemd-logind.conf
dist_dbuspolicy_DATA = \
src/org.freedesktop.systemd1.conf \
- src/org.freedesktop.login1.conf
+ src/login/org.freedesktop.login1.conf
if ENABLE_HOSTNAMED
dist_dbuspolicy_DATA += \
@@ -281,7 +281,7 @@ endif
dist_dbussystemservice_DATA = \
src/org.freedesktop.systemd1.service \
- src/org.freedesktop.login1.service
+ src/login/org.freedesktop.login1.service
if ENABLE_HOSTNAMED
dist_dbussystemservice_DATA += \
@@ -520,7 +520,7 @@ EXTRA_DIST = \
libsystemd-id128.pc.in \
libsystemd-journal.pc.in \
src/libsystemd-daemon.sym \
- src/libsystemd-login.sym \
+ src/login/libsystemd-login.sym \
src/libsystemd-id128.sym \
src/libsystemd-journal.sym \
introspect.awk \
@@ -627,7 +627,7 @@ pkgconfiglib_DATA = \
# Passed through intltool only
polkitpolicy_in_files = \
- src/org.freedesktop.login1.policy.in
+ src/login/org.freedesktop.login1.policy.in
if ENABLE_HOSTNAMED
polkitpolicy_in_files += \
@@ -1730,7 +1730,7 @@ libsystemd_login_la_CFLAGS = \
libsystemd_login_la_LDFLAGS = \
-shared \
-version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/libsystemd-login.sym
+ -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
libsystemd_login_la_LIBADD = \
libsystemd-basic.la
diff --git a/src/.gitignore b/src/.gitignore
index a3fd20b404..ff2737b761 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,7 +1,6 @@
load-fragment-gperf-nulstr.c
load-fragment-gperf.c
load-fragment-gperf.gperf
-logind-gperf.c
org.freedesktop.systemd1.policy.in
99-systemd.rules
org.freedesktop.hostname1.policy
diff --git a/src/login/.gitignore b/src/login/.gitignore
new file mode 100644
index 0000000000..7c420cb09b
--- /dev/null
+++ b/src/login/.gitignore
@@ -0,0 +1 @@
+logind-gperf.c
diff --git a/src/libsystemd-login.sym b/src/login/libsystemd-login.sym
index 0d51fa76e7..0d51fa76e7 100644
--- a/src/libsystemd-login.sym
+++ b/src/login/libsystemd-login.sym
diff --git a/src/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf
index c423ef5930..c423ef5930 100644
--- a/src/org.freedesktop.login1.conf
+++ b/src/login/org.freedesktop.login1.conf
diff --git a/src/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy.in
index adc904886d..adc904886d 100644
--- a/src/org.freedesktop.login1.policy.in
+++ b/src/login/org.freedesktop.login1.policy.in
diff --git a/src/org.freedesktop.login1.service b/src/login/org.freedesktop.login1.service
index 4a64177e30..4a64177e30 100644
--- a/src/org.freedesktop.login1.service
+++ b/src/login/org.freedesktop.login1.service
diff --git a/src/systemd-logind.conf b/src/login/systemd-logind.conf
index 99098040f4..99098040f4 100644
--- a/src/systemd-logind.conf
+++ b/src/login/systemd-logind.conf