From 961bd1b3cd4697c6bf3145eb513a543208c40ab8 Mon Sep 17 00:00:00 2001 From: Sorin Stancu-Mara Date: Sun, 26 Apr 2009 22:33:31 +0200 Subject: 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. --- servercomm/Makefile.am | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'servercomm') diff --git a/servercomm/Makefile.am b/servercomm/Makefile.am index 07e962f..5c18776 100644 --- a/servercomm/Makefile.am +++ b/servercomm/Makefile.am @@ -36,7 +36,23 @@ libservercomm_a_SOURCES=../clientcomm/rpcif_xdr.c ../clientcomm/rpcif_svc.cc ser servercomm2.cc manager.cc callbackmgr.cc httpserver.cc \ ../mymalloc/mymalloc_svc.cc ../mymalloc/mymalloc.h \ ../clientcomm/rpcif.h callbackmgr.hh httpserver.hh httpserver.icc \ - servercomm.hh servercomm.icc + servercomm.hh servercomm.icc \ + ../rnprotocol/rnprotocol.cc \ + ../rnprotocol/rnprotocol.hh \ + ../rnprotocol/rnpembedded.cc \ + ../rnprotocol/rnpembedded.hh \ + ../rnprotocol/rnpcommunication.cc \ + ../rnprotocol/rnpcommunication.hh \ + ../rnprotocol/rnpserver.cc \ + ../rnprotocol/rnpserver.hh \ + ../rnprotocol/srvrasmgrcomm.cc \ + ../rnprotocol/srvrasmgrcomm.hh \ + ../rnprotocol/rnprasserver.cc \ + ../rnprotocol/rnprasserver.hh \ + ../rnprotocol/rnpservercomm.cc \ + ../rnprotocol/rnpservercomm.hh +libservercomm_a_CPPFLAGS=-I../rnprotocol + BUILT_SOURCES=../clientcomm/rpcif_xdr.c ../clientcomm/rpcif.h ../clientcomm/rpcif_svc.cc .PHONY: ../clientcomm/rpcif_xdr.c ../clientcomm/rpcif.h ../clientcomm/rpcif_svc.cc -- cgit