chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: add some O_CLOEXEC
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 256df898977b2d971467bc8b150aa07be1ac1424..3b7ec0b7ba24526bbb0bc2b341b4b311b3fed0ff 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-24,28
+24,28
@@
AM_MAKEFLAGS = --no-print-directory
SUBDIRS = . po
LIBUDEV_CURRENT=1
SUBDIRS = . po
LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=
1
+LIBUDEV_REVISION=
2
LIBUDEV_AGE=0
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
LIBUDEV_AGE=0
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=
2
-LIBSYSTEMD_LOGIN_REVISION=
4
-LIBSYSTEMD_LOGIN_AGE=
2
+LIBSYSTEMD_LOGIN_CURRENT=
3
+LIBSYSTEMD_LOGIN_REVISION=
0
+LIBSYSTEMD_LOGIN_AGE=
3
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=2
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=2
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=
5
+LIBSYSTEMD_ID128_REVISION=
6
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=
1
-LIBSYSTEMD_JOURNAL_REVISION=
1
-LIBSYSTEMD_JOURNAL_AGE=
1
+LIBSYSTEMD_JOURNAL_CURRENT=
2
+LIBSYSTEMD_JOURNAL_REVISION=
0
+LIBSYSTEMD_JOURNAL_AGE=
2
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-96,6
+96,7
@@
dist_udevrules_DATA =
nodist_udevrules_DATA =
dist_man_MANS =
dist_pkgsysconf_DATA =
nodist_udevrules_DATA =
dist_man_MANS =
dist_pkgsysconf_DATA =
+dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dbusinterface_DATA =
dist_dbussystemservice_DATA =
dist_dbuspolicy_DATA =
dbusinterface_DATA =
dist_dbussystemservice_DATA =
@@
-307,9
+308,8
@@
dist_systemunit_DATA = \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/syslog.target \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/syslog.target \
- units/systemd-udev-control.socket \
- units/systemd-udev-kernel.socket \
- units/systemd-timedated-ntp.target \
+ units/systemd-udevd-control.socket \
+ units/systemd-udevd-kernel.socket \
units/system-update.target
nodist_systemunit_DATA = \
units/system-update.target
nodist_systemunit_DATA = \
@@
-339,10
+339,10
@@
nodist_systemunit_DATA = \
units/systemd-kexec.service \
units/systemd-fsck@.service \
units/systemd-fsck-root.service \
units/systemd-kexec.service \
units/systemd-fsck@.service \
units/systemd-fsck-root.service \
- units/systemd-udev.service \
+ units/systemd-udev
d
.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
- units/
systemd-
debug-shell.service
+ units/debug-shell.service
dist_userunit_DATA = \
units/user/default.target \
dist_userunit_DATA = \
units/user/default.target \
@@
-377,10
+377,10
@@
EXTRA_DIST += \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
units/user@.service.in \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
units/user@.service.in \
- units/systemd-udev.service \
+ units/systemd-udev
d
.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
- units/
systemd-
debug-shell.service.in \
+ units/debug-shell.service.in \
units/systemd-hibernate.service.in \
units/systemd-suspend.service.in \
introspect.awk \
units/systemd-hibernate.service.in \
units/systemd-suspend.service.in \
introspect.awk \
@@
-500,7
+500,8
@@
MANPAGES = \
man/systemd-tty-ask-password-agent.1 \
man/systemd-getty-generator.8 \
man/systemd-system-update-generator.8 \
man/systemd-tty-ask-password-agent.1 \
man/systemd-getty-generator.8 \
man/systemd-system-update-generator.8 \
- man/systemd-fstab-generator.8
+ man/systemd-fstab-generator.8 \
+ man/systemd.preset.5
MANPAGES_ALIAS = \
man/reboot.8 \
MANPAGES_ALIAS = \
man/reboot.8 \
@@
-1532,21
+1533,21
@@
CLEANFILES += \
src/udev/udev.pc
EXTRA_DIST += \
src/udev/udev.pc
EXTRA_DIST += \
- units/systemd-udev.service.in \
+ units/systemd-udev
d
.service.in \
units/systemd-udev-trigger.service.in \
units/systemd-udev-settle.service.in
CLEANFILES += \
units/systemd-udev-trigger.service.in \
units/systemd-udev-settle.service.in
CLEANFILES += \
- units/systemd-udev.service \
+ units/systemd-udev
d
.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service
systemd-install-hook:
mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service
systemd-install-hook:
mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
- ln -sf ../systemd-udev
-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev
-control.socket
- ln -sf ../systemd-udev
-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev
-kernel.socket
+ ln -sf ../systemd-udev
d-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd
-control.socket
+ ln -sf ../systemd-udev
d-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd
-kernel.socket
mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
- ln -sf ../systemd-udev
.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev
.service
+ ln -sf ../systemd-udev
d.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd
.service
ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
INSTALL_DATA_HOOKS += systemd-install-hook
ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
INSTALL_DATA_HOOKS += systemd-install-hook
@@
-2744,7
+2745,7
@@
man/systemd-localed.8: man/systemd-localed.service.8
EXTRA_DIST += \
units/systemd-localed.service.in
EXTRA_DIST += \
units/systemd-localed.service.in
-dist_pkgdata_DATA = \
+dist_pkgdata_DATA
+
= \
src/locale/kbd-model-map
dist_noinst_SCRIPT = \
src/locale/kbd-model-map
dist_noinst_SCRIPT = \
@@
-3388,9
+3389,6
@@
if TARGET_FEDORA
rm -f display-manager.service single.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) rescue.service single.service )
rm -f display-manager.service single.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) rescue.service single.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_MANDRIVA
endif
if TARGET_MANDRIVA
@@
-3399,9
+3397,6
@@
if TARGET_MANDRIVA
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) prefdm.service dm.service && \
$(LN_S) rescue.service single.service )
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) prefdm.service dm.service && \
$(LN_S) rescue.service single.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_DEBIAN_OR_UBUNTU
endif
if TARGET_DEBIAN_OR_UBUNTU
@@
-3421,9
+3416,6
@@
if TARGET_MAGEIA
rm -f display-manager.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) prefdm.service dm.service )
rm -f display-manager.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) prefdm.service dm.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
install-exec-hook: $(INSTALL_EXEC_HOOKS)
endif
install-exec-hook: $(INSTALL_EXEC_HOOKS)