chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: make graphical.target dependencies more complete and similar to those of multi...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 9edc2357140f2f8bc9ad1bfb305794f48209a2b6..e1e08430863bb60ff45ac5a9cbc4e2b756f28907 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-896,8
+896,12
@@
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/build.h
if HAVE_UTMP
libsystemd_shared_la_SOURCES += \
if HAVE_UTMP
libsystemd_shared_la_SOURCES += \
@@
-1046,10
+1050,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
+1144,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 \
@@
-1713,8
+1715,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
+1950,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
+2600,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
+3057,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 \
@@
-3089,7
+3092,7
@@
libsystemd_network_la_SOURCES = \
src/libsystemd-network/lldp-port.c \
src/libsystemd-network/lldp-internal.h \
src/libsystemd-network/lldp-internal.c \
src/libsystemd-network/lldp-port.c \
src/libsystemd-network/lldp-internal.h \
src/libsystemd-network/lldp-internal.c \
- src/libsystemd-network/
sd-lldp
.h \
+ src/libsystemd-network/
lldp-util
.h \
src/libsystemd-network/sd-lldp.c
libsystemd_network_la_LIBADD = \
src/libsystemd-network/sd-lldp.c
libsystemd_network_la_LIBADD = \
@@
-3607,6
+3610,7
@@
udevadm_LDADD = \
libudev-core.la
# ------------------------------------------------------------------------------
libudev-core.la
# ------------------------------------------------------------------------------
+if ENABLE_HWDB
INSTALL_DIRS += \
$(sysconfdir)/udev/hwdb.d
INSTALL_DIRS += \
$(sysconfdir)/udev/hwdb.d
@@
-3655,6
+3659,7
@@
INSTALL_DATA_HOOKS += \
hwdb-remove-hook:
-test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
hwdb-remove-hook:
-test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
+endif
# ------------------------------------------------------------------------------
TESTS += \
# ------------------------------------------------------------------------------
TESTS += \
@@
-5036,11
+5041,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 \
@@
-5088,6
+5092,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
@@
-5128,8
+5138,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 \
@@
-5504,6
+5516,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 = \