chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus-proxyd: don't allow to acquire org.freedesktop.DBus name
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index baa1398a41b2772f1d99594f3b5d3a90addbdece..0b46a128a7c7be7bd817e0b3fe58a10cea9644b5 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-74,7
+74,6
@@
dbussessionservicedir=@dbussessionservicedir@
dbussystemservicedir=@dbussystemservicedir@
pamlibdir=@pamlibdir@
pamconfdir=@pamconfdir@
dbussystemservicedir=@dbussystemservicedir@
pamlibdir=@pamlibdir@
pamconfdir=@pamconfdir@
-pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=@bashcompletiondir@
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=@bashcompletiondir@
@@
-506,7
+505,8
@@
dist_systemunit_DATA = \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
- units/initrd-switch-root.target
+ units/initrd-switch-root.target \
+ units/machines.target
if ENABLE_KDBUS
dist_systemunit_DATA += \
if ENABLE_KDBUS
dist_systemunit_DATA += \
@@
-896,8
+896,14
@@
libsystemd_shared_la_SOURCES = \
src/shared/nss-util.h \
src/shared/btrfs-util.c \
src/shared/btrfs-util.h \
src/shared/nss-util.h \
src/shared/btrfs-util.c \
src/shared/btrfs-util.h \
+ src/shared/btrfs-ctree.h \
src/shared/verbs.c \
src/shared/verbs.c \
- src/shared/verbs.h
+ src/shared/verbs.h \
+ src/shared/machine-image.c \
+ src/shared/machine-image.h \
+ src/shared/sigbus.c \
+ src/shared/sigbus.h \
+ src/shared/build.h
if HAVE_UTMP
libsystemd_shared_la_SOURCES += \
if HAVE_UTMP
libsystemd_shared_la_SOURCES += \
@@
-1046,10
+1052,10
@@
libsystemd_core_la_SOURCES = \
src/core/socket.h \
src/core/busname.c \
src/core/busname.h \
src/core/socket.h \
src/core/busname.c \
src/core/busname.h \
- src/core/bus-common.c \
- src/core/bus-common.h \
src/core/bus-endpoint.c \
src/core/bus-endpoint.h \
src/core/bus-endpoint.c \
src/core/bus-endpoint.h \
+ src/core/bus-policy.c \
+ src/core/bus-policy.h \
src/core/target.c \
src/core/target.h \
src/core/snapshot.c \
src/core/target.c \
src/core/target.h \
src/core/snapshot.c \
@@
-1140,8
+1146,6
@@
libsystemd_core_la_SOURCES = \
src/core/loopback-setup.c \
src/core/namespace.c \
src/core/namespace.h \
src/core/loopback-setup.c \
src/core/namespace.c \
src/core/namespace.h \
- src/core/build.h \
- src/core/sysfs-show.h \
src/core/killall.h \
src/core/killall.c \
src/core/audit-fd.c \
src/core/killall.h \
src/core/killall.c \
src/core/audit-fd.c \
@@
-1300,7
+1304,7
@@
dist_dbussystemservice_DATA += \
polkitpolicy_in_in_files += \
src/core/org.freedesktop.systemd1.policy.in.in
polkitpolicy_in_in_files += \
src/core/org.freedesktop.systemd1.policy.in.in
-pkgconfig
data_DATA
= \
+pkgconfig
lib_DATA +
= \
src/core/systemd.pc
nodist_rpmmacros_DATA = \
src/core/systemd.pc
nodist_rpmmacros_DATA = \
@@
-1384,7
+1388,8
@@
tests += \
test-locale-util \
test-execute \
test-copy \
test-locale-util \
test-execute \
test-copy \
- test-cap-list
+ test-cap-list \
+ test-sigbus
EXTRA_DIST += \
test/a.service \
EXTRA_DIST += \
test/a.service \
@@
-1578,6
+1583,12
@@
test_copy_SOURCES = \
test_copy_LDADD = \
libsystemd-shared.la
test_copy_LDADD = \
libsystemd-shared.la
+test_sigbus_SOURCES = \
+ src/test/test-sigbus.c
+
+test_sigbus_LDADD = \
+ libsystemd-shared.la
+
test_condition_SOURCES = \
src/test/test-condition.c
test_condition_SOURCES = \
src/test/test-condition.c
@@
-1713,8
+1724,8
@@
test_unaligned_SOURCES = \
test_tables_SOURCES = \
src/test/test-tables.c \
src/shared/test-tables.h \
test_tables_SOURCES = \
src/test/test-tables.c \
src/shared/test-tables.h \
- src/bus-proxyd/bus-policy.c \
- src/bus-proxyd/bus-policy.h \
+ src/bus-proxyd/bus-
xml-
policy.c \
+ src/bus-proxyd/bus-
xml-
policy.h \
src/journal/journald-server.c \
src/journal/journald-server.h
src/journal/journald-server.c \
src/journal/journald-server.h
@@
-1948,9
+1959,9
@@
test_conf_files_LDADD = \
libsystemd-shared.la
test_bus_policy_SOURCES = \
libsystemd-shared.la
test_bus_policy_SOURCES = \
- src/bus-proxyd/test-bus-policy.c \
- src/bus-proxyd/bus-policy.c \
- src/bus-proxyd/bus-policy.h
+ src/bus-proxyd/test-bus-
xml-
policy.c \
+ src/bus-proxyd/bus-
xml-
policy.c \
+ src/bus-proxyd/bus-
xml-
policy.h
test_bus_policy_LDADD = \
libsystemd-internal.la \
test_bus_policy_LDADD = \
libsystemd-internal.la \
@@
-2598,8
+2609,8
@@
systemd_run_LDADD = \
# ------------------------------------------------------------------------------
systemd_bus_proxyd_SOURCES = \
src/bus-proxyd/bus-proxyd.c \
# ------------------------------------------------------------------------------
systemd_bus_proxyd_SOURCES = \
src/bus-proxyd/bus-proxyd.c \
- src/bus-proxyd/bus-policy.c \
- src/bus-proxyd/bus-policy.h
+ src/bus-proxyd/bus-
xml-
policy.c \
+ src/bus-proxyd/bus-
xml-
policy.h
systemd_bus_proxyd_LDADD = \
libsystemd-internal.la \
systemd_bus_proxyd_LDADD = \
libsystemd-internal.la \
@@
-3055,6
+3066,7
@@
libsystemd_network_la_SOURCES = \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-dhcp6-lease.h \
src/systemd/sd-pppoe.h \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-dhcp6-lease.h \
src/systemd/sd-pppoe.h \
+ src/systemd/sd-lldp.h \
src/libsystemd-network/sd-dhcp-client.c \
src/libsystemd-network/sd-dhcp-server.c \
src/libsystemd-network/dhcp-network.c \
src/libsystemd-network/sd-dhcp-client.c \
src/libsystemd-network/sd-dhcp-server.c \
src/libsystemd-network/dhcp-network.c \
@@
-3090,7
+3102,6
@@
libsystemd_network_la_SOURCES = \
src/libsystemd-network/lldp-internal.h \
src/libsystemd-network/lldp-internal.c \
src/libsystemd-network/lldp-util.h \
src/libsystemd-network/lldp-internal.h \
src/libsystemd-network/lldp-internal.c \
src/libsystemd-network/lldp-util.h \
- src/libsystemd-network/sd-lldp.h \
src/libsystemd-network/sd-lldp.c
libsystemd_network_la_LIBADD = \
src/libsystemd-network/sd-lldp.c
libsystemd_network_la_LIBADD = \
@@
-3767,7
+3778,8
@@
v4l_id_SOURCES = \
src/udev/v4l_id/v4l_id.c
v4l_id_LDADD = \
src/udev/v4l_id/v4l_id.c
v4l_id_LDADD = \
- libudev-internal.la
+ libudev-internal.la \
+ libsystemd-shared.la
udevlibexec_PROGRAMS += \
v4l_id
udevlibexec_PROGRAMS += \
v4l_id
@@
-5039,11
+5051,10
@@
rootlibexec_PROGRAMS += \
libsystemd_machine_core_la_SOURCES = \
src/machine/machine.c \
src/machine/machine.h \
libsystemd_machine_core_la_SOURCES = \
src/machine/machine.c \
src/machine/machine.h \
- src/machine/image.c \
- src/machine/image.h \
src/machine/machined-dbus.c \
src/machine/machine-dbus.c \
src/machine/machined-dbus.c \
src/machine/machine-dbus.c \
- src/machine/image-dbus.c
+ src/machine/image-dbus.c \
+ src/machine/image-dbus.h
libsystemd_machine_core_la_LIBADD = \
libsystemd-label.la \
libsystemd_machine_core_la_LIBADD = \
libsystemd-label.la \
@@
-5091,6
+5102,12
@@
dist_dbussystemservice_DATA += \
dist_dbuspolicy_DATA += \
src/machine/org.freedesktop.machine1.conf
dist_dbuspolicy_DATA += \
src/machine/org.freedesktop.machine1.conf
+polkitpolicy_files += \
+ src/machine/org.freedesktop.machine1.policy
+
+polkitpolicy_in_files += \
+ src/machine/org.freedesktop.machine1.policy.in
+
dist_zshcompletion_DATA += \
shell-completion/zsh/_machinectl \
shell-completion/zsh/_sd_machines
dist_zshcompletion_DATA += \
shell-completion/zsh/_machinectl \
shell-completion/zsh/_sd_machines
@@
-5131,8
+5148,10
@@
bin_PROGRAMS += \
systemd_import_SOURCES = \
src/import/import.c \
systemd_import_SOURCES = \
src/import/import.c \
- src/import/import-dck.c \
- src/import/import-dck.h \
+ src/import/import-gpt.c \
+ src/import/import-gpt.h \
+ src/import/import-dkr.c \
+ src/import/import-dkr.h \
src/import/curl-util.c \
src/import/curl-util.h \
src/import/aufs-util.c \
src/import/curl-util.c \
src/import/curl-util.h \
src/import/aufs-util.c \
@@
-5507,6
+5526,7
@@
rootlibexec_PROGRAMS += \
loginctl_SOURCES = \
src/login/loginctl.c \
loginctl_SOURCES = \
src/login/loginctl.c \
+ src/login/sysfs-show.h \
src/login/sysfs-show.c
loginctl_LDADD = \
src/login/sysfs-show.c
loginctl_LDADD = \
@@
-6071,7
+6091,6
@@
EXTRA_DIST += \
CLEANFILES += \
$(nodist_systemunit_DATA) \
$(nodist_userunit_DATA) \
CLEANFILES += \
$(nodist_systemunit_DATA) \
$(nodist_userunit_DATA) \
- $(pkgconfigdata_DATA) \
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)