From: Trent Nelson <trent.a.b.nelson@gmail.com>
Date: Wed, 6 Jul 2011 20:33:00 +0000 (-0400)
Subject: Fix out-of-tree (VPATH) builds
X-Git-Tag: upstream/1.9.6^2~350^2
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=56320c681fb971e81ed03d220bb1f399ff6315fa;p=deb_libnfs.git

Fix out-of-tree (VPATH) builds
---

diff --git a/examples/Makefile.am b/examples/Makefile.am
index f029a22..314807b 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,13 +2,13 @@ noinst_PROGRAMS = nfsclient-async nfsclient-raw nfsclient-sync nfsclient-bcast n
 
 AM_CPPFLAGS = \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/mount \
-	-I$(abs_top_srcdir)/nfs \
-	-I$(abs_top_srcdir)/rquota \
-	-I$(abs_top_srcdir)/portmap \
+	-I../mount \
+	-I../nfs \
+	-I../rquota \
+	-I../portmap \
 	"-D_U_=__attribute__((unused))"
 
-AM_LDFLAGS = $(abs_top_srcdir)/lib/.libs/libnfs.la
+AM_LDFLAGS = ../lib/.libs/libnfs.la
 
 nfsclient_async_SOURCES = nfsclient-async.c
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ba0eb43..221034f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,10 @@
 lib_LTLIBRARIES = libnfs.la
 
 libnfs_la_CPPFLAGS = -I$(abs_top_srcdir)/include \
-		     -I$(abs_top_srcdir)/mount \
-		     -I$(abs_top_srcdir)/nfs \
-		     -I$(abs_top_srcdir)/portmap \
-		     -I$(abs_top_srcdir)/rquota \
+		     -I../mount \
+		     -I../nfs \
+		     -I../portmap \
+		     -I../rquota \
 		     "-D_U_=__attribute__((unused))"
 
 libnfs_la_SOURCES = \
@@ -16,8 +16,8 @@ libnfs_la_SOURCES = \
 
 libnfs_la_LDFLAGS = -version-info 0:0:0
 libnfs_la_LIBADD = \
-	$(abs_top_srcdir)/mount/libmount.la \
-	$(abs_top_srcdir)/nfs/libnfs.la \
-	$(abs_top_srcdir)/portmap/libportmap.la \
-	$(abs_top_srcdir)/rquota/librquota.la 
+	../mount/libmount.la \
+	../nfs/libnfs.la \
+	../portmap/libportmap.la \
+	../rquota/librquota.la