From 9819fcedf10f1430d4969c86e6df4dfe975b7dcf Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Tue, 22 Apr 2014 13:27:35 -0700 Subject: rpcgen: Remove autogenerated files instead build on demand Avoid modifying autogenerated files and keeping them in repository - autogenerate them on demand from ".x" files Change-Id: I2cdb1fe9b99768ceb80a8cb100fa00bd1d8fe2c6 BUG: 1090807 Signed-off-by: Harshavardhana Reviewed-on: http://review.gluster.org/7526 Tested-by: Gluster Build System Reviewed-by: Niels de Vos Reviewed-by: Anand Avati --- rpc/xdr/src/Makefile.am | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'rpc/xdr/src/Makefile.am') diff --git a/rpc/xdr/src/Makefile.am b/rpc/xdr/src/Makefile.am index 0ec96e464..e39c677a9 100644 --- a/rpc/xdr/src/Makefile.am +++ b/rpc/xdr/src/Makefile.am @@ -5,23 +5,22 @@ libgfxdr_la_CFLAGS = -Wall $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) libgfxdr_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src -libgfxdr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la +libgfxdr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la libgfxdr_la_LDFLAGS = -version-info $(LIBGFXDR_LT_VERSION) -libgfxdr_la_SOURCES = xdr-generic.c rpc-common-xdr.c \ - glusterfs3-xdr.c \ - cli1-xdr.c \ - glusterd1-xdr.c \ - portmap-xdr.c \ - nlm4-xdr.c xdr-nfs3.c msg-nfs3.c nsm-xdr.c \ - nlmcbk-xdr.c acl3-xdr.c - -noinst_HEADERS = xdr-generic.h rpc-common-xdr.h \ - glusterfs3-xdr.h glusterfs3.h \ - cli1-xdr.h \ - glusterd1-xdr.h \ - portmap-xdr.h \ - nlm4-xdr.h xdr-nfs3.h msg-nfs3.h nsm-xdr.h \ - nlmcbk-xdr.h acl3-xdr.h +libgfxdr_la_SOURCES = $(XDRSOURCES) xdr-generic.c xdr-nfs3.c msg-nfs3.c + +noinst_HEADERS = $(XDRHEADERS) xdr-generic.h xdr-nfs3.h msg-nfs3.h glusterfs3.h + +XDRSOURCES = glusterfs3-xdr.c cli1-xdr.c nlm4-xdr.c nsm-xdr.c \ + rpc-common-xdr.c glusterd1-xdr.c acl3-xdr.c portmap-xdr.c +XDRHEADERS = glusterfs3-xdr.h cli1-xdr.h nlm4-xdr.h nsm-xdr.h \ + rpc-common-xdr.h glusterd1-xdr.h acl3-xdr.h portmap-xdr.h + +%.h:%.x + $(top_srcdir)/build-aux/xdrgen $(top_srcdir)/rpc/xdr/src/$*.x +%.c:%.x + $(top_srcdir)/build-aux/xdrgen $(top_srcdir)/rpc/xdr/src/$*.x + +CLEANFILES = $(XDRSOURCES) $(XDRHEADERS) -- cgit From f77e5b6ebe5d702065844db141ebd38ff7802168 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Sat, 26 Apr 2014 20:19:38 -0700 Subject: rpcgen: After recent changes parallel builds failed Parallel builds failed due to make file would overrun xdrgen (internally xdrgen uses tempfiles to add License header). Seperate out header and source generation and add explicit dependency to fix it. Change-Id: Id20f548493540b0f17a2300f0775646f9f20789c BUG: 1090807 Signed-off-by: Harshavardhana Reviewed-on: http://review.gluster.org/7572 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- rpc/xdr/src/Makefile.am | 105 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 96 insertions(+), 9 deletions(-) (limited to 'rpc/xdr/src/Makefile.am') diff --git a/rpc/xdr/src/Makefile.am b/rpc/xdr/src/Makefile.am index e39c677a9..1c70dc9db 100644 --- a/rpc/xdr/src/Makefile.am +++ b/rpc/xdr/src/Makefile.am @@ -1,3 +1,8 @@ +XDRSOURCES = glusterfs3-xdr.c cli1-xdr.c nlm4-xdr.c nsm-xdr.c \ + rpc-common-xdr.c glusterd1-xdr.c acl3-xdr.c portmap-xdr.c mount3udp.c +XDRHEADERS = $(XDRSOURCES:.c=.h) +XDRGENFILES = $(XDRSOURCES:.c=.x) + lib_LTLIBRARIES = libgfxdr.la libgfxdr_la_CFLAGS = -Wall $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) @@ -13,14 +18,96 @@ libgfxdr_la_SOURCES = $(XDRSOURCES) xdr-generic.c xdr-nfs3.c msg-nfs3.c noinst_HEADERS = $(XDRHEADERS) xdr-generic.h xdr-nfs3.h msg-nfs3.h glusterfs3.h -XDRSOURCES = glusterfs3-xdr.c cli1-xdr.c nlm4-xdr.c nsm-xdr.c \ - rpc-common-xdr.c glusterd1-xdr.c acl3-xdr.c portmap-xdr.c -XDRHEADERS = glusterfs3-xdr.h cli1-xdr.h nlm4-xdr.h nsm-xdr.h \ - rpc-common-xdr.h glusterd1-xdr.h acl3-xdr.h portmap-xdr.h +CLEANFILES = $(XDRSOURCES) $(XDRHEADERS) -%.h:%.x - $(top_srcdir)/build-aux/xdrgen $(top_srcdir)/rpc/xdr/src/$*.x -%.c:%.x - $(top_srcdir)/build-aux/xdrgen $(top_srcdir)/rpc/xdr/src/$*.x +EXTRA_DIST = $(XDRGENFILES) -CLEANFILES = $(XDRSOURCES) $(XDRHEADERS) +glusterfs3-xdr.c: glusterfs3-xdr.x glusterfs3-xdr.h + @if test -f $<; then \ + $(top_srcdir)/build-aux/xdrgen source $< ; \ + fi + +glusterfs3-xdr.h: glusterfs3-xdr.x + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen header $< ; \ + fi + +cli1-xdr.c: cli1-xdr.x cli1-xdr.h + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen source $< ; \ + fi + +cli1-xdr.h: cli1-xdr.x + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen header $< ; \ + fi + +nlm4-xdr.c: nlm4-xdr.x nlm4-xdr.h + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen source $< ; \ + fi + +nlm4-xdr.h: nlm4-xdr.x + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen header $< ; \ + fi + +nsm-xdr.c: nsm-xdr.x nsm-xdr.h + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen source $< ; \ + fi + +nsm-xdr.h: nsm-xdr.x + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen header $< ; \ + fi + +rpc-common-xdr.c: rpc-common-xdr.x rpc-common-xdr.h + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen source $< ; \ + fi + +rpc-common-xdr.h: rpc-common-xdr.x + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen header $< ; \ + fi + +glusterd1-xdr.c: glusterd1-xdr.x glusterd1-xdr.h + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen source $< ; \ + fi + +glusterd1-xdr.h: glusterd1-xdr.x + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen header $< ; \ + fi + +acl3-xdr.c: acl3-xdr.x acl3-xdr.h + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen source $< ; \ + fi + +acl3-xdr.h: acl3-xdr.x + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen header $< ; \ + fi + +portmap-xdr.c: portmap-xdr.x portmap-xdr.h + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen source $< ; \ + fi + +portmap-xdr.h: portmap-xdr.x + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen header $< ; \ + fi + +mount3udp.c: mount3udp.x mount3udp.h + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen source $< ; \ + fi + +mount3udp.h: mount3udp.x + @if test -f $< ; then \ + $(top_srcdir)/build-aux/xdrgen header $< ; \ + fi -- cgit