Put preprocessor definitions in AM_CPPFLAGS
When an alternate kernel header include directory is added in CPPFLAGS, the libnl build fails. This is because the local copy of kernel headers is added in AM_CFLAGS, which gets included after CPPFLAGS in the automake-generated makefile. Switching to AM_CPPFLAGS fixes the problems.
This commit is contained in:
parent
4ab22ccd47
commit
a172e3ccf0
|
@ -1,6 +1,6 @@
|
||||||
# -*- Makefile -*-
|
# -*- Makefile -*-
|
||||||
|
|
||||||
AM_CFLAGS = -Wall -I${top_srcdir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
|
AM_CPPFLAGS = -Wall -I${top_srcdir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
|
||||||
|
|
||||||
lib_LTLIBRARIES = \
|
lib_LTLIBRARIES = \
|
||||||
libnl.la libnl-genl.la libnl-route.la libnl-nf.la
|
libnl.la libnl-genl.la libnl-route.la libnl-nf.la
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
SUBDIRS = lib
|
SUBDIRS = lib
|
||||||
|
|
||||||
AM_CFLAGS = -Wall -I${top_srcdir}/include -D_GNU_SOURCE
|
AM_CPPFLAGS = -Wall -I${top_srcdir}/include -D_GNU_SOURCE
|
||||||
AM_LDFLAGS = -L${top_builddir}/lib -L${top_builddir}/src/lib -lnl-cli
|
AM_LDFLAGS = -L${top_builddir}/lib -L${top_builddir}/src/lib -lnl-cli
|
||||||
|
|
||||||
noinst_PROGRAMS = \
|
noinst_PROGRAMS = \
|
||||||
|
|
Reference in New Issue