summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2014-10-31 04:58:59 +0100
committerVijay Bellur <vbellur@redhat.com>2014-11-02 08:41:34 -0800
commit12bc39c144aa41a097435f2aab304ddfbbb9b625 (patch)
treedc4b50fb1912415dda5ab4dcadcf07fa634146a5 /rpc
parentbf9e4330e4108e0dbab8ebf300bf7998551b9589 (diff)
Build fix: xdrgen
As discovered in https://review.gluster.org/8762, BSD systems fail to run xdrgen during glusterfs build. This seems to be caused by a difference between BSD make and GNU make whith implcit targets. The former seems to use absolute path here, which means we should not prepend it with the current directory path, otherwise we have the directory path twice and the files cannot be found my make. BUG: 1157839 Change-Id: I178123bf6f3d9e963ff5b78839d498f530c05a97 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/9016 Reviewed-by: Harshavardhana <harsha@harshavardhana.net> Tested-by: Harshavardhana <harsha@harshavardhana.net> Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com>
Diffstat (limited to 'rpc')
-rw-r--r--rpc/xdr/src/Makefile.am72
1 files changed, 36 insertions, 36 deletions
diff --git a/rpc/xdr/src/Makefile.am b/rpc/xdr/src/Makefile.am
index 48aaa7ba775..9d606558413 100644
--- a/rpc/xdr/src/Makefile.am
+++ b/rpc/xdr/src/Makefile.am
@@ -23,91 +23,91 @@ CLEANFILES = $(XDRSOURCES) $(XDRHEADERS)
EXTRA_DIST = $(XDRGENFILES)
glusterfs3-xdr.c: glusterfs3-xdr.x glusterfs3-xdr.h
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.c=.x}; then \
- $(top_srcdir)/build-aux/xdrgen source $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; \
+ @if test -f ${@:.c=.x}; then \
+ $(top_srcdir)/build-aux/xdrgen source ${@:.c=.x} ; \
fi
glusterfs3-xdr.h: glusterfs3-xdr.x
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen header $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; \
+ @if test -f ${@:.h=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen header ${@:.h=.x} ; \
fi
cli1-xdr.c: cli1-xdr.x cli1-xdr.h
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen source $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; \
+ @if test -f ${@:.c=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen source ${@:.c=.x} ; \
fi
cli1-xdr.h: cli1-xdr.x
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen header $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; \
+ @if test -f ${@:.h=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen header ${@:.h=.x} ; \
fi
nlm4-xdr.c: nlm4-xdr.x nlm4-xdr.h
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen source $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; \
+ @if test -f ${@:.c=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen source ${@:.c=.x} ; \
fi
nlm4-xdr.h: nlm4-xdr.x
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen header $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; \
+ @if test -f ${@:.h=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen header ${@:.h=.x} ; \
fi
nsm-xdr.c: nsm-xdr.x nsm-xdr.h
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen source $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; \
+ @if test -f ${@:.c=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen source ${@:.c=.x} ; \
fi
nsm-xdr.h: nsm-xdr.x
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen header $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; \
+ @if test -f ${@:.h=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen header ${@:.h=.x} ; \
fi
rpc-common-xdr.c: rpc-common-xdr.x rpc-common-xdr.h
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen source $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; \
+ @if test -f ${@:.c=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen source ${@:.c=.x} ; \
fi
rpc-common-xdr.h: rpc-common-xdr.x
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen header $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; \
+ @if test -f ${@:.h=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen header ${@:.h=.x} ; \
fi
glusterd1-xdr.c: glusterd1-xdr.x glusterd1-xdr.h
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen source $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; \
+ @if test -f ${@:.c=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen source ${@:.c=.x} ; \
fi
glusterd1-xdr.h: glusterd1-xdr.x
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen header $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; \
+ @if test -f ${@:.h=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen header ${@:.h=.x} ; \
fi
acl3-xdr.c: acl3-xdr.x acl3-xdr.h
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen source $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; \
+ @if test -f ${@:.c=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen source ${@:.c=.x} ; \
fi
acl3-xdr.h: acl3-xdr.x
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen header $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; \
+ @if test -f ${@:.h=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen header ${@:.h=.x} ; \
fi
portmap-xdr.c: portmap-xdr.x portmap-xdr.h
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen source $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; \
+ @if test -f ${@:.c=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen source ${@:.c=.x} >&2 ; \
fi
portmap-xdr.h: portmap-xdr.x
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen header $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; \
+ @if test -f ${@:.h=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen header ${@:.h=.x} >&2 ; \
fi
mount3udp.c: mount3udp.x mount3udp.h
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen source $(top_srcdir)/rpc/xdr/src/${@:.c=.x} ; \
+ @if test -f ${@:.c=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen source ${@:.c=.x} ; \
fi
mount3udp.h: mount3udp.x
- @if test -f $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; then \
- $(top_srcdir)/build-aux/xdrgen header $(top_srcdir)/rpc/xdr/src/${@:.h=.x} ; \
+ @if test -f ${@:.h=.x} ; then \
+ $(top_srcdir)/build-aux/xdrgen header ${@:.h=.x} ; \
fi