diff options
| author | Sorin Stancu-Mara <smsorin@gmail.com> | 2009-04-26 22:33:31 +0200 |
|---|---|---|
| committer | Sorin Stancu-Mara <smsorin@gmail.com> | 2009-04-27 00:52:23 +0200 |
| commit | 961bd1b3cd4697c6bf3145eb513a543208c40ab8 (patch) | |
| tree | 09fc4623013c56a5da5c03bcc62f74ee87f267dc /clientcomm | |
| parent | b731794451462da83f77663b5b2dbcc8acc3587a (diff) | |
| download | rasdaman-upstream-961bd1b3cd4697c6bf3145eb513a543208c40ab8.tar.gz rasdaman-upstream-961bd1b3cd4697c6bf3145eb513a543208c40ab8.tar.xz rasdaman-upstream-961bd1b3cd4697c6bf3145eb513a543208c40ab8.zip | |
Corrected compilation structure for rnprotocol dir
Removed the rnprotocol Makefile and adjusted compilation structure.
Originally both rnprotocol, servercomm and clientcomm directories
were pushing files into libservercomm.a and libclientcomm.a.
Because the libraries stay in the directories where they were created
the libs were never merged.
While this was okay for the server it is impossible to deploy both
libraries that contain all the required object files.
Now the servercomm and cliencomm are responsible for compiling the
files in rnprotocol and joining them into the respective libraries.
Diffstat (limited to 'clientcomm')
| -rw-r--r-- | clientcomm/Makefile.am | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/clientcomm/Makefile.am b/clientcomm/Makefile.am index 62f6b7c..ce87a25 100644 --- a/clientcomm/Makefile.am +++ b/clientcomm/Makefile.am @@ -36,13 +36,24 @@ noinst_LIBRARIES=libclientcomm.a libclientcomm_a_SOURCES = rpcif_clnt.cc rpcif_xdr.c rpcif.h \ clientcomm.cc clientcomm.hh rpcclientcomm.cc \ rpcclientcomm.hh clientcomm.icc \ - ../mymalloc/mymalloc_cln.cc ../mymalloc/mymalloc.h + ../mymalloc/mymalloc_cln.cc ../mymalloc/mymalloc.h \ + ../rnprotocol/rnprotocol.cc \ + ../rnprotocol/rnprotocol.hh \ + ../rnprotocol/rnpembedded.cc \ + ../rnprotocol/rnpembedded.hh \ + ../rnprotocol/rnpcommunication.cc \ + ../rnprotocol/rnpcommunication.hh \ + ../rnprotocol/rnprasserver.cc \ + ../rnprotocol/rnpclientcomm.cc \ + ../rnprotocol/rnpclientcomm2.cc \ + ../rnprotocol/rnpclientcomm.hh +libclientcomm_a_CPPFLAGS=-I../rnprotocol + EXTRA_libclientcomm_a_SOURCES = rpcif.x 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_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 @@ -61,4 +72,3 @@ 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 - |