From a172e3ccf0617828a23d08c8c4a8eb4825ce0ccf Mon Sep 17 00:00:00 2001 From: "Matthew L. Creech" Date: Mon, 19 Apr 2010 11:16:30 -0400 Subject: [PATCH] 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. --- lib/Makefile.am | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 082408c..c2815c4 100644 --- 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 4e2b57c..d72284d 100644 --- 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 = \ -- 2.40.0