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>
This commit is contained in:
David Lamparter 2018-08-15 23:35:51 +02:00 committed by David Lamparter
parent 714e135429
commit 84d837b75d
13 changed files with 276 additions and 285 deletions

View File

@ -106,6 +106,9 @@ include tools/subdir.am
include debianpkg/subdir.am
include solaris/subdir.am
include bgpd/subdir.am
include bgpd/rfp-example/librfp/subdir.am
include bgpd/rfp-example/rfptest/subdir.am
include ripd/subdir.am
include ripngd/subdir.am
include ospfd/subdir.am
@ -122,15 +125,12 @@ include pbrd/subdir.am
include staticd/subdir.am
include bfdd/subdir.am
SUBDIRS = . @LIBRFP@ @RFPTEST@ \
@BGPD@ \
SUBDIRS = . \
@VTYSH@ \
tests
DIST_SUBDIRS = . bgpd \
DIST_SUBDIRS = . \
vtysh tests \
bgpd/rfp-example/librfp \
bgpd/rfp-example/rfptest \
# end
if PKGSRC

2
bgpd/.gitignore vendored
View File

@ -1,4 +1,4 @@
Makefile
!Makefile
Makefile.in
*.o
bgpd

10
bgpd/Makefile Normal file
View File

@ -0,0 +1,10 @@
all: ALWAYS
@$(MAKE) -s -C .. bgpd/bgpd
%: ALWAYS
@$(MAKE) -s -C .. bgpd/$@
Makefile:
#nothing
ALWAYS:
.PHONY: ALWAYS makefiles
.SUFFIXES:

View File

@ -1,140 +0,0 @@
## Process this file with automake to produce Makefile.in.
AUTOMAKE_OPTIONS = subdir-objects
include ../common.am
if ENABLE_BGP_VNC
#o file to keep linker happy
BGP_VNC_RFP_LIB=rfapi/rfapi_descriptor_rfp_utils.o @top_builddir@/$(LIBRFP)/librfp.a
BGP_VNC_RFP_INC=-I@top_srcdir@/$(RFPINC)
BGP_VNC_RFP_HD=\
@top_srcdir@/$(RFPINC)/rfp.h
BGP_VNC_RFP_LD_FLAGS_FILE=@top_srcdir@/$(LIBRFP)/rfp_ld_flags
BGP_VNC_RFP_LD_FLAGS=`if [ -e "$(BGP_VNC_RFP_LD_FLAGS_FILE)" ] ; then cat "$(BGP_VNC_RFP_LD_FLAGS_FILE)" ; fi `
#BGP_VNC_RFAPI_SRCDIR=rfapi
BGP_VNC_RFAPI_SRCDIR=
BGP_VNC_RFAPI_INC=-Irfapi
BGP_VNC_RFAPI_SRC=rfapi/bgp_rfapi_cfg.c \
rfapi/rfapi_import.c \
rfapi/rfapi.c \
rfapi/rfapi_ap.c \
rfapi/rfapi_descriptor_rfp_utils.c \
rfapi/rfapi_encap_tlv.c \
rfapi/rfapi_nve_addr.c \
rfapi/rfapi_monitor.c \
rfapi/rfapi_rib.c \
rfapi/rfapi_vty.c \
rfapi/vnc_debug.c \
rfapi/vnc_export_bgp.c \
rfapi/vnc_export_table.c \
rfapi/vnc_import_bgp.c \
rfapi/vnc_zebra.c
BGP_VNC_RFAPI_HD=rfapi/bgp_rfapi_cfg.h \
rfapi/rfapi_import.h \
rfapi/rfapi.h \
rfapi/rfapi_ap.h \
rfapi/rfapi_backend.h \
rfapi/rfapi_descriptor_rfp_utils.h \
rfapi/rfapi_encap_tlv.h \
rfapi/rfapi_nve_addr.h \
rfapi/rfapi_monitor.h \
rfapi/rfapi_private.h \
rfapi/rfapi_rib.h \
rfapi/rfapi_vty.h \
rfapi/vnc_debug.h \
rfapi/vnc_export_bgp.h \
rfapi/vnc_export_table.h \
rfapi/vnc_import_bgp.h \
rfapi/vnc_zebra.h \
rfapi/vnc_export_bgp_p.h \
rfapi/vnc_import_bgp_p.h \
bgp_vnc_types.h $(BGP_VNC_RFP_HD)
else
BGP_VNC_RFAPI_INC=
BGP_VNC_RFAPI_SRC=
BGP_VNC_RFAPI_HD=
BGP_VNC_RFP_LIB=
BGP_VNC_RFP_INC=
BGP_VNC_RFP_HD=
BGP_VNC_RFP_LD_FLAGS=
endif
AM_CPPFLAGS += -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib \
$(BGP_VNC_RFAPI_INC) $(BGP_VNC_RFP_INC)
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
INSTALL_SDATA=@INSTALL@ -m 600
noinst_LIBRARIES = libbgp.a
module_LTLIBRARIES =
sbin_PROGRAMS = bgpd
bin_PROGRAMS = bgp_btoa
BUILT_SOURCES =
libbgp_a_SOURCES = \
bgp_memory.c \
bgpd.c bgp_fsm.c bgp_aspath.c bgp_community.c bgp_attr.c \
bgp_debug.c bgp_route.c bgp_zebra.c bgp_open.c bgp_routemap.c \
bgp_packet.c bgp_network.c bgp_filter.c bgp_regex.c bgp_clist.c \
bgp_dump.c bgp_ecommunity.c bgp_lcommunity.c \
bgp_mplsvpn.c bgp_nexthop.c \
bgp_damp.c bgp_table.c bgp_advertise.c bgp_vty.c bgp_mpath.c \
bgp_nht.c bgp_updgrp.c bgp_updgrp_packet.c bgp_updgrp_adv.c bgp_bfd.c \
bgp_encap_tlv.c $(BGP_VNC_RFAPI_SRC) bgp_attr_evpn.c \
bgp_evpn.c bgp_evpn_vty.c bgp_vpn.c bgp_label.c bgp_rd.c \
bgp_keepalives.c bgp_io.c bgp_flowspec.c bgp_flowspec_util.c \
bgp_flowspec_vty.c bgp_labelpool.c bgp_pbr.c bgp_errors.c
noinst_HEADERS = \
bgp_memory.h \
bgp_aspath.h bgp_attr.h bgp_community.h bgp_debug.h bgp_fsm.h \
bgp_network.h bgp_open.h bgp_packet.h bgp_regex.h bgp_route.h \
bgpd.h bgp_filter.h bgp_clist.h bgp_dump.h bgp_zebra.h \
bgp_ecommunity.h bgp_lcommunity.h \
bgp_mplsvpn.h bgp_nexthop.h bgp_damp.h bgp_table.h \
bgp_advertise.h bgp_vty.h bgp_mpath.h bgp_nht.h \
bgp_updgrp.h bgp_bfd.h bgp_encap_tlv.h bgp_encap_types.h \
$(BGP_VNC_RFAPI_HD) bgp_attr_evpn.h bgp_evpn.h bgp_evpn_vty.h \
bgp_vpn.h bgp_label.h bgp_rd.h bgp_evpn_private.h bgp_keepalives.h \
bgp_io.h bgp_flowspec.h bgp_flowspec_private.h bgp_flowspec_util.h \
bgp_labelpool.h bgp_pbr.h bgp_errors.h
bgpd_SOURCES = bgp_main.c
bgpd_LDADD = libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ @LIBM@
bgpd_LDFLAGS = $(BGP_VNC_RFP_LD_FLAGS)
bgp_btoa_SOURCES = bgp_btoa.c
bgp_btoa_LDADD = libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ @LIBM@
bgp_btoa_LDFLAGS = $(BGP_VNC_RFP_LD_FLAGS)
if SNMP
module_LTLIBRARIES += bgpd_snmp.la
endif
bgpd_snmp_la_SOURCES = bgp_snmp.c
bgpd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS) -std=gnu99
bgpd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
bgpd_snmp_la_LIBADD = ../lib/libfrrsnmp.la
if RPKI
module_LTLIBRARIES += bgpd_rpki.la
BUILT_SOURCES += bgp_rpki_clippy.c
endif
bgpd_rpki_la_SOURCES = bgp_rpki.c
bgpd_rpki_la_CFLAGS = $(WERROR) $(RTRLIB_CFLAGS)
bgpd_rpki_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
bgpd_rpki_la_LIBADD = $(RTRLIB_LIBS)
examplesdir = $(exampledir)
dist_examples_DATA = bgpd.conf.sample bgpd.conf.sample2 \
bgpd.conf.vnc.sample
bgp_vty.o: bgp_vty_clippy.c
bgp_route.o: bgp_route_clippy.c
bgp_debug.o: bgp_debug_clippy.c
EXTRA_DIST = BGP4-MIB.txt

View File

@ -0,0 +1,10 @@
all: ALWAYS
@$(MAKE) -s -C ../../.. bgpd/rfp-example/librfp/librfp.a
%: ALWAYS
@$(MAKE) -s -C ../../.. bgpd/rfp-example/librfp/$@
Makefile:
#nothing
ALWAYS:
.PHONY: ALWAYS makefiles
.SUFFIXES:

View File

@ -1,40 +0,0 @@
#
# This file has been modified by LabN Consulting, L.L.C.
#
#
## Process this file with automake to produce Makefile.in.
if ENABLE_BGP_VNC
BGP_VNC_RFAPI_INC=-I$(top_srcdir)/bgpd/rfapi
BGP_VNC_RFP_LIBDIR=.
BGP_VNC_RFP_INCDIR=$(BGP_VNC_RFP_LIBDIR)
BGP_VNC_RFP_LIB=librfp.a
BGP_VNC_RFP_INC=-I$(BGP_VNC_RFP_INCDIR)
librfp_a_SOURCES = \
rfp_example.c
librfp_a_INCLUDES = \
rfp.h \
rfp_internal.h
else
BGP_VNC_RFAPI_INC=
BGP_VNC_RFAPI_SRC=
BGP_VNC_RFP_LIB=
BGP_VNC_RFP_INC=
endif
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib \
-I$(top_builddir) -I$(top_builddir)/lib \
$(BGP_VNC_RFAPI_INC) $(BGP_VNC_RFP_INC)
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
INSTALL_SDATA=@INSTALL@ -m 600
AM_CFLAGS = $(PICFLAGS)
AM_LDFLAGS = $(PILDFLAGS)
noinst_LIBRARIES = $(BGP_VNC_RFP_LIB)
noinst_HEADERS = \
$(librfp_a_INCLUDES)

View File

@ -0,0 +1,16 @@
#
# librfp
#
if ENABLE_BGP_VNC
noinst_LIBRARIES += bgpd/rfp-example/librfp/librfp.a
endif
bgpd_rfp_example_librfp_librfp_a_SOURCES = \
bgpd/rfp-example/librfp/rfp_example.c \
# end
noinst_HEADERS += \
bgpd/rfp-example/librfp/rfp.h \
bgpd/rfp-example/librfp/rfp_internal.h \
# end

View File

@ -0,0 +1,10 @@
all: ALWAYS
@$(MAKE) -s -C ../../.. bgpd/rfp-example/rfptest/rfptest
%: ALWAYS
@$(MAKE) -s -C ../../.. bgpd/rfp-example/rfptest/$@
Makefile:
#nothing
ALWAYS:
.PHONY: ALWAYS makefiles
.SUFFIXES:

View File

@ -1,52 +0,0 @@
#
# This file has been modified by LabN Consulting, L.L.C.
#
#
## Process this file with automake to produce Makefile.in.
if ENABLE_BGP_VNC
BGP_VNC_RFAPI_INC=-I$(top_srcdir)/bgpd/rfapi
BGP_VNC_RFP_LIBDIR=../librfp
BGP_VNC_RFP_INCDIR=$(BGP_VNC_RFP_LIBDIR)
BGP_VNC_RFP_LIB=$(BGP_VNC_RFP_LIBDIR)/librfp.a
BGP_VNC_RFP_INC=-I$(BGP_VNC_RFP_INCDIR)
rfptest_SOURCES = \
rfptest.c
rfptest_INCLUDES = \
rfptest.h
RFPTEST_BIN = rfptest
else
BGP_VNC_RFAPI_INC=
BGP_VNC_RFAPI_SRC=
BGP_VNC_RFP_LIB=
BGP_VNC_RFP_INC=
RFPTEST_BIN=
endif
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib \
-I$(top_builddir) -I$(top_builddir)/lib \
$(BGP_VNC_RFAPI_INC) $(BGP_VNC_RFP_INC)
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
INSTALL_SDATA=@INSTALL@ -m 600
AM_CFLAGS = $(PICFLAGS)
AM_LDFLAGS = $(PILDFLAGS)
noinst_HEADERS = \
$(rfptest_INCLUDES)
noinst_LIBRARIES =
sbin_PROGRAMS = $(RFPTEST_BIN)
examplesdir = $(exampledir)
rfptest_LDADD = $(top_builddir)/lib/libfrr.la $(BGP_VNC_RFP_LIB)
dist_examples_DATA =

View File

@ -0,0 +1,20 @@
#
# libtest
#
if ENABLE_BGP_VNC
sbin_PROGRAMS += bgpd/rfp-example/rfptest/rfptest
endif
bgpd_rfp_example_rfptest_rfptest_CFLAGS = -I$(top_srcdir)/bgpd/rfapi
bgpd_rfp_example_rfptest_rfptest_SOURCES = \
bgpd/rfp-example/rfptest/rfptest.c \
# end
noinst_HEADERS += \
bgpd/rfp-example/rfptest/rfptest.h \
# end
bgpd_rfp_example_rfptest_rfptest_LDADD = \
lib/libfrr.la \
bgpd/rfp-example/librfp/librfp.a \
# end

197
bgpd/subdir.am Normal file
View File

@ -0,0 +1,197 @@
#
# bgpd
#
if BGPD
noinst_LIBRARIES += bgpd/libbgp.a
sbin_PROGRAMS += bgpd/bgpd
noinst_PROGRAMS += bgpd/bgp_btoa
dist_examples_DATA += \
bgpd/bgpd.conf.sample \
bgpd/bgpd.conf.sample2 \
bgpd/bgpd.conf.vnc.sample \
# end
if SNMP
module_LTLIBRARIES += bgpd/bgpd_snmp.la
endif
if RPKI
module_LTLIBRARIES += bgpd/bgpd_rpki.la
endif
endif
bgpd_libbgp_a_SOURCES = \
bgpd/bgp_advertise.c \
bgpd/bgp_aspath.c \
bgpd/bgp_attr.c \
bgpd/bgp_attr_evpn.c \
bgpd/bgp_bfd.c \
bgpd/bgp_clist.c \
bgpd/bgp_community.c \
bgpd/bgp_damp.c \
bgpd/bgp_debug.c \
bgpd/bgp_dump.c \
bgpd/bgp_ecommunity.c \
bgpd/bgp_encap_tlv.c \
bgpd/bgp_errors.c \
bgpd/bgp_evpn.c \
bgpd/bgp_evpn_vty.c \
bgpd/bgp_filter.c \
bgpd/bgp_flowspec.c \
bgpd/bgp_flowspec_util.c \
bgpd/bgp_flowspec_vty.c \
bgpd/bgp_fsm.c \
bgpd/bgp_io.c \
bgpd/bgp_keepalives.c \
bgpd/bgp_label.c \
bgpd/bgp_labelpool.c \
bgpd/bgp_lcommunity.c \
bgpd/bgp_memory.c \
bgpd/bgp_mpath.c \
bgpd/bgp_mplsvpn.c \
bgpd/bgp_network.c \
bgpd/bgp_nexthop.c \
bgpd/bgp_nht.c \
bgpd/bgp_open.c \
bgpd/bgp_packet.c \
bgpd/bgp_pbr.c \
bgpd/bgp_rd.c \
bgpd/bgp_regex.c \
bgpd/bgp_route.c \
bgpd/bgp_routemap.c \
bgpd/bgp_table.c \
bgpd/bgp_updgrp.c \
bgpd/bgp_updgrp_adv.c \
bgpd/bgp_updgrp_packet.c \
bgpd/bgp_vpn.c \
bgpd/bgp_vty.c \
bgpd/bgp_zebra.c \
bgpd/bgpd.c \
# end
if ENABLE_BGP_VNC
bgpd_libbgp_a_SOURCES += \
bgpd/rfapi/bgp_rfapi_cfg.c \
bgpd/rfapi/rfapi_import.c \
bgpd/rfapi/rfapi.c \
bgpd/rfapi/rfapi_ap.c \
bgpd/rfapi/rfapi_descriptor_rfp_utils.c \
bgpd/rfapi/rfapi_encap_tlv.c \
bgpd/rfapi/rfapi_nve_addr.c \
bgpd/rfapi/rfapi_monitor.c \
bgpd/rfapi/rfapi_rib.c \
bgpd/rfapi/rfapi_vty.c \
bgpd/rfapi/vnc_debug.c \
bgpd/rfapi/vnc_export_bgp.c \
bgpd/rfapi/vnc_export_table.c \
bgpd/rfapi/vnc_import_bgp.c \
bgpd/rfapi/vnc_zebra.c \
# end
endif
noinst_HEADERS += \
bgpd/bgp_advertise.h \
bgpd/bgp_aspath.h \
bgpd/bgp_attr.h \
bgpd/bgp_attr_evpn.h \
bgpd/bgp_bfd.h \
bgpd/bgp_clist.h \
bgpd/bgp_community.h \
bgpd/bgp_damp.h \
bgpd/bgp_debug.h \
bgpd/bgp_dump.h \
bgpd/bgp_ecommunity.h \
bgpd/bgp_encap_tlv.h \
bgpd/bgp_encap_types.h \
bgpd/bgp_errors.h \
bgpd/bgp_evpn.h \
bgpd/bgp_evpn_private.h \
bgpd/bgp_evpn_vty.h \
bgpd/bgp_filter.h \
bgpd/bgp_flowspec.h \
bgpd/bgp_flowspec_private.h \
bgpd/bgp_flowspec_util.h \
bgpd/bgp_fsm.h \
bgpd/bgp_io.h \
bgpd/bgp_keepalives.h \
bgpd/bgp_label.h \
bgpd/bgp_labelpool.h \
bgpd/bgp_lcommunity.h \
bgpd/bgp_memory.h \
bgpd/bgp_mpath.h \
bgpd/bgp_mplsvpn.h \
bgpd/bgp_network.h \
bgpd/bgp_nexthop.h \
bgpd/bgp_nht.h \
bgpd/bgp_open.h \
bgpd/bgp_packet.h \
bgpd/bgp_pbr.h \
bgpd/bgp_rd.h \
bgpd/bgp_regex.h \
bgpd/bgp_route.h \
bgpd/bgp_table.h \
bgpd/bgp_updgrp.h \
bgpd/bgp_vpn.h \
bgpd/bgp_vty.h \
bgpd/bgp_zebra.h \
bgpd/bgpd.h \
\
bgpd/rfapi/bgp_rfapi_cfg.h \
bgpd/rfapi/rfapi_import.h \
bgpd/rfapi/rfapi.h \
bgpd/rfapi/rfapi_ap.h \
bgpd/rfapi/rfapi_backend.h \
bgpd/rfapi/rfapi_descriptor_rfp_utils.h \
bgpd/rfapi/rfapi_encap_tlv.h \
bgpd/rfapi/rfapi_nve_addr.h \
bgpd/rfapi/rfapi_monitor.h \
bgpd/rfapi/rfapi_private.h \
bgpd/rfapi/rfapi_rib.h \
bgpd/rfapi/rfapi_vty.h \
bgpd/rfapi/vnc_debug.h \
bgpd/rfapi/vnc_export_bgp.h \
bgpd/rfapi/vnc_export_table.h \
bgpd/rfapi/vnc_import_bgp.h \
bgpd/rfapi/vnc_zebra.h \
bgpd/rfapi/vnc_export_bgp_p.h \
bgpd/rfapi/vnc_import_bgp_p.h \
bgpd/bgp_vnc_types.h \
# end
bgpd_bgpd_SOURCES = bgpd/bgp_main.c
bgpd_bgp_btoa_SOURCES = bgpd/bgp_btoa.c
if ENABLE_BGP_VNC
bgpd_bgpd_SOURCES += bgpd/rfapi/rfapi_descriptor_rfp_utils.c
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
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@
bgpd_bgpd_snmp_la_SOURCES = bgpd/bgp_snmp.c
bgpd_bgpd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS) -std=gnu99
bgpd_bgpd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
bgpd_bgpd_snmp_la_LIBADD = lib/libfrrsnmp.la
bgpd_bgpd_rpki_la_SOURCES = bgpd/bgp_rpki.c
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_vty_clippy.c: $(CLIPPY_DEPS)
bgpd/bgp_vty.$(OBJEXT): bgpd/bgp_vty_clippy.c
bgpd/bgp_route_clippy.c: $(CLIPPY_DEPS)
bgpd/bgp_route.$(OBJEXT): bgpd/bgp_route_clippy.c
bgpd/bgp_debug_clippy.c: $(CLIPPY_DEPS)
bgpd/bgp_debug.$(OBJEXT): bgpd/bgp_debug_clippy.c
bgpd/bgp_rpki_clippy.c: $(CLIPPY_DEPS)
$(AUTOMAKE_DUMMY)bgpd/bgpd_bgpd_rpki_la-bgp_rpki.lo: bgpd/bgp_rpki_clippy.c
$(AUTOMAKE_DUMMY)bgpd/bgpd_rpki_la-bgp_rpki.lo: bgpd/bgp_rpki_clippy.c
EXTRA_DIST += bgpd/BGP4-MIB.txt

View File

@ -394,8 +394,6 @@ AC_ARG_ENABLE(bgp-announce,
AS_HELP_STRING([--disable-bgp-announce,], [turn off BGP route announcement]))
AC_ARG_ENABLE(bgp-vnc,
AS_HELP_STRING([--disable-bgp-vnc],[turn off BGP VNC support]))
AC_ARG_WITH(rfp-path,
AS_HELP_STRING([--with-rfp-path[=DIR]],[path to replaced stub RFP used with BGP VNC]))
AC_ARG_ENABLE(snmp,
AS_HELP_STRING([--enable-snmp], [enable SNMP support for agentx]))
AC_ARG_ENABLE(zeromq,
@ -1451,31 +1449,11 @@ else
AC_DEFINE(DISABLE_BGP_ANNOUNCE,0,Disable BGP installation to zebra)
fi
if test "${with_rfp_path}" = "yes" || test x"${with_rfp_path}" = x""; then
with_rfp_path="bgpd/rfp-example"
fi
if test "${with_rfp_path}" != "no"; then
VNC_RFP_PATH="${with_rfp_path}"
AC_SUBST(VNC_RFP_PATH)
fi
if test "${enable_bgp_vnc}" != "no";then
AC_DEFINE(ENABLE_BGP_VNC,1,Enable BGP VNC support)
RFPTEST="${with_rfp_path}/rfptest"
LIBRFP="${with_rfp_path}/librfp"
RFPINC="${with_rfp_path}/librfp"
else
RFPTEST=
LIBRFP=
RFPINC="bgpd/rfp-example/librfp"
fi
# set
AM_CONDITIONAL([ENABLE_BGP_VNC], [test x${enable_bgp_vnc} != xno])
AC_SUBST(RFPTEST)
AC_SUBST(LIBRFP)
AC_SUBST(RFPINC)
AC_SUBST(BGPD)
AC_SUBST(SOLARIS)
AC_SUBST(VTYSH)
AC_SUBST(CURSES)
@ -2031,11 +2009,8 @@ AC_MSG_RESULT($ac_cv_htonl_works)
AC_CONFIG_FILES([Makefile],[sed -e 's/^#AUTODERP# //' -i Makefile])
AC_CONFIG_FILES([
bgpd/Makefile
vtysh/Makefile
tests/Makefile
bgpd/rfp-example/rfptest/Makefile
bgpd/rfp-example/librfp/Makefile
redhat/frr.spec
solaris/Makefile
debianpkg/changelog
@ -2047,12 +2022,6 @@ AC_CONFIG_FILES([
pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh
pkgsrc/eigrpd.sh])
if test "${enable_bgp_vnc}" != "no"; then
if test "${with_rfp_path}" != "bgpd/rfp-example" ; then
AC_CONFIG_FILES([${with_rfp_path}/rfptest/Makefile ${with_rfp_path}/librfp/Makefile])
fi
fi
AC_CONFIG_FILES([vtysh/extract.pl],[chmod +x vtysh/extract.pl])
AC_CONFIG_COMMANDS([lib/route_types.h], [

View File

@ -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