summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2016-02-22 17:38:34 +0100
committerTom Gundersen <teg@jklm.no>2016-02-22 17:38:34 +0100
commit7c7c0cbe640e33e5f57b24d0281564724b3eaeeb (patch)
tree478c558c880ef1082eda62b6ee3208b29fe98832 /Makefile.am
parenta4ae7f1d739cc011b5312a8bfba99971bce0e7c3 (diff)
parentda6c766d539dc38dbabf401be31180ca4691215f (diff)
Merge pull request #2685 from poettering/lldp-fixes2
lldp fixes, second iteration
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am15
1 files changed, 5 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 03341fcd28..627a076cd9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3299,14 +3299,10 @@ 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-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 +3385,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 = \
@@ -5348,7 +5341,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 \