summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2023-05-30 17:34:29 +0200
committerGitHub <noreply@github.com>2023-05-30 17:34:29 +0200
commit9be555f8d4fb7e11796f9276bb1d2e06f52ed30b (patch)
tree387c86a9b6ce87831ce9f4d64ce3020ead9d2ae1
parentMerge pull request #13588 from sri-mohan1/srib-ldpd1 (diff)
parentripd: embed BFD YANG models (diff)
downloadfrr-9be555f8d4fb7e11796f9276bb1d2e06f52ed30b.tar.xz
frr-9be555f8d4fb7e11796f9276bb1d2e06f52ed30b.zip
Merge pull request #13601 from opensourcerouting/build-yang-embed-20230525
build: fix missing YANG model embedding
-rw-r--r--mgmtd/subdir.am8
-rw-r--r--ripd/subdir.am1
2 files changed, 7 insertions, 2 deletions
diff --git a/mgmtd/subdir.am b/mgmtd/subdir.am
index 213b94bab..67b45d5bd 100644
--- a/mgmtd/subdir.am
+++ b/mgmtd/subdir.am
@@ -53,12 +53,16 @@ sbin_PROGRAMS += mgmtd/mgmtd
mgmtd_mgmtd_SOURCES = \
mgmtd/mgmt_main.c \
# end
+nodist_mgmtd_mgmtd_SOURCES = \
+ # nothing
mgmtd_mgmtd_CFLAGS = $(AM_CFLAGS) -I ./
mgmtd_mgmtd_LDADD = mgmtd/libmgmtd.a lib/libfrr.la $(LIBCAP) $(LIBM) $(LIBYANG_LIBS) $(UST_LIBS)
mgmtd_mgmtd_LDADD += mgmtd/libmgmt_be_nb.la
if STATICD
-$(mgmtd_mgmtd_OBJECTS): yang/frr-staticd.yang.c
-CLEANFILES += yang/frr-staticd.yang.c
+nodist_mgmtd_mgmtd_SOURCES += \
+ yang/frr-staticd.yang.c \
+ yang/frr-bfdd.yang.c \
+ # end
nodist_mgmtd_libmgmt_be_nb_la_SOURCES += staticd/static_vty.c
endif
diff --git a/ripd/subdir.am b/ripd/subdir.am
index 294a05e57..c793a6d68 100644
--- a/ripd/subdir.am
+++ b/ripd/subdir.am
@@ -48,6 +48,7 @@ noinst_HEADERS += \
ripd_ripd_LDADD = lib/libfrr.la $(LIBCAP)
nodist_ripd_ripd_SOURCES = \
yang/frr-ripd.yang.c \
+ yang/frr-bfdd.yang.c \
# end
ripd_ripd_snmp_la_SOURCES = ripd/rip_snmp.c