diff options
| author | David Lamparter <equinox@diac24.net> | 2016-12-15 21:34:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-15 21:34:53 +0100 |
| commit | f4e454eb79a6d63f0fba83635047215ac6cf0e5f (patch) | |
| tree | 402711325312b6367fbde3c9baf1f144d1723f5d /zebra | |
| parent | zebra_mpls. Set best lsp nhlfe to null on deletion (diff) | |
| parent | *: kill useless if(...) after VTY_DECLVAR_CONTEXT (diff) | |
| download | frr-f4e454eb79a6d63f0fba83635047215ac6cf0e5f.tar.xz frr-f4e454eb79a6d63f0fba83635047215ac6cf0e5f.zip | |
Merge branch 'dev/osr/vty_index'
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/zebra/Makefile.am b/zebra/Makefile.am index d1c160ade..65927262f 100644 --- a/zebra/Makefile.am +++ b/zebra/Makefile.am @@ -2,8 +2,7 @@ include ../common.am ## Process this file with automake to produce Makefile.in. -AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib \ - -DVTY_DEPRECATE_INDEX +AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" INSTALL_SDATA=@INSTALL@ -m 600 |