bgpd: partially revert e23b9ef6d271223d29c7f91a10d98aa6dcd252b3

[mirror_frr.git] / bgpd / subdir.am

diff --git a/bgpd/subdir.am b/bgpd/subdir.am
index f54fbab1fde983b8c330bdf920fb9d842a240811..a13f058f744d4be14c788d25531de659f4edddc6 100644 (file)
--- a/bgpd/subdir.am
+++ b/bgpd/subdir.am
@@ -42,10 +42,11 @@ endif
 if RPKI
 module_LTLIBRARIES += bgpd/bgpd_rpki.la
 endif
-rstman8_DATA += $(MANBUILD)/bgpd.8
+man8 += $(MANBUILD)/bgpd.8
 endif
 
 bgpd_libbgp_a_SOURCES = \
+       bgpd/bgp_addpath.c \
        bgpd/bgp_advertise.c \
        bgpd/bgp_aspath.c \
        bgpd/bgp_attr.c \
@@ -115,6 +116,8 @@ bgpd_libbgp_a_SOURCES += \
 endif
 
 noinst_HEADERS += \
+       bgpd/bgp_addpath.h \
+       bgpd/bgp_addpath_types.h \
        bgpd/bgp_advertise.h \
        bgpd/bgp_aspath.h \
        bgpd/bgp_attr.h \
@@ -192,11 +195,9 @@ bgpd_bgpd_CFLAGS = -Irfapi -I@top_srcdir@/$(RFPINC)
 
 bgpd_bgp_btoa_SOURCES += bgpd/rfapi/rfapi_descriptor_rfp_utils.c
 bgpd_bgp_btoa_CFLAGS = -Irfapi -I@top_srcdir@/$(RFPINC)
-
-RFPLDADD = bgpd/rfp-example/librfp/librfp.a
-else
-RFPLDADD =
 endif
+
+# RFPLDADD is set in bgpd/rfp-example/librfp/subdir.am
 bgpd_bgpd_LDADD = bgpd/libbgp.a $(RFPLDADD) lib/libfrr.la @LIBCAP@ @LIBM@
 bgpd_bgp_btoa_LDADD = bgpd/libbgp.a $(RFPLDADD) lib/libfrr.la @LIBCAP@ @LIBM@
 
@@ -210,6 +211,8 @@ bgpd_bgpd_rpki_la_CFLAGS = $(WERROR) $(RTRLIB_CFLAGS)
 bgpd_bgpd_rpki_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 bgpd_bgpd_rpki_la_LIBADD = $(RTRLIB_LIBS)
 
+bgpd/bgp_evpn_vty_clippy.c: $(CLIPPY_DEPS)
+bgpd/bgp_evpn_vty.$(OBJEXT): bgpd/bgp_evpn_vty_clippy.c
 bgpd/bgp_vty_clippy.c: $(CLIPPY_DEPS)
 bgpd/bgp_vty.$(OBJEXT): bgpd/bgp_vty_clippy.c
 bgpd/bgp_route_clippy.c: $(CLIPPY_DEPS)