chiark / gitweb /
logind: move more files into subdirectory
authorLennart Poettering <lennart@poettering.net>
Sat, 31 Dec 2011 02:24:31 +0000 (03:24 +0100)
committerLennart Poettering <lennart@poettering.net>
Sat, 31 Dec 2011 02:24:31 +0000 (03:24 +0100)
Makefile.am
src/.gitignore
src/login/.gitignore [new file with mode: 0644]
src/login/libsystemd-login.sym [moved from src/libsystemd-login.sym with 100% similarity]
src/login/org.freedesktop.login1.conf [moved from src/org.freedesktop.login1.conf with 100% similarity]
src/login/org.freedesktop.login1.policy.in [moved from src/org.freedesktop.login1.policy.in with 100% similarity]
src/login/org.freedesktop.login1.service [moved from src/org.freedesktop.login1.service with 100% similarity]
src/login/systemd-logind.conf [moved from src/systemd-logind.conf with 100% similarity]

index f8735de..da2e980 100644 (file)
@@ -258,11 +258,11 @@ endif
 dist_pkgsysconf_DATA = \
        src/system.conf \
         src/user.conf \
 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 \
 
 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 += \
 
 if ENABLE_HOSTNAMED
 dist_dbuspolicy_DATA += \
@@ -281,7 +281,7 @@ endif
 
 dist_dbussystemservice_DATA = \
        src/org.freedesktop.systemd1.service \
 
 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 += \
 
 if ENABLE_HOSTNAMED
 dist_dbussystemservice_DATA += \
@@ -520,7 +520,7 @@ EXTRA_DIST = \
         libsystemd-id128.pc.in \
         libsystemd-journal.pc.in \
        src/libsystemd-daemon.sym \
         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 \
        src/libsystemd-id128.sym \
        src/libsystemd-journal.sym \
        introspect.awk \
@@ -627,7 +627,7 @@ pkgconfiglib_DATA = \
 
 # Passed through intltool only
 polkitpolicy_in_files = \
 
 # 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 += \
 
 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) \
 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
 
 libsystemd_login_la_LIBADD = \
        libsystemd-basic.la
index a3fd20b..ff2737b 100644 (file)
@@ -1,7 +1,6 @@
 load-fragment-gperf-nulstr.c
 load-fragment-gperf.c
 load-fragment-gperf.gperf
 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
 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 (file)
index 0000000..7c420cb
--- /dev/null
@@ -0,0 +1 @@
+logind-gperf.c