summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2018-08-15 23:35:51 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2018-09-08 21:25:59 +0200
commit84d837b75d3dc3e4640dd311fcb22bfa62065f34 (patch)
treeaf01c1931ace11ec9db17785744543ac85a79873 /Makefile.am
parentMerge pull request #2875 from opensourcerouting/fabricd (diff)
downloadfrr-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 'Makefile.am')
-rw-r--r--Makefile.am10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index b9003b835..080206855 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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