summaryrefslogtreecommitdiffstats
path: root/vrrpd
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2021-11-13 16:10:59 +0100
committerGitHub <noreply@github.com>2021-11-13 16:10:59 +0100
commit045e0235499c0caf4ba2d98fd1f2c595972dc587 (patch)
tree5550c3ceabd286a430e690c5c28ba7d406aff948 /vrrpd
parentMerge pull request #10036 from donaldsharp/finally_frr (diff)
parentbuild: fix duplicate yang.c file inclusions (diff)
downloadfrr-045e0235499c0caf4ba2d98fd1f2c595972dc587.tar.xz
frr-045e0235499c0caf4ba2d98fd1f2c595972dc587.zip
Merge pull request #10032 from opensourcerouting/build-fix-20211111
build: assorted build system improvements, 2021-11 edition
Diffstat (limited to 'vrrpd')
-rw-r--r--vrrpd/subdir.am7
1 files changed, 3 insertions, 4 deletions
diff --git a/vrrpd/subdir.am b/vrrpd/subdir.am
index dfa9b261c..02e0497ee 100644
--- a/vrrpd/subdir.am
+++ b/vrrpd/subdir.am
@@ -3,17 +3,17 @@
#
if VRRPD
-noinst_LIBRARIES += vrrpd/libvrrp.a
sbin_PROGRAMS += vrrpd/vrrpd
vtysh_scan += vrrpd/vrrp_vty.c
vtysh_daemons += vrrpd
man8 += $(MANBUILD)/frr-vrrpd.8
endif
-vrrpd_libvrrp_a_SOURCES = \
+vrrpd_vrrpd_SOURCES = \
vrrpd/vrrp.c \
vrrpd/vrrp_arp.c \
vrrpd/vrrp_debug.c \
+ vrrpd/vrrp_main.c \
vrrpd/vrrp_ndisc.c \
vrrpd/vrrp_northbound.c \
vrrpd/vrrp_packet.c \
@@ -35,8 +35,7 @@ clippy_scan += \
vrrpd/vrrp_vty.c \
# end
-vrrpd_vrrpd_SOURCES = vrrpd/vrrp_main.c
-vrrpd_vrrpd_LDADD = vrrpd/libvrrp.a lib/libfrr.la @LIBCAP@
+vrrpd_vrrpd_LDADD = lib/libfrr.la @LIBCAP@
nodist_vrrpd_vrrpd_SOURCES = \
yang/frr-vrrpd.yang.c \
# end