chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do not install drop-in files; the shared library should be used by default
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 496f730955f8d649b2e7204e4d8e64b2dec04220..4c2d165302198742435fab95308b8a6cd02cdf62 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-189,7
+189,6
@@
rootlibexec_PROGRAMS = \
systemd-remount-api-vfs \
systemd-kmsg-syslogd \
systemd-reply-password \
systemd-remount-api-vfs \
systemd-kmsg-syslogd \
systemd-reply-password \
- systemd-user-sessions \
systemd-fsck \
systemd-quotacheck \
systemd-timestamp \
systemd-fsck \
systemd-quotacheck \
systemd-timestamp \
@@
-339,7
+338,6
@@
nodist_systemunit_DATA = \
units/systemd-random-seed-load.service \
units/systemd-tmpfiles-setup.service \
units/systemd-tmpfiles-clean.service \
units/systemd-random-seed-load.service \
units/systemd-tmpfiles-setup.service \
units/systemd-tmpfiles-clean.service \
- units/systemd-user-sessions.service \
units/systemd-ask-password-wall.service \
units/systemd-ask-password-console.service \
units/systemd-sysctl.service \
units/systemd-ask-password-wall.service \
units/systemd-ask-password-console.service \
units/systemd-sysctl.service \
@@
-377,7
+375,6
@@
EXTRA_DIST += \
units/systemd-random-seed-load.service.in \
units/systemd-tmpfiles-setup.service.in \
units/systemd-tmpfiles-clean.service.in \
units/systemd-random-seed-load.service.in \
units/systemd-tmpfiles-setup.service.in \
units/systemd-tmpfiles-clean.service.in \
- units/systemd-user-sessions.service.in \
units/systemd-ask-password-wall.service.in \
units/systemd-ask-password-console.service.in \
units/systemd-sysctl.service.in \
units/systemd-ask-password-wall.service.in \
units/systemd-ask-password-console.service.in \
units/systemd-sysctl.service.in \
@@
-943,13
+940,6
@@
systemd_rc_local_generator_SOURCES = \
systemd_rc_local_generator_LDADD = \
libsystemd-basic.la
systemd_rc_local_generator_LDADD = \
libsystemd-basic.la
-systemd_user_sessions_SOURCES = \
- src/user-sessions.c \
- src/cgroup-util.c
-
-systemd_user_sessions_LDADD = \
- libsystemd-basic.la
-
systemd_remount_api_vfs_SOURCES = \
src/remount-api-vfs.c \
src/mount-setup.c \
systemd_remount_api_vfs_SOURCES = \
src/remount-api-vfs.c \
src/mount-setup.c \
@@
-1141,10
+1131,6
@@
lib_LTLIBRARIES += \
pkgconfiglib_DATA += \
libsystemd-daemon.pc
pkgconfiglib_DATA += \
libsystemd-daemon.pc
-dist_doc_DATA += \
- src/sd-daemon.h \
- src/sd-daemon.c
-
MANPAGES += \
man/sd-daemon.7 \
man/sd_notify.3 \
MANPAGES += \
man/sd-daemon.7 \
man/sd_notify.3 \
@@
-1166,7
+1152,6
@@
man/sd_is_mq.3: man/sd_is_fifo.3
man/sd_notifyf.3: man/sd_notify.3
EXTRA_DIST += \
man/sd_notifyf.3: man/sd_notify.3
EXTRA_DIST += \
- ${libsystemd_daemon_la_SOURCES:.c=.h} \
libsystemd-daemon.pc.in \
src/libsystemd-daemon.sym
libsystemd-daemon.pc.in \
src/libsystemd-daemon.sym
@@
-1497,10
+1482,6
@@
EXTRA_DIST += \
units/systemd-readahead-replay.service.in \
units/systemd-readahead-done.service.in
units/systemd-readahead-replay.service.in \
units/systemd-readahead-done.service.in
-dist_doc_DATA += \
- src/readahead/sd-readahead.h \
- src/readahead/sd-readahead.c
-
MANPAGES += \
man/sd_readahead.3 \
man/sd-readahead.7
MANPAGES += \
man/sd_readahead.3 \
man/sd-readahead.7
@@
-1685,10
+1666,6
@@
systemd_logind_SOURCES += \
src/acl-util.c
endif
src/acl-util.c
endif
-systemd_logind_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I $(top_srcdir)/src/login
-
systemd_logind_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS) \
systemd_logind_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS) \
@@
-1702,8
+1679,16
@@
systemd_logind_LDADD = \
$(UDEV_LIBS) \
$(ACL_LIBS)
$(UDEV_LIBS) \
$(ACL_LIBS)
+systemd_user_sessions_SOURCES = \
+ src/login/user-sessions.c \
+ src/cgroup-util.c
+
+systemd_user_sessions_LDADD = \
+ libsystemd-basic.la
+
rootlibexec_PROGRAMS += \
rootlibexec_PROGRAMS += \
- systemd-logind
+ systemd-logind \
+ systemd-user-sessions
systemd_loginctl_SOURCES = \
src/login/loginctl.c \
systemd_loginctl_SOURCES = \
src/login/loginctl.c \
@@
-1800,7
+1785,8
@@
UNINSTALL_EXEC_HOOKS += \
libsystemd-login-uninstall-hook
nodist_systemunit_DATA += \
libsystemd-login-uninstall-hook
nodist_systemunit_DATA += \
- units/systemd-logind.service
+ units/systemd-logind.service \
+ units/systemd-user-sessions.service
dist_dbussystemservice_DATA += \
src/login/org.freedesktop.login1.service
dist_dbussystemservice_DATA += \
src/login/org.freedesktop.login1.service
@@
-1828,8
+1814,9
@@
logind-install-data-hook:
rm -f dbus-org.freedesktop.login1.service && \
$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
rm -f dbus-org.freedesktop.login1.service && \
$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f systemd-logind.service && \
- $(LN_S) ../systemd-logind.service systemd-logind.service )
+ rm -f systemd-logind.service systemd-user-sessions.service && \
+ $(LN_S) ../systemd-logind.service systemd-logind.service && \
+ $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
INSTALL_DATA_HOOKS += \
logind-install-data-hook
INSTALL_DATA_HOOKS += \
logind-install-data-hook
@@
-1904,6
+1891,7
@@
man/sd_get_uids.3: man/sd_get_seats.3
EXTRA_DIST += \
src/login/logind-gperf.gperf \
units/systemd-logind.service.in \
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 \
src/login/libsystemd-login.pc.in \
src/login/libsystemd-login.sym \
src/login/logind.h \
@@
-2171,9
+2159,8
@@
systemd-install-data-hook:
$(LN_S) reboot.target ctrl-alt-del.target && \
$(LN_S) getty@.service autovt@.service )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
$(LN_S) reboot.target ctrl-alt-del.target && \
$(LN_S) getty@.service autovt@.service )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f getty.target systemd-
user-sessions.service systemd-
ask-password-wall.path && \
+ rm -f getty.target systemd-ask-password-wall.path && \
$(LN_S) ../getty.target getty.target && \
$(LN_S) ../getty.target getty.target && \
- $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service && \
$(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path)
( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
rm -f getty@tty1.service && \
$(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path)
( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
rm -f getty@tty1.service && \