From 78b377745657f6ea9becdbe305a5ec2976000980 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Tue, 21 Aug 2018 20:56:16 +0200 Subject: [PATCH] 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 --- bgpd/rfp-example/librfp/subdir.am | 1 + bgpd/rfp-example/rfptest/subdir.am | 2 +- bgpd/subdir.am | 6 ++---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bgpd/rfp-example/librfp/subdir.am b/bgpd/rfp-example/librfp/subdir.am index 2800f5aa36..254ab716d5 100644 --- 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 e1975e6b05..fa7c660116 100644 --- 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 f54fbab1fd..6ab63abea5 100644 --- 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@ -- 2.39.5