chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
label: rearrange mandatory access control(MAC) apis
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index cca949feff88eecf409dc5dc26bf34f188b2786f..3b0ba0ae36503338d171b6d32fb98bba289ee132 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-250,6
+250,7
@@
SOCKETS_TARGET_WANTS =
BUSNAMES_TARGET_WANTS =
TIMERS_TARGET_WANTS =
USER_SOCKETS_TARGET_WANTS =
BUSNAMES_TARGET_WANTS =
TIMERS_TARGET_WANTS =
USER_SOCKETS_TARGET_WANTS =
+USER_DEFAULT_TARGET_WANTS =
USER_BUSNAMES_TARGET_WANTS =
SYSTEM_UNIT_ALIASES =
USER_BUSNAMES_TARGET_WANTS =
SYSTEM_UNIT_ALIASES =
@@
-270,6
+271,7
@@
install-target-wants-hook:
what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+ what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants)
install-busnames-target-wants-hook:
what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
install-busnames-target-wants-hook:
what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
@@
-738,7
+740,6
@@
noinst_LTLIBRARIES += \
libsystemd_shared_la_SOURCES = \
src/shared/linux/auto_dev-ioctl.h \
libsystemd_shared_la_SOURCES = \
src/shared/linux/auto_dev-ioctl.h \
- src/shared/linux/fanotify.h \
src/shared/ioprio.h \
src/shared/missing.h \
src/shared/initreq.h \
src/shared/ioprio.h \
src/shared/missing.h \
src/shared/initreq.h \
@@
-2477,13
+2478,16
@@
nodist_systemunit_DATA += \
dist_systemunit_DATA += \
units/systemd-bus-proxyd.socket
dist_systemunit_DATA += \
units/systemd-bus-proxyd.socket
-dist_userunit_DATA += \
- units/user/systemd-bus-proxyd.socket \
+nodist_userunit_DATA += \
units/user/systemd-bus-proxyd@.service
units/user/systemd-bus-proxyd@.service
+
+dist_userunit_DATA += \
+ units/user/systemd-bus-proxyd.socket
endif
EXTRA_DIST += \
endif
EXTRA_DIST += \
- units/systemd-bus-proxyd@.service.in
+ units/systemd-bus-proxyd@.service.in \
+ units/user/systemd-bus-proxyd@.service.in
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
@@
-3021,7
+3025,7
@@
if ENABLE_TERMINAL
noinst_LTLIBRARIES += \
libsystemd-terminal.la
noinst_LTLIBRARIES += \
libsystemd-terminal.la
-
bin
_PROGRAMS += \
+
rootlibexec
_PROGRAMS += \
systemd-consoled
noinst_PROGRAMS += \
systemd-consoled
noinst_PROGRAMS += \
@@
-3032,6
+3036,15
@@
noinst_PROGRAMS += \
dist_pkgdata_DATA += \
src/libsystemd-terminal/unifont-glyph-array.bin
dist_pkgdata_DATA += \
src/libsystemd-terminal/unifont-glyph-array.bin
+nodist_userunit_DATA += \
+ units/user/systemd-consoled.service
+
+USER_DEFAULT_TARGET_WANTS += \
+ systemd-consoled.service
+
+EXTRA_DIST += \
+ units/user/systemd-consoled.service.in
+
tests += \
test-term-page \
test-term-parser \
tests += \
test-term-page \
test-term-parser \