diff options
author | Renato Westphal <renato@opensourcerouting.org> | 2019-03-02 19:00:46 +0100 |
---|---|---|
committer | Renato Westphal <renatowestphal@gmail.com> | 2019-03-29 15:32:21 +0100 |
commit | 8f88441d717c0ded412543cceabf0ddd93ee9f09 (patch) | |
tree | 0a460d2da46a5b910535529c92e8db2fa5ff2a74 /yang | |
parent | yang: sync the IETF module translator with the latest frr-ripd changes (diff) | |
parent | Merge pull request #3894 from donaldsharp/install_replace (diff) | |
download | frr-8f88441d717c0ded412543cceabf0ddd93ee9f09.tar.xz frr-8f88441d717c0ded412543cceabf0ddd93ee9f09.zip |
Merge remote-tracking branch 'frr/master' into rip-vrf
Merge commit to solve a bunch of conflicts with other PRs that were
merged in the previous weeks.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'yang')
-rw-r--r-- | yang/libyang_plugins/subdir.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/yang/libyang_plugins/subdir.am b/yang/libyang_plugins/subdir.am index 956d22587..fe5f34a28 100644 --- a/yang/libyang_plugins/subdir.am +++ b/yang/libyang_plugins/subdir.am @@ -1,9 +1,14 @@ # # libyang user types # + +if LIBYANG_EXT_BUILTIN +lib_libfrr_la_SOURCES += yang/libyang_plugins/frr_user_types.c +else libyang_plugins_LTLIBRARIES += yang/libyang_plugins/frr_user_types.la +endif -yang_libyang_plugins_frr_user_types_la_CFLAGS = $(WERROR) +yang_libyang_plugins_frr_user_types_la_CFLAGS = $(WERROR) $(LIBYANG_CFLAGS) yang_libyang_plugins_frr_user_types_la_LDFLAGS = -avoid-version -module -shared -export-dynamic yang_libyang_plugins_frr_user_types_la_LIBADD = yang_libyang_plugins_frr_user_types_la_SOURCES = yang/libyang_plugins/frr_user_types.c |