From e1861690640e184d380a552356f74c7534285c41 Mon Sep 17 00:00:00 2001 From: Chris Zankel Date: Wed, 22 Apr 2015 17:08:04 -0700 Subject: [PATCH] build: fix 'out-of-tree' build Prefix include paths with '${srcdir}' to allow 'out-of-tree' builds: cd $BUILD $LIBISCSI/configure make Signed-off-by: Chris Zankel --- examples/Makefile.am | 2 +- lib/Makefile.am | 4 ++-- test-tool/Makefile.am | 3 ++- utils/Makefile.am | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index ecf049d..42ad818 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=-I. -I../include "-D_U_=__attribute__((unused))" \ +AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS=$(WARN_CFLAGS) LDADD = ../lib/libiscsi.la diff --git a/lib/Makefile.am b/lib/Makefile.am index 039e3e2..e7aeb75 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -15,9 +15,9 @@ SOREVISON=0 SOAGE=1 libiscsi_la_LDFLAGS = \ -version-info $(SOCURRENT):$(SOREVISON):$(SOAGE) -bindir $(bindir) \ - -no-undefined -export-symbols libiscsi.syms + -no-undefined -export-symbols ${srcdir}/libiscsi.syms -libiscsi_la_CPPFLAGS = -I../include -I$(srcdir)/include \ +libiscsi_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \ "-D_U_=__attribute__((unused))" \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am index 53740b2..f062c21 100644 --- a/test-tool/Makefile.am +++ b/test-tool/Makefile.am @@ -1,4 +1,5 @@ -AM_CPPFLAGS=-I. -I../include "-D_U_=__attribute__((unused))" \ +AM_CPPFLAGS=-I. -I${srcdir}/../include \ + "-D_U_=__attribute__((unused)) " \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS=$(WARN_CFLAGS) LDADD = ../lib/libiscsi.la diff --git a/utils/Makefile.am b/utils/Makefile.am index 6624880..bde1c81 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I../include "-D_U_=__attribute__((unused))" \ +AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS = $(WARN_CFLAGS) LDADD = ../lib/libiscsi.la