summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2012-01-22 18:20:42 +0100
committerKay Sievers <kay.sievers@vrfy.org>2012-01-22 18:32:13 +0100
commit131a4dcfd4375f235a1f512339c0909e8bcc730b (patch)
tree7c8410f02ea7b5834a6d53248d4c9ad72bc351c3
parent8f2d43a0121bc9a57ba8b79b33d5ac87d36ca2f2 (diff)
login: move seat udev rules to login subdir
-rw-r--r--Makefile.am33
-rw-r--r--src/.gitignore7
-rw-r--r--src/hostname/.gitignore1
-rw-r--r--src/locale/.gitignore1
-rw-r--r--src/login/.gitignore2
-rw-r--r--src/login/70-uaccess.rules (renamed from src/70-uaccess.rules)0
-rw-r--r--src/login/71-seat.rules (renamed from src/71-seat.rules)0
-rw-r--r--src/login/73-seat-late.rules.in (renamed from src/73-seat-late.rules.in)0
-rw-r--r--src/login/sysfs-show.c (renamed from src/sysfs-show.c)0
-rw-r--r--src/timedate/.gitignore1
10 files changed, 24 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am
index be5e70c9f8..1df603ba60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,6 +73,7 @@ pkginclude_HEADERS =
lib_LTLIBRARIES =
pkgconfiglib_DATA =
polkitpolicy_in_files =
+dist_udevrules_DATA =
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
@@ -222,11 +223,7 @@ dist_dbuspolicy_DATA = \
dist_dbussystemservice_DATA = \
src/org.freedesktop.systemd1.service
-dist_udevrules_DATA = \
- src/71-seat.rules
-
nodist_udevrules_DATA = \
- src/73-seat-late.rules \
src/99-systemd.rules
dbusinterface_DATA = \
@@ -370,7 +367,6 @@ EXTRA_DIST += \
units/user@.service.in \
src/systemd.pc.in \
introspect.awk \
- src/73-seat-late.rules.in \
src/99-systemd.rules.in \
man/custom-html.xsl
@@ -1861,11 +1857,11 @@ rootlibexec_PROGRAMS += \
systemd_loginctl_SOURCES = \
src/login/loginctl.c \
+ src/login/sysfs-show.c \
src/dbus-common.c \
src/cgroup-show.c \
src/cgroup-util.c \
- src/pager.c \
- src/sysfs-show.c
+ src/pager.c
systemd_loginctl_CFLAGS = \
$(AM_CFLAGS) \
@@ -2017,7 +2013,13 @@ rootlibexec_PROGRAMS += \
systemd-uaccess
dist_udevrules_DATA += \
- src/70-uaccess.rules
+ src/login/70-uaccess.rules
+
+dist_udevrules_DATA += \
+ src/login/71-seat.rules
+
+nodist_udevrules_DATA += \
+ src/login/73-seat-late.rules
MANPAGES += \
man/systemd-logind.conf.5 \
@@ -2063,8 +2065,6 @@ man/sd_get_uids.3: man/sd_get_seats.3
EXTRA_DIST += \
src/login/logind-gperf.gperf \
- units/systemd-logind.service.in \
- units/systemd-user-sessions.service.in \
src/login/libsystemd-login.pc.in \
src/login/libsystemd-login.sym \
src/login/logind.h \
@@ -2072,10 +2072,14 @@ EXTRA_DIST += \
src/login/logind-seat.h \
src/login/logind-session.h \
src/login/logind-user.h \
- src/login/logind-acl.h
+ src/login/logind-acl.h \
+ src/login/73-seat-late.rules.in \
+ units/systemd-logind.service.in \
+ units/systemd-user-sessions.service.in
CLEANFILES += \
- src/login/logind-gperf.c
+ src/login/logind-gperf.c \
+ src/login/73-seat-late.rules
endif
# ------------------------------------------------------------------------------
@@ -2152,11 +2156,10 @@ CLEANFILES += \
$(pkgconfigdata_DATA) \
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA) \
- src/73-seat-late.rules \
- src/99-systemd.rules \
src/load-fragment-gperf.gperf \
src/load-fragment-gperf.c \
- src/load-fragment-gperf-nulstr.c
+ src/load-fragment-gperf-nulstr.c \
+ src/99-systemd.rules
if HAVE_VALAC
CLEANFILES += \
diff --git a/src/.gitignore b/src/.gitignore
index c54c6f6514..4b123f86d2 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -3,14 +3,9 @@ load-fragment-gperf-nulstr.c
load-fragment-gperf.c
load-fragment-gperf.gperf
org.freedesktop.systemd1.policy.in
-99-systemd.rules
-org.freedesktop.hostname1.policy
-org.freedesktop.locale1.policy
-org.freedesktop.login1.policy
-org.freedesktop.timedate1.policy
org.freedesktop.systemd1.policy
gnome-ask-password-agent.c
systemd-interfaces.c
systemadm.c
wraplabel.c
-73-seat-late.rules
+99-systemd.rules
diff --git a/src/hostname/.gitignore b/src/hostname/.gitignore
new file mode 100644
index 0000000000..1ff281b231
--- /dev/null
+++ b/src/hostname/.gitignore
@@ -0,0 +1 @@
+org.freedesktop.hostname1.policy
diff --git a/src/locale/.gitignore b/src/locale/.gitignore
new file mode 100644
index 0000000000..b1e0ba755e
--- /dev/null
+++ b/src/locale/.gitignore
@@ -0,0 +1 @@
+org.freedesktop.locale1.policy
diff --git a/src/login/.gitignore b/src/login/.gitignore
index 7c420cb09b..1c0f3995ed 100644
--- a/src/login/.gitignore
+++ b/src/login/.gitignore
@@ -1 +1,3 @@
logind-gperf.c
+org.freedesktop.login1.policy
+73-seat-late.rules
diff --git a/src/70-uaccess.rules b/src/login/70-uaccess.rules
index 6932492260..6932492260 100644
--- a/src/70-uaccess.rules
+++ b/src/login/70-uaccess.rules
diff --git a/src/71-seat.rules b/src/login/71-seat.rules
index 99425adfb7..99425adfb7 100644
--- a/src/71-seat.rules
+++ b/src/login/71-seat.rules
diff --git a/src/73-seat-late.rules.in b/src/login/73-seat-late.rules.in
index 0847932d77..0847932d77 100644
--- a/src/73-seat-late.rules.in
+++ b/src/login/73-seat-late.rules.in
diff --git a/src/sysfs-show.c b/src/login/sysfs-show.c
index b8b356d77b..b8b356d77b 100644
--- a/src/sysfs-show.c
+++ b/src/login/sysfs-show.c
diff --git a/src/timedate/.gitignore b/src/timedate/.gitignore
new file mode 100644
index 0000000000..48757f0968
--- /dev/null
+++ b/src/timedate/.gitignore
@@ -0,0 +1 @@
+org.freedesktop.timedate1.policy