summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2024-01-16 10:34:56 -0500
committerGitHub <noreply@github.com>2024-01-16 10:34:56 -0500
commitb4625382440ab0bda462f1e0fe2806dc84156e14 (patch)
tree80c94989d430f26455d2134f4d2ad04f9e241c2f
parent6dc2942ad984816605407f8e7112a26bdf99963a (diff)
parent83dbc09de592c3ffcb355e7220c3aa84725dd010 (diff)
Merge pull request #15145 from idryzhov/8.1-fix-libyangstable/8.1
isisd, staticd, bfdd, ripd, ripngd: need to link directly against libyang
-rw-r--r--bfdd/subdir.am2
-rw-r--r--isisd/subdir.am2
-rw-r--r--ripd/subdir.am2
-rw-r--r--ripngd/subdir.am2
-rw-r--r--staticd/subdir.am2
5 files changed, 5 insertions, 5 deletions
diff --git a/bfdd/subdir.am b/bfdd/subdir.am
index 8d35b933d7..614aab02ab 100644
--- a/bfdd/subdir.am
+++ b/bfdd/subdir.am
@@ -49,4 +49,4 @@ nodist_bfdd_bfdd_SOURCES = \
# end
bfdd_bfdd_SOURCES = bfdd/bfdd.c
-bfdd_bfdd_LDADD = bfdd/libbfd.a lib/libfrr.la
+bfdd_bfdd_LDADD = bfdd/libbfd.a lib/libfrr.la $(LIBYANG_LIBS)
diff --git a/isisd/subdir.am b/isisd/subdir.am
index 3e5816c16b..1d330f66a4 100644
--- a/isisd/subdir.am
+++ b/isisd/subdir.am
@@ -114,7 +114,7 @@ ISIS_SOURCES = \
isisd/isis_pfpacket.c \
# end
-ISIS_LDADD_COMMON = lib/libfrr.la $(LIBCAP)
+ISIS_LDADD_COMMON = lib/libfrr.la $(LIBCAP) $(LIBYANG_LIBS)
# Building isisd
diff --git a/ripd/subdir.am b/ripd/subdir.am
index b43e369ab2..00cd0557d3 100644
--- a/ripd/subdir.am
+++ b/ripd/subdir.am
@@ -47,7 +47,7 @@ noinst_HEADERS += \
ripd/ripd.h \
# end
-ripd_ripd_LDADD = ripd/librip.a lib/libfrr.la $(LIBCAP)
+ripd_ripd_LDADD = ripd/librip.a lib/libfrr.la $(LIBCAP) $(LIBYANG_LIBS)
ripd_ripd_SOURCES = \
ripd/rip_main.c \
# end
diff --git a/ripngd/subdir.am b/ripngd/subdir.am
index 9d8d27d4cc..e2688f1aac 100644
--- a/ripngd/subdir.am
+++ b/ripngd/subdir.am
@@ -43,7 +43,7 @@ noinst_HEADERS += \
ripngd/ripngd.h \
# end
-ripngd_ripngd_LDADD = ripngd/libripng.a lib/libfrr.la $(LIBCAP)
+ripngd_ripngd_LDADD = ripngd/libripng.a lib/libfrr.la $(LIBCAP) $(LIBYANG_LIBS)
ripngd_ripngd_SOURCES = \
ripngd/ripng_main.c \
# end
diff --git a/staticd/subdir.am b/staticd/subdir.am
index 62969a0a2a..42e66e4606 100644
--- a/staticd/subdir.am
+++ b/staticd/subdir.am
@@ -36,7 +36,7 @@ clippy_scan += \
# end
staticd_staticd_SOURCES = staticd/static_main.c
-staticd_staticd_LDADD = staticd/libstatic.a lib/libfrr.la $(LIBCAP)
+staticd_staticd_LDADD = staticd/libstatic.a lib/libfrr.la $(LIBCAP) $(LIBYANG_LIBS)
nodist_staticd_staticd_SOURCES = \
yang/frr-staticd.yang.c \