sd-bus: teach x-container-unix: bus protoocol to connect to the namespace of a PID...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 840b8713d81e1fd069dd8750ab4d2ed3df6ade52..96c9fc44f28b2152270dc168b301e2cf6fb348d9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1046,10 +1046,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 \
@@ -1713,8 +1713,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 +1948,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 +2598,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 +3089,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 +3608,7 @@ udevadm_LDADD = \
        libudev-core.la
 
 # ------------------------------------------------------------------------------
+if ENABLE_HWDB
 INSTALL_DIRS += \
        $(sysconfdir)/udev/hwdb.d
 
@@ -3655,6 +3657,7 @@ INSTALL_DATA_HOOKS += \
 
 hwdb-remove-hook:
        -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
+endif
 
 # ------------------------------------------------------------------------------
 TESTS += \
@@ -5039,7 +5042,8 @@ libsystemd_machine_core_la_SOURCES = \
        src/machine/image.c \
        src/machine/image.h \
        src/machine/machined-dbus.c \
-       src/machine/machine-dbus.c
+       src/machine/machine-dbus.c \
+       src/machine/image-dbus.c
 
 libsystemd_machine_core_la_LIBADD = \
        libsystemd-label.la \
@@ -5127,8 +5131,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 \