diff options
| author | David Lamparter <equinox@diac24.net> | 2018-08-15 23:35:51 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-09-08 21:25:59 +0200 |
| commit | 84d837b75d3dc3e4640dd311fcb22bfa62065f34 (patch) | |
| tree | af01c1931ace11ec9db17785744543ac85a79873 /vtysh/Makefile.am | |
| parent | Merge pull request #2875 from opensourcerouting/fabricd (diff) | |
| download | frr-84d837b75d3dc3e4640dd311fcb22bfa62065f34.tar.xz frr-84d837b75d3dc3e4640dd311fcb22bfa62065f34.zip | |
build: non-recursive bgpd & rfp
Note: no more --with-rfp-path on configure - badly messing with the
build system like this really isn't how to do a conditional external
dependency.
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to '')
| -rw-r--r-- | vtysh/Makefile.am | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am index 350b6fede..b8e4e3987 100644 --- a/vtysh/Makefile.am +++ b/vtysh/Makefile.am @@ -2,21 +2,6 @@ include ../common.am -if ENABLE_BGP_VNC -BGP_VNC_RFP_SRCDIR = @top_srcdir@/@LIBRFP@ -BGP_VNC_RFP_INCDIR = -I$(BGP_VNC_RFP_SRCDIR) -BGP_VNC_RFP_SRC = $(BGP_VNC_RFP_SRCDIR)/*.c -BGP_VNC_RFAPI_SRCDIR = @top_srcdir@/bgpd/rfapi -BGP_VNC_RFAPI_INCDIR = -I$(BGP_VNC_RFAPI_SRCDIR) -I$(top_srcdir)/bgpd -BGP_VNC_RFAPI_SRC = $(BGP_VNC_RFAPI_SRCDIR)/*.c -else -BGP_VNC_RFP_INCDIR = -BGP_VNC_RFP_SRCDIR = -BGP_VNC_RFP_SRC = -BGP_VNC_RFAPI_INCDIR = -BGP_VNC_RFAPI_SRCDIR = -BGP_VNC_RFAPI_SRC = -endif AM_CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib \ $(BGP_VNC_RFAPI_INCDIR) $(BGP_VNC_RFP_INCDIR) DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" @@ -54,6 +39,12 @@ vtysh_scan += $(top_srcdir)/bgpd/bgp_route.c vtysh_scan += $(top_srcdir)/bgpd/bgp_routemap.c vtysh_scan += $(top_srcdir)/bgpd/bgp_vty.c vtysh_scan += $(top_srcdir)/bgpd/bgp_flowspec_vty.c +if ENABLE_BGP_VNC +vtysh_scan += $(top_srcdir)/bgpd/rfapi/bgp_rfapi_cfg.c +vtysh_scan += $(top_srcdir)/bgpd/rfapi/rfapi.c +vtysh_scan += $(top_srcdir)/bgpd/rfapi/rfapi_vty.c +vtysh_scan += $(top_srcdir)/bgpd/rfapi/vnc_debug.c +endif endif if RPKI @@ -174,7 +165,7 @@ vtysh_cmd_FILES = $(vtysh_scan) \ $(top_srcdir)/zebra/zebra_mpls_vty.c \ $(top_srcdir)/zebra/zebra_pw.c \ $(top_srcdir)/watchfrr/watchfrr_vty.c \ - $(BGP_VNC_RFAPI_SRC) $(BGP_VNC_RFP_SRC) + # end vtysh_cmd.c: $(vtysh_cmd_FILES) extract.pl ./extract.pl $(vtysh_cmd_FILES) > vtysh_cmd.c |