Merge pull request #5706 from mjstapp/fix_nh_debug_show

[mirror_frr.git] / zebra / subdir.am

diff --git a/zebra/subdir.am b/zebra/subdir.am
index e3ca01ff73ea69396e0e427cec85cc6799436aa4..77ed5a6caa6f7a56c72a923dcaa829469ef1849b 100644 (file)
--- a/zebra/subdir.am
+++ b/zebra/subdir.am
@@ -10,7 +10,7 @@ vtysh_scan += \
        $(top_srcdir)/zebra/interface.c \
        $(top_srcdir)/zebra/router-id.c \
        $(top_srcdir)/zebra/rtadv.c \
-       $(top_srcdir)/zebra/zebra_mlag.c \
+       $(top_srcdir)/zebra/zebra_mlag_vty.c \
        $(top_srcdir)/zebra/zebra_mpls_vty.c \
        $(top_srcdir)/zebra/zebra_ptm.c \
        $(top_srcdir)/zebra/zebra_pw.c \
@@ -36,12 +36,12 @@ if LINUX
 module_LTLIBRARIES += zebra/zebra_cumulus_mlag.la
 endif
 
-man8 += $(MANBUILD)/zebra.8
+man8 += $(MANBUILD)/frr-zebra.8
 ## endif ZEBRA
 endif
 
 zebra_zebra_LDADD = lib/libfrr.la $(LIBCAP)
-if HAVE_PROTOBUF
+if HAVE_PROTOBUF3
 zebra_zebra_LDADD += mlag/libmlag_pb.la $(PROTOBUF_C_LIBS)
 endif
 zebra_zebra_SOURCES = \
@@ -72,6 +72,7 @@ zebra_zebra_SOURCES = \
        zebra/rule_netlink.c \
        zebra/rule_socket.c \
        zebra/zebra_mlag.c \
+       zebra/zebra_mlag_vty.c \
        zebra/zebra_l2.c \
        zebra/zebra_memory.c \
        zebra/zebra_dplane.c \
@@ -105,8 +106,8 @@ zebra_zebra_SOURCES = \
 zebra/debug_clippy.c: $(CLIPPY_DEPS)
 zebra/debug.$(OBJEXT): zebra/debug_clippy.c
 
-zebra/zebra_mlag_clippy.c: $(CLIPPY_DEPS)
-zebra/zebra_mlag.$(OBJEXT): zebra/zebra_mlag_clippy.c
+zebra/zebra_mlag_vty_clippy.c: $(CLIPPY_DEPS)
+zebra/zebra_mlag_vty.$(OBJEXT): zebra/zebra_mlag_vty_clippy.c
 
 zebra/zebra_vty_clippy.c: $(CLIPPY_DEPS)
 zebra/interface_clippy.c: $(CLIPPY_DEPS)
@@ -136,6 +137,7 @@ noinst_HEADERS += \
        zebra/rtadv.h \
        zebra/rule_netlink.h \
        zebra/zebra_mlag.h \
+       zebra/zebra_mlag_vty.h \
        zebra/zebra_fpm_private.h \
        zebra/zebra_l2.h \
        zebra/zebra_dplane.h \