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 /server | |
| 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 'server')
| -rw-r--r-- | server/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index 5a36db5..b9bbba9 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -39,7 +39,7 @@ rasserver_SOURCES=rasserver_main.cc rasserver_config.cc rasserver_entry.cc \ ../debug/debug-clt.hh ../debug/debug.hh ../debug/debug-srv.hh \ ../include/bool.h ../include/globals.hh ../include/rasdaman.hh \ ../include/stdexcept.h -rasserver_LDADD=../rnprotocol/libservercomm.a ../servercomm/libservercomm.a ../qlparser/libqlparser.a ../conversion/libconversion.a \ +rasserver_LDADD=../servercomm/libservercomm.a ../qlparser/libqlparser.a ../conversion/libconversion.a \ ../raslib/libraslib.a ../storagemgr/libstoragemgr.a ../reladminif/libreladminif.a \ ../tilemgr/libtilemgr.a ../mddmgr/libmddmgr.a \ ../catalogmgr/libcatalogmgr.a ../relmddif/librelmddif.a ../relstorageif/librelstorageif.a \ @@ -51,7 +51,7 @@ rasserver_LDADD=../rnprotocol/libservercomm.a ../servercomm/libservercomm.a ../q SUBDIRS = ../relblobif ../relindexif ../relmddif ../relcatalogif ../reladminif ../relstorageif \ ../indexmgr ../catalogmgr ../tilemgr ../storagemgr ../commline ../network \ - ../raslib ../servercomm ../rnprotocol ../rasodmg ../qlparser ../conversion \ + ../raslib ../servercomm ../rasodmg ../qlparser ../conversion \ ../mddmgr ../httpserver ../mymalloc ../time $(RECURSIVE_CLEAN_TARGETS): |