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.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 082408c6e7ce6d12c815a1e15134595c99f98b6d..c2815c48ca78af46f0d22c6fe181f0f533ae27dc 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 # -*- 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 = \
        libnl.la libnl-genl.la libnl-route.la libnl-nf.la

diff --git a/src/Makefile.am b/src/Makefile.am
index 4e2b57c35781571533c1bbbb2e977bf4afadf531..d72284d1b08805ef95a2677f2f1278856718e4c9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 
 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
 
 noinst_PROGRAMS = \