X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=4173147ee5b768ae2686701cb91ac4a130f25675;hb=0254e9448f3c645758ed63618a3bbb13c242f5e7;hp=9edc2357140f2f8bc9ad1bfb305794f48209a2b6;hpb=ebeccf9eecf5939a2ef772c3160e89efcad96194;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 9edc23571..4173147ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -897,7 +897,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/btrfs-util.c \
 	src/shared/btrfs-util.h \
 	src/shared/verbs.c \
-	src/shared/verbs.h
+	src/shared/verbs.h \
+	src/shared/build.h
 
 if HAVE_UTMP
 libsystemd_shared_la_SOURCES += \
@@ -1046,10 +1047,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 +1141,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 +1712,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 +1947,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 +2597,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 \
@@ -3089,6 +3088,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-util.h \
 	src/libsystemd-network/sd-lldp.h \
 	src/libsystemd-network/sd-lldp.c
 
@@ -3607,6 +3607,7 @@ udevadm_LDADD = \
 	libudev-core.la
 
 # ------------------------------------------------------------------------------
+if ENABLE_HWDB
 INSTALL_DIRS += \
 	$(sysconfdir)/udev/hwdb.d
 
@@ -3655,6 +3656,7 @@ INSTALL_DATA_HOOKS += \
 
 hwdb-remove-hook:
 	-test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
+endif
 
 # ------------------------------------------------------------------------------
 TESTS += \
@@ -5088,6 +5090,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
@@ -5128,8 +5136,8 @@ bin_PROGRAMS += \
 
 systemd_import_SOURCES = \
 	src/import/import.c \
-	src/import/import-dck.c \
-	src/import/import-dck.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 \
@@ -5504,6 +5512,7 @@ rootlibexec_PROGRAMS += \
 
 loginctl_SOURCES = \
 	src/login/loginctl.c \
+	src/login/sysfs-show.h \
 	src/login/sysfs-show.c
 
 loginctl_LDADD = \