From b7e444c6cf557fb0b2609217260826fc13a7ed1c Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Wed, 6 Jul 2011 16:32:08 -0400 Subject: [PATCH 1/2] Simplify examples Makefile --- examples/Makefile.am | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index bbf2c34..f029a22 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,40 +1,22 @@ noinst_PROGRAMS = nfsclient-async nfsclient-raw nfsclient-sync nfsclient-bcast nfsclient-listservers -nfsclient_async_CPPFLAGS = \ - -I$(abs_top_srcdir)/include \ - -I$(abs_top_srcdir)/mount \ - "-D_U_=__attribute__((unused))" -nfsclient_async_SOURCES = nfsclient-async.c -nfsclient_async_LDADD = $(abs_top_srcdir)/lib/.libs/libnfs.la - -nfsclient_raw_CPPFLAGS = \ +AM_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))" + +AM_LDFLAGS = $(abs_top_srcdir)/lib/.libs/libnfs.la + +nfsclient_async_SOURCES = nfsclient-async.c + +nfsclient_raw_SOURCES = nfsclient-raw.c + +nfsclient_sync_SOURCES = nfsclient-sync.c + 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 From 56320c681fb971e81ed03d220bb1f399ff6315fa Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Wed, 6 Jul 2011 16:33:00 -0400 Subject: [PATCH 2/2] Fix out-of-tree (VPATH) builds --- examples/Makefile.am | 10 +++++----- lib/Makefile.am | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) 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