]> git.puffer.fish Git - mirror/frr.git/commitdiff
ldpd, zebra: Fix `make dist` compiles 1375/head
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 9 Nov 2017 16:09:58 +0000 (11:09 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 9 Nov 2017 16:14:33 +0000 (11:14 -0500)
The original clippy implementation used if VTYSH_EXTRACT_PL
was defined or not to know to include as part of the creation
of vtysh.

Follow their lead here.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
ldpd/ldp_vty_cmds.c
zebra/zebra_vty.c

index aa2e06dfb98dbdb513235fd3e0f07f333bbd932d..6c86582960365e956e8e6f741e9e1ebb1d9b5dda 100644 (file)
@@ -25,7 +25,9 @@
 
 #include "ldpd/ldpd.h"
 #include "ldpd/ldp_vty.h"
+#ifndef VTYSH_EXTRACT_PL
 #include "ldpd/ldp_vty_cmds_clippy.c"
+#endif
 
 DEFUN_NOSH(ldp_mpls_ldp,
        ldp_mpls_ldp_cmd,
index 73f07171241ddbd887f74aa336129eb5c869c181..5546b6d3167f4a4b02b53c664494815842a5a5c5 100644 (file)
@@ -43,7 +43,9 @@
 #include "zebra/zebra_static.h"
 #include "lib/json.h"
 #include "zebra/zebra_vxlan.h"
+#ifndef VTYSH_EXTRACT_PL
 #include "zebra/zebra_vty_clippy.c"
+#endif
 #include "zebra/zserv.h"
 
 extern int allow_delete;