1 files changed, 8 insertions, 38 deletions
diff --git a/Makefile.am b/Makefile.am
index 03341fcd28..4c58522d0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -850,6 +850,8 @@ libbasic_la_SOURCES = \
 	src/basic/exit-status.h \
 	src/basic/virt.c \
 	src/basic/virt.h \
+	src/basic/architecture.c \
+	src/basic/architecture.h \
 	src/basic/smack-util.c \
 	src/basic/smack-util.h \
 	src/basic/device-nodes.c \
@@ -963,8 +965,6 @@ libshared_la_SOURCES = \
 	src/shared/initreq.h \
 	src/shared/dns-domain.c \
 	src/shared/dns-domain.h \
-	src/shared/architecture.c \
-	src/shared/architecture.h \
 	src/shared/efivars.c \
 	src/shared/efivars.h \
 	src/shared/fstab-util.c \
@@ -3299,14 +3299,11 @@ libsystemd_network_la_SOURCES = \
 	src/libsystemd-network/dhcp-identifier.h \
 	src/libsystemd-network/dhcp-identifier.c \
 	src/libsystemd-network/lldp.h \
-	src/libsystemd-network/lldp-tlv.h \
-	src/libsystemd-network/lldp-tlv.c \
+	src/libsystemd-network/lldp-internal.h \
 	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-neighbor.h \
+	src/libsystemd-network/lldp-neighbor.c \
 	src/libsystemd-network/sd-lldp.c
 
 libsystemd_network_la_LIBADD = \
@@ -3389,9 +3386,6 @@ test_dhcp6_client_LDADD = \
 	libshared.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 = \
@@ -4422,32 +4416,6 @@ EXTRA_DIST += \
 	units/systemd-vconsole-setup.service.in
 
 # ------------------------------------------------------------------------------
-if ENABLE_BOOTCHART
-systemd_bootchart_SOURCES = \
-	src/bootchart/bootchart.c \
-	src/bootchart/bootchart.h \
-	src/bootchart/store.c \
-	src/bootchart/store.h \
-	src/bootchart/svg.c \
-	src/bootchart/svg.h
-
-systemd_bootchart_LDADD = \
-	libshared.la
-
-rootlibexec_PROGRAMS += \
-	systemd-bootchart
-
-dist_pkgsysconf_DATA += \
-	src/bootchart/bootchart.conf
-
-nodist_systemunit_DATA += \
-	units/systemd-bootchart.service
-endif
-
-EXTRA_DIST += \
-	units/systemd-bootchart.service.in
-
-# ------------------------------------------------------------------------------
 if ENABLE_QUOTACHECK
 rootlibexec_PROGRAMS += \
 	systemd-quotacheck
@@ -5348,7 +5316,9 @@ libnetworkd_core_la_SOURCES = \
 	src/network/networkd-address-pool.h \
 	src/network/networkd-address-pool.c \
 	src/network/networkd-util.h \
-	src/network/networkd-util.c
+	src/network/networkd-util.c \
+	src/network/networkd-lldp-tx.h \
+	src/network/networkd-lldp-tx.c
 
 nodist_libnetworkd_core_la_SOURCES = \
 	src/network/networkd-network-gperf.c \