summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Bießmann <biessmann@corscience.de>2010-08-05 15:19:02 +0200
committerThomas Graf <tgraf@suug.ch>2010-10-13 14:36:09 +0200
commitcb05bbb0e2d38f41569754e1505c22929537c17e (patch)
treec17f463b978fe9e29a606610cf7767ba3f330468
parent706ac94ed523be847f09d04544d379d35263a930 (diff)
downloadandroid_external_libnl-cb05bbb0e2d38f41569754e1505c22929537c17e.tar.gz
android_external_libnl-cb05bbb0e2d38f41569754e1505c22929537c17e.tar.bz2
android_external_libnl-cb05bbb0e2d38f41569754e1505c22929537c17e.zip
automake: add ${top_builddir}/include to AM_CFLAGS
This patch enables out-of-source builds like this $ cd builddir && src_dir/configure && make Before this patch there was an error about missing netlink/version.h which is built by automake in top_builddir rather than top_srcdir which is already in include search path. Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
-rw-r--r--lib/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/lib/Makefile.am2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c2815c4..b415b63 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
# -*- Makefile -*-
-AM_CPPFLAGS = -Wall -I${top_srcdir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
+AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/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 d72284d..dda32a7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
SUBDIRS = lib
-AM_CPPFLAGS = -Wall -I${top_srcdir}/include -D_GNU_SOURCE
+AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE
AM_LDFLAGS = -L${top_builddir}/lib -L${top_builddir}/src/lib -lnl-cli
noinst_PROGRAMS = \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index dd4f6cf..80c217c 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,6 +1,6 @@
# -*- Makefile -*-
-AM_CPPFLAGS = -Wall -I${top_srcdir}/include -D_GNU_SOURCE -DPKGLIBDIR=\"$(pkglibdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -rdynamic
+AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DPKGLIBDIR=\"$(pkglibdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -rdynamic
AM_LDFLAGS = -L${top_builddir}/lib -ldl
#nobase_pkglib_LTLIBRARIES = cls/basic.la cls/ematch/cmp.la