diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2018-06-12 18:11:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 18:11:55 +0200 |
| commit | e789c0337cd587e904a400fdcec686d1e2394905 (patch) | |
| tree | dd3f685d59d3019691d8aa89369ebe786bdd76ba /vtysh | |
| parent | Merge pull request #2379 from qlyoung/docuser (diff) | |
| parent | *: disable all sanitizers for clippy build (diff) | |
| download | frr-e789c0337cd587e904a400fdcec686d1e2394905.tar.xz frr-e789c0337cd587e904a400fdcec686d1e2394905.zip | |
Merge pull request #2402 from qlyoung/germx-hand-sanitizer-kills-99-percent-of-germs
*: disable all sanitizers for clippy build
Diffstat (limited to 'vtysh')
| -rw-r--r-- | vtysh/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am index d82f9fd1b..5d6f890e9 100644 --- a/vtysh/Makefile.am +++ b/vtysh/Makefile.am @@ -1,5 +1,6 @@ ## Process this file with Automake to create Makefile.in +include ../common.am if ENABLE_BGP_VNC BGP_VNC_RFP_SRCDIR = @top_srcdir@/@LIBRFP@ @@ -16,14 +17,12 @@ BGP_VNC_RFAPI_INCDIR = BGP_VNC_RFAPI_SRCDIR = BGP_VNC_RFAPI_SRC = endif -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib \ +AM_CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib \ $(BGP_VNC_RFAPI_INCDIR) $(BGP_VNC_RFP_INCDIR) DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" LIBS = @LIBS@ @CURSES@ @LIBPAM@ -AM_CFLAGS = $(WERROR) - bin_PROGRAMS = vtysh vtysh_SOURCES = vtysh_main.c vtysh.c vtysh_user.c vtysh_config.c |