diff options
| author | David Lamparter <equinox@diac24.net> | 2018-08-18 05:34:59 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-09-08 21:26:54 +0200 |
| commit | aad24c5ba61c7219bad009d849ad84e7f057813f (patch) | |
| tree | 79d7f5d6d68dbdd1402084cf6c80b9dc507124a5 /Makefile.am | |
| parent | build: include helper Makefiles in dist (diff) | |
| download | frr-aad24c5ba61c7219bad009d849ad84e7f057813f.tar.xz frr-aad24c5ba61c7219bad009d849ad84e7f057813f.zip | |
build: remove common.am
Fold things into where they make sense.
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 67c3540e1..fc1beaeea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,15 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = subdir-objects 1.12 -include common.am +ACLOCAL_AMFLAGS = -I m4 -AM_CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \ - -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib +AM_CFLAGS = \ + @ASAN_FLAGS@ @TSAN_FLAGS@ @MSAN_FLAGS@ \ + $(WERROR) +AM_CPPFLAGS = \ + @ASAN_FLAGS@ @TSAN_FLAGS@ @MSAN_FLAGS@ \ + -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \ + -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DCONFDATE=$(CONFDATE) LIBCAP = @LIBCAP@ @@ -195,8 +200,6 @@ EXTRA_DIST += \ zebra/Makefile \ # end -ACLOCAL_AMFLAGS = -I m4 - noinst_HEADERS += defaults.h indent: |