chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: add new "scope" unit type for making a unit of pre-existing processes
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 5a285be34318d0d135a056bd750080925a21b5d5..4593245d40538629ebb3f282cd5a1660c4bf3d0d 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-222,6
+222,7
@@
install-target-wants-hook:
what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
+ what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants)
define add-wants
[ -z "$$what" ] || ( \
define add-wants
[ -z "$$what" ] || ( \
@@
-289,7
+290,8
@@
bin_PROGRAMS = \
systemd-nspawn \
systemd-detect-virt \
systemd-delta \
systemd-nspawn \
systemd-detect-virt \
systemd-delta \
- systemd-analyze
+ systemd-analyze \
+ systemd-run
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
@@
-376,6
+378,9
@@
dist_systemunit_DATA = \
units/paths.target \
units/suspend.target \
units/swap.target \
units/paths.target \
units/suspend.target \
units/swap.target \
+ units/slices.target \
+ units/system.slice \
+ units/-.slice \
units/systemd-initctl.socket \
units/systemd-shutdownd.socket \
units/syslog.socket \
units/systemd-initctl.socket \
units/systemd-shutdownd.socket \
units/syslog.socket \
@@
-845,6
+850,8
@@
libsystemd_core_la_SOURCES = \
src/core/path.h \
src/core/slice.c \
src/core/slice.h \
src/core/path.h \
src/core/slice.c \
src/core/slice.h \
+ src/core/scope.c \
+ src/core/scope.h \
src/core/load-dropin.c \
src/core/load-dropin.h \
src/core/execute.c \
src/core/load-dropin.c \
src/core/load-dropin.h \
src/core/execute.c \
@@
-877,14
+884,18
@@
libsystemd_core_la_SOURCES = \
src/core/dbus-snapshot.h \
src/core/dbus-device.c \
src/core/dbus-device.h \
src/core/dbus-snapshot.h \
src/core/dbus-device.c \
src/core/dbus-device.h \
- src/core/dbus-execute.c \
- src/core/dbus-execute.h \
- src/core/dbus-kill.c \
- src/core/dbus-kill.h \
src/core/dbus-path.c \
src/core/dbus-path.h \
src/core/dbus-slice.c \
src/core/dbus-slice.h \
src/core/dbus-path.c \
src/core/dbus-path.h \
src/core/dbus-slice.c \
src/core/dbus-slice.h \
+ src/core/dbus-scope.c \
+ src/core/dbus-scope.h \
+ src/core/dbus-execute.c \
+ src/core/dbus-execute.h \
+ src/core/dbus-kill.c \
+ src/core/dbus-kill.h \
+ src/core/dbus-cgroup.c \
+ src/core/dbus-cgroup.h \
src/core/cgroup.c \
src/core/cgroup.h \
src/core/selinux-access.c \
src/core/cgroup.c \
src/core/cgroup.h \
src/core/selinux-access.c \
@@
-911,10
+922,6
@@
libsystemd_core_la_SOURCES = \
src/core/namespace.h \
src/core/tcpwrap.c \
src/core/tcpwrap.h \
src/core/namespace.h \
src/core/tcpwrap.c \
src/core/tcpwrap.h \
- src/core/cgroup-attr.c \
- src/core/cgroup-attr.h \
- src/core/cgroup-semantics.c \
- src/core/cgroup-semantics.h \
src/core/securebits.h \
src/core/initreq.h \
src/core/special.h \
src/core/securebits.h \
src/core/initreq.h \
src/core/special.h \
@@
-1096,7
+1103,8
@@
tests += \
test-prioq \
test-fileio \
test-time \
test-prioq \
test-fileio \
test-time \
- test-hashmap
+ test-hashmap \
+ test-list
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1134,6
+1142,10
@@
test_ns_SOURCES = \
test_ns_LDADD = \
libsystemd-core.la
test_ns_LDADD = \
libsystemd-core.la
+test_ns_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
test_loopback_SOURCES = \
src/test/test-loopback.c
test_loopback_SOURCES = \
src/test/test-loopback.c
@@
-1196,6
+1208,15
@@
test_hashmap_CFLAGS = \
test_hashmap_LDADD = \
libsystemd-core.la
test_hashmap_LDADD = \
libsystemd-core.la
+test_list_SOURCES = \
+ src/test/test-list.c
+
+test_list_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_list_LDADD = \
+ libsystemd-core.la
+
test_prioq_SOURCES = \
src/test/test-prioq.c
test_prioq_SOURCES = \
src/test/test-prioq.c
@@
-1696,7
+1717,20
@@
systemd_nspawn_LDADD = \
libsystemd-capability.la \
libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-capability.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-id128-internal.la
+ libsystemd-id128-internal.la \
+ libsystemd-bus.la
+
+# ------------------------------------------------------------------------------
+systemd_run_SOURCES = \
+ src/run/run.c
+
+systemd_run_LDADD = \
+ libsystemd-label.la \
+ libsystemd-capability.la \
+ libsystemd-shared.la \
+ libsystemd-daemon.la \
+ libsystemd-id128-internal.la \
+ libsystemd-bus.la
# ------------------------------------------------------------------------------
systemd_stdio_bridge_SOURCES = \
# ------------------------------------------------------------------------------
systemd_stdio_bridge_SOURCES = \
@@
-1969,6
+2003,7
@@
libudev_la_LDFLAGS = \
libudev_la_LIBADD = \
libsystemd-shared.la \
libudev_la_LIBADD = \
libsystemd-shared.la \
+ libsystemd-label.la \
libsystemd-daemon-internal.la \
libsystemd-id128-internal.la
libsystemd-daemon-internal.la \
libsystemd-id128-internal.la
@@
-2568,6
+2603,7
@@
dist_udevkeymap_DATA = \
keymaps/oqo-model2 \
keymaps/samsung-other \
keymaps/samsung-series-9 \
keymaps/oqo-model2 \
keymaps/samsung-other \
keymaps/samsung-series-9 \
+ keymaps/samsung-series-3 \
keymaps/samsung-sq1us \
keymaps/samsung-sx20s \
keymaps/toshiba-satellite_a100 \
keymaps/samsung-sq1us \
keymaps/samsung-sx20s \
keymaps/toshiba-satellite_a100 \
@@
-2582,6
+2618,7
@@
dist_udevkeymapforcerel_DATA = \
keymaps-force-release/hp-other \
keymaps-force-release/samsung-other \
keymaps-force-release/samsung-series-9 \
keymaps-force-release/hp-other \
keymaps-force-release/samsung-other \
keymaps-force-release/samsung-series-9 \
+ keymaps-force-release/samsung-series-3 \
keymaps-force-release/common-volume-keys
src/udev/keymap/keys.txt: Makefile
keymaps-force-release/common-volume-keys
src/udev/keymap/keys.txt: Makefile
@@
-2632,6
+2669,7
@@
libsystemd_id128_la_LDFLAGS = \
libsystemd_id128_la_LIBADD = \
libsystemd-shared.la \
libsystemd_id128_la_LIBADD = \
libsystemd-shared.la \
+ libsystemd-label.la \
libsystemd-daemon-internal.la
libsystemd_id128_internal_la_SOURCES = \
libsystemd-daemon-internal.la
libsystemd_id128_internal_la_SOURCES = \
@@
-3547,6
+3585,8
@@
systemd_logind_SOURCES = \
src/login/logind-seat.h \
src/login/logind-session.c \
src/login/logind-session.h \
src/login/logind-seat.h \
src/login/logind-session.c \
src/login/logind-session.h \
+ src/login/logind-machine.c \
+ src/login/logind-machine.h \
src/login/logind-user.c \
src/login/logind-user.h \
src/login/logind-inhibit.c \
src/login/logind-user.c \
src/login/logind-user.h \
src/login/logind-inhibit.c \
@@
-3554,6
+3594,7
@@
systemd_logind_SOURCES = \
src/login/logind-session-dbus.c \
src/login/logind-seat-dbus.c \
src/login/logind-user-dbus.c \
src/login/logind-session-dbus.c \
src/login/logind-seat-dbus.c \
src/login/logind-user-dbus.c \
+ src/login/logind-machine-dbus.c \
src/login/logind-acl.h
nodist_systemd_logind_SOURCES = \
src/login/logind-acl.h
nodist_systemd_logind_SOURCES = \
@@
-3569,6
+3610,7
@@
systemd_logind_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-dbus.la \
libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-dbus.la \
+ libsystemd-id128-internal.la \
libudev.la
if HAVE_ACL
libudev.la
if HAVE_ACL
@@
-3706,6
+3748,10
@@
nodist_systemunit_DATA += \
units/systemd-logind.service \
units/systemd-user-sessions.service
units/systemd-logind.service \
units/systemd-user-sessions.service
+dist_systemunit_DATA += \
+ units/user.slice \
+ units/machine.slice
+
dist_dbussystemservice_DATA += \
src/login/org.freedesktop.login1.service
dist_dbussystemservice_DATA += \
src/login/org.freedesktop.login1.service