X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=baa1398a41b2772f1d99594f3b5d3a90addbdece;hb=2bb4c7e384c31de4727f1330da3f4de2f0bb7784;hp=5a41ba647cfe1a04f0e317f1c2533ecfd77f0d7d;hpb=dca59f62666c2d37d1a68ed332ba7985c1141f82;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 5a41ba647..baa1398a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3079,7 +3079,19 @@ 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.h \
+	src/libsystemd-network/sd-lldp.c
 
 libsystemd_network_la_LIBADD = \
 	libudev-internal.la \
@@ -3158,13 +3170,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 +3608,7 @@ udevadm_LDADD = \
 	libudev-core.la
 
 # ------------------------------------------------------------------------------
+if ENABLE_HWDB
 INSTALL_DIRS += \
 	$(sysconfdir)/udev/hwdb.d
 
@@ -3632,6 +3657,7 @@ INSTALL_DATA_HOOKS += \
 
 hwdb-remove-hook:
 	-test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
+endif
 
 # ------------------------------------------------------------------------------
 TESTS += \
@@ -5011,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 \
@@ -5094,6 +5123,32 @@ libnss_mymachines_la_LIBADD = \
 
 lib_LTLIBRARIES += \
 	libnss_mymachines.la
+
+if HAVE_LIBCURL
+
+bin_PROGRAMS += \
+	systemd-import
+
+systemd_import_SOURCES = \
+	src/import/import.c \
+	src/import/import-dck.c \
+	src/import/import-dck.h \
+	src/import/curl-util.c \
+	src/import/curl-util.h \
+	src/import/aufs-util.c \
+	src/import/aufs-util.h
+
+systemd_import_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(LIBCURL_CFLAGS)
+
+systemd_import_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
+	$(LIBCURL_LIBS) \
+	-lm
+endif
+
 endif
 
 # ------------------------------------------------------------------------------