X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=904517ffa635647b4f7195425979e4cdbc69f622;hb=3e0a2048978fcc7aff00797bdb876b2592c2fbc7;hp=a7a2b6d59fd741fcbe566eb32883b931c96848e9;hpb=ad1ad5c8e36ea795034fcdac660b15d7c141d55b;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index a7a2b6d59..904517ffa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 += \
@@ -5034,10 +5037,13 @@ 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/image.c \
+	src/machine/image.h \
+	src/machine/machined-dbus.c \
+	src/machine/machine-dbus.c \
+	src/machine/image-dbus.c
 
 libsystemd_machine_core_la_LIBADD = \
 	libsystemd-label.la \
@@ -5125,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 \