diff options
| author | David Lamparter <equinox@diac24.net> | 2019-01-30 18:11:54 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2019-01-30 19:13:51 +0100 |
| commit | fdbd8086b1e1c4844570d902ce093ce73c524664 (patch) | |
| tree | c70c224a77272fd310789e73e7d04b244605931f /Makefile.am | |
| parent | build, lib/yang: bake in extensions if possible (v2) (diff) | |
| download | frr-fdbd8086b1e1c4844570d902ce093ce73c524664.tar.xz frr-fdbd8086b1e1c4844570d902ce093ce73c524664.zip | |
build: fix a whole bunch of *FLAGS
- some target_CFLAGS that needed to include AM_CFLAGS didn't do so
- libyang/sysrepo/sqlite3/confd CFLAGS + LIBS weren't used at all
- consistently use $(FOO_CFLAGS) instead of @FOO_CFLAGS@
- 2 dependencies were missing for clippy
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 7f7d7d623..9e6c53d87 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects 1.12 ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = \ + $(LIBYANG_CFLAGS) \ + $(SQLITE3_CFLAGS) \ $(UNWIND_CFLAGS) \ $(SAN_FLAGS) \ $(WERROR) \ @@ -17,7 +19,6 @@ AM_LDFLAGS = \ $(SAN_FLAGS) \ # end DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DCONFDATE=$(CONFDATE) -LIBCAP = @LIBCAP@ AR_FLAGS = @AR_FLAGS@ ARFLAGS = @ARFLAGS@ |