chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
machined: fix grammar in org.freedesktop.machine1.policy.in
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 2cc19a9c547ab05272aaf8d695c331a739325ba2..5f80306dd335e2bc1d18550649862476c4e3e7cb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -506,7 +506,8 @@ dist_systemunit_DATA = \
        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 += \
@@ -896,8 +897,12 @@ libsystemd_shared_la_SOURCES = \
        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.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 += \
@@ -1046,10 +1051,10 @@ libsystemd_core_la_SOURCES = \
        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-policy.c \
+       src/core/bus-policy.h \
        src/core/target.c \
        src/core/target.h \
        src/core/snapshot.c \
@@ -1140,8 +1145,6 @@ libsystemd_core_la_SOURCES = \
        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 \
@@ -1713,8 +1716,8 @@ test_unaligned_SOURCES = \
 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
 
@@ -1948,9 +1951,9 @@ test_conf_files_LDADD = \
        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 \
@@ -2598,8 +2601,8 @@ systemd_run_LDADD = \
 # ------------------------------------------------------------------------------
 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 \
@@ -3055,6 +3058,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-lldp.h \
        src/libsystemd-network/sd-dhcp-client.c \
        src/libsystemd-network/sd-dhcp-server.c \
        src/libsystemd-network/dhcp-network.c \
@@ -3079,7 +3083,18 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/dhcp6-network.c \
        src/libsystemd-network/dhcp6-option.c \
        src/libsystemd-network/dhcp6-lease-internal.h \
-       src/libsystemd-network/sd-dhcp6-lease.c
+       src/libsystemd-network/sd-dhcp6-lease.c \
+       src/libsystemd-network/lldp.h \
+       src/libsystemd-network/lldp-tlv.h \
+       src/libsystemd-network/lldp-tlv.c \
+       src/libsystemd-network/lldp-network.h \
+       src/libsystemd-network/lldp-network.c \
+       src/libsystemd-network/lldp-port.h \
+       src/libsystemd-network/lldp-port.c \
+       src/libsystemd-network/lldp-internal.h \
+       src/libsystemd-network/lldp-internal.c \
+       src/libsystemd-network/lldp-util.h \
+       src/libsystemd-network/sd-lldp.c
 
 libsystemd_network_la_LIBADD = \
        libudev-internal.la \
@@ -3158,13 +3173,25 @@ test_dhcp6_client_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+test_lldp_SOURCES = \
+       src/libsystemd-network/lldp.h \
+       src/libsystemd-network/lldp-tlv.h \
+       src/libsystemd-network/lldp-tlv.c \
+       src/libsystemd-network/test-lldp.c
+
+test_lldp_LDADD = \
+       libsystemd-network.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
 tests += \
        test-dhcp-option \
        test-dhcp-client \
        test-dhcp-server \
        test-ipv4ll \
        test-icmp6-rs \
-       test-dhcp6-client
+       test-dhcp6-client \
+       test-lldp
 
 manual_tests += \
        test-pppoe
@@ -3584,6 +3611,7 @@ udevadm_LDADD = \
        libudev-core.la
 
 # ------------------------------------------------------------------------------
+if ENABLE_HWDB
 INSTALL_DIRS += \
        $(sysconfdir)/udev/hwdb.d
 
@@ -3632,6 +3660,7 @@ INSTALL_DATA_HOOKS += \
 
 hwdb-remove-hook:
        -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
+endif
 
 # ------------------------------------------------------------------------------
 TESTS += \
@@ -5011,10 +5040,12 @@ rootlibexec_PROGRAMS += \
        systemd-machined
 
 libsystemd_machine_core_la_SOURCES = \
-       src/machine/machined-dbus.c \
        src/machine/machine.c \
        src/machine/machine.h \
-       src/machine/machine-dbus.c
+       src/machine/machined-dbus.c \
+       src/machine/machine-dbus.c \
+       src/machine/image-dbus.c \
+       src/machine/image-dbus.h
 
 libsystemd_machine_core_la_LIBADD = \
        libsystemd-label.la \
@@ -5062,6 +5093,12 @@ dist_dbussystemservice_DATA += \
 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
@@ -5102,8 +5139,10 @@ bin_PROGRAMS += \
 
 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 \
@@ -5478,6 +5517,7 @@ rootlibexec_PROGRAMS += \
 
 loginctl_SOURCES = \
        src/login/loginctl.c \
+       src/login/sysfs-show.h \
        src/login/sysfs-show.c
 
 loginctl_LDADD = \
Unnamed repository; edit this file 'description' to name the repository.