build: move RFPLDADD to bgpd/rfp-example/librfp

This makes it slightly easier to replace the stub RFP code with an
external implementation.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/bgpd/rfp-example/librfp/subdir.am b/bgpd/rfp-example/librfp/subdir.am
index 2800f5aa36240ef8ea57cdd70de2899c819a0c3a..254ab716d5bf1057b5eaa39f2cd46b944db9da47 100644 (file)
--- a/bgpd/rfp-example/librfp/subdir.am
+++ b/bgpd/rfp-example/librfp/subdir.am
@@ -4,6 +4,7 @@
 
 if ENABLE_BGP_VNC
 noinst_LIBRARIES += bgpd/rfp-example/librfp/librfp.a
+RFPLDADD = bgpd/rfp-example/librfp/librfp.a
 endif
 
 bgpd_rfp_example_librfp_librfp_a_SOURCES = \

diff --git a/bgpd/rfp-example/rfptest/subdir.am b/bgpd/rfp-example/rfptest/subdir.am
index e1975e6b05bb8f69b5d929e95e78afe2f616e74a..fa7c66011641e25b0b819b1b64bb71ae0fdc6570 100644 (file)
--- a/bgpd/rfp-example/rfptest/subdir.am
+++ b/bgpd/rfp-example/rfptest/subdir.am
@@ -16,5 +16,5 @@ noinst_HEADERS += \
 
 bgpd_rfp_example_rfptest_rfptest_LDADD = \
        lib/libfrr.la \
-       bgpd/rfp-example/librfp/librfp.a \
+       $(RFPLDADD) \
        # end

diff --git a/bgpd/subdir.am b/bgpd/subdir.am
index f54fbab1fde983b8c330bdf920fb9d842a240811..6ab63abea5739e7fa586a0fd68b56d6ed07bbf55 100644 (file)
--- a/bgpd/subdir.am
+++ b/bgpd/subdir.am
@@ -192,11 +192,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@