From cb05bbb0e2d38f41569754e1505c22929537c17e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20Bie=C3=9Fmann?= Date: Thu, 5 Aug 2010 15:19:02 +0200 Subject: [PATCH] automake: add ${top_builddir}/include to AM_CFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- lib/Makefile.am | 2 +- src/Makefile.am | 2 +- src/lib/Makefile.am | 2 +- 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 -- 2.40.0