diff options
| author | Matthew L. Creech <mlcreech@gmail.com> | 2010-04-19 11:16:30 -0400 |
|---|---|---|
| committer | Thomas Graf <tgraf@suug.ch> | 2010-10-13 14:29:34 +0200 |
| commit | a172e3ccf0617828a23d08c8c4a8eb4825ce0ccf (patch) | |
| tree | 3f371711a33edaa6b3163db176e72d4ae26c1131 | |
| parent | 4ab22ccd47319e7d9a972bcf018e1a03870f64f0 (diff) | |
| download | android_external_libnl-a172e3ccf0617828a23d08c8c4a8eb4825ce0ccf.tar.gz android_external_libnl-a172e3ccf0617828a23d08c8c4a8eb4825ce0ccf.tar.bz2 android_external_libnl-a172e3ccf0617828a23d08c8c4a8eb4825ce0ccf.zip | |
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.
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | 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 = \ |