Merge pull request #9 from t-nelson/fix_vpath_build

Fix vpath build
libnfs-4.0.0-vitalif
Ronnie Sahlberg 2011-07-07 00:11:58 -07:00
commit 0b470f1e5e
2 changed files with 16 additions and 34 deletions

View File

@ -1,40 +1,22 @@
noinst_PROGRAMS = nfsclient-async nfsclient-raw nfsclient-sync nfsclient-bcast nfsclient-listservers
nfsclient_async_CPPFLAGS = \
AM_CPPFLAGS = \
-I$(abs_top_srcdir)/include \
-I$(abs_top_srcdir)/mount \
-I../mount \
-I../nfs \
-I../rquota \
-I../portmap \
"-D_U_=__attribute__((unused))"
AM_LDFLAGS = ../lib/.libs/libnfs.la
nfsclient_async_SOURCES = nfsclient-async.c
nfsclient_async_LDADD = $(abs_top_srcdir)/lib/.libs/libnfs.la
nfsclient_raw_CPPFLAGS = \
-I$(abs_top_srcdir)/include \
-I$(abs_top_srcdir)/mount \
-I$(abs_top_srcdir)/nfs \
-I$(abs_top_srcdir)/rquota \
"-D_U_=__attribute__((unused))"
nfsclient_raw_SOURCES = nfsclient-raw.c
nfsclient_raw_LDADD = $(abs_top_srcdir)/lib/.libs/libnfs.la
nfsclient_sync_CPPFLAGS = \
-I$(abs_top_srcdir)/include \
-I$(abs_top_srcdir)/mount \
"-D_U_=__attribute__((unused))"
nfsclient_sync_SOURCES = nfsclient-sync.c
nfsclient_sync_LDADD = $(abs_top_srcdir)/lib/.libs/libnfs.la
nfsclient_bcast_CPPFLAGS = \
-I$(abs_top_srcdir)/include \
-I$(abs_top_srcdir)/mount \
-I$(abs_top_srcdir)/portmap \
"-D_U_=__attribute__((unused))"
nfsclient_bcast_SOURCES = nfsclient-bcast.c
nfsclient_bcast_LDADD = $(abs_top_srcdir)/lib/.libs/libnfs.la
nfsclient_listservers_CPPFLAGS = \
-I$(abs_top_srcdir)/include \
-I$(abs_top_srcdir)/mount \
"-D_U_=__attribute__((unused))"
nfsclient_listservers_SOURCES = nfsclient-listservers.c
nfsclient_listservers_LDADD = $(abs_top_srcdir)/lib/.libs/libnfs.la

View File

@ -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