diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-03-05 14:21:24 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-03-07 20:57:37 +0100 |
| commit | 8f2566c5a39f758bb0db337fc106fa94f52220df (patch) | |
| tree | 47107416f6164458434a5a934bebb98741c215d1 /clientcomm | |
| parent | fef5564a64870ce438d0b1185df521fd54126171 (diff) | |
| download | rasdaman-upstream-8f2566c5a39f758bb0db337fc106fa94f52220df.tar.gz rasdaman-upstream-8f2566c5a39f758bb0db337fc106fa94f52220df.tar.xz rasdaman-upstream-8f2566c5a39f758bb0db337fc106fa94f52220df.zip | |
build: Support (srcdir != builddir) VDIR builds
Support (srcdir != builddir) VDIR builds.
This will also help a lot with preparing for a working
"make distcheck".
Diffstat (limited to 'clientcomm')
| -rw-r--r-- | clientcomm/Makefile.am | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/clientcomm/Makefile.am b/clientcomm/Makefile.am index e7aa7f0..6b2bad0 100644 --- a/clientcomm/Makefile.am +++ b/clientcomm/Makefile.am @@ -45,7 +45,7 @@ libclientcomm_a_SOURCES = rpcif_clnt.cc rpcif_xdr.c rpcif.h \ ../rnprotocol/rnpclientcomm2.cc \ ../rnprotocol/rnpclientcomm.hh libclientcomm_a_CPPFLAGS = $(AM_CPPFLAGS) -libclientcomm_a_CPPFLAGS += -I../rnprotocol +libclientcomm_a_CPPFLAGS += -I$(top_srcdir)/rnprotocol libclientcomm_a_CPPFLAGS += $(CLIENT_CPPFLAGS) EXTRA_libclientcomm_a_SOURCES = rpcif.x @@ -53,22 +53,30 @@ BUILT_SOURCES= rpcif_clnt.cc rpcif_xdr.c rpcif.h rpcif_svc.cc CLEANFILES=rpcif_clnt.cc rpcif_xdr.c rpcif.h rpcif.h.tmp rpcif.h.tmp2 \ rpcif_clnt.c.tmp rpcif_svc.cc.tmp rpcif_svc.cc -rpcif.h: rpcif.x - $(RPCGEN) -h -o rpcif.h.tmp rpcif.x - $(AWK) -f rpcif.h.awk rpcif.h.tmp > rpcif.h.tmp2 +rpcif.h: rpcif.x rpcif.h.awk + $(RPCGEN) -h -o rpcif.h.tmp $(srcdir)/rpcif.x + $(AWK) -f $(srcdir)/rpcif.h.awk rpcif.h.tmp > rpcif.h.tmp2 $(SED) 's,_RPCIF\.H_H_RPCGEN,_RPCIF_H_H_RPCGEN,g' rpcif.h.tmp2 > rpcif.h rm rpcif.h.tmp rpcif.h.tmp2 -rpcif_clnt.cc: rpcif.x - $(RPCGEN) -l -o rpcif_clnt.cc.tmp rpcif.x - $(AWK) -f rpcif_clnt.c.awk rpcif_clnt.cc.tmp > rpcif_clnt.cc - rm rpcif_clnt.cc.tmp +FIX_INCLUDE = $(SED) +FIX_INCLUDE += 's,^\#include "../../clientcomm/rpcif.h"$$,\#include "clientcomm/rpcif.h",' -rpcif_xdr.c: rpcif.x - -rm rpcif_xdr.c - $(RPCGEN) -c -o rpcif_xdr.c rpcif.x +rpcif_clnt.cc: rpcif.x rpcif_clnt.c.awk Makefile + -rm rpcif_clnt.cc.tmp + $(RPCGEN) -l -o rpcif_clnt.cc.tmp $(srcdir)/rpcif.x + $(AWK) -f $(srcdir)/rpcif_clnt.c.awk rpcif_clnt.cc.tmp > rpcif_clnt.cc.tmp2 + $(FIX_INCLUDE) rpcif_clnt.cc.tmp2 > rpcif_clnt.cc + rm rpcif_clnt.cc.tmp rpcif_clnt.cc.tmp2 -rpcif_svc.cc: rpcif.x - $(RPCGEN) -m -o rpcif_svc.cc.tmp rpcif.x - $(AWK) -f rpcif_svc.c.awk rpcif_svc.cc.tmp > rpcif_svc.cc - rm rpcif_svc.cc.tmp +rpcif_xdr.c: rpcif.x Makefile + -rm rpcif_xdr.c.tmp + $(RPCGEN) -c -o rpcif_xdr.c.tmp $(srcdir)/rpcif.x + $(FIX_INCLUDE) rpcif_xdr.c.tmp > rpcif_xdr.c + rm rpcif_xdr.c.tmp + +rpcif_svc.cc: rpcif.x rpcif_svc.c.awk Makefile + $(RPCGEN) -m -o rpcif_svc.cc.tmp $(srcdir)/rpcif.x + $(AWK) -f $(srcdir)/rpcif_svc.c.awk rpcif_svc.cc.tmp > rpcif_svc.cc.tmp2 + $(FIX_INCLUDE) rpcif_svc.cc.tmp2 > rpcif_svc.cc + rm rpcif_svc.cc.tmp rpcif_svc.cc.tmp2 |