diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | applications/rasql/Makefile.am | 3 | ||||
-rw-r--r-- | clientcomm/Makefile.am | 16 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | rnprotocol/Makefile.am | 47 | ||||
-rw-r--r-- | server/Makefile.am | 4 | ||||
-rw-r--r-- | servercomm/Makefile.am | 18 |
8 files changed, 36 insertions, 57 deletions
@@ -56,4 +56,5 @@ ylwrap bin/create_db.sh bin/start_rasdaman.sh bin/stop_rasdaman.sh +bin/rasmgr.conf insertutils/insertdemo.sh diff --git a/Makefile.am b/Makefile.am index 9640b39..c41c202 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = relblobif relindexif relmddif relcatalogif reladminif relstorageif \ indexmgr catalogmgr tilemgr storagemgr compression commline network \ - raslib clientcomm servercomm rnprotocol rasodmg qlparser conversion \ + raslib clientcomm servercomm rasodmg qlparser conversion \ mddmgr httpserver mymalloc time server rasmgr rascontrol rasdl \ applications bin insertutils manuals_and_examples diff --git a/applications/rasql/Makefile.am b/applications/rasql/Makefile.am index 819816f..9de1d06 100644 --- a/applications/rasql/Makefile.am +++ b/applications/rasql/Makefile.am @@ -35,12 +35,11 @@ bin_PROGRAMS=rasql rasql_SOURCES= rasql.cc rasql_error.cc rasql_error.hh \ rasql_signal.cc rasql_signal.hh rasql_LDADD = ../../rasodmg/librasodmg.a ../../clientcomm/libclientcomm.a \ - ../../rnprotocol/libclientcomm.a\ ../../compression/libcompression.a ../../raslib/libraslib.a \ ../../conversion/libconversion.a ../../commline/libcommline.a \ ../../network/libnetwork.a -SUBDIRS= ../../rasodmg ../../clientcomm ../../rnprotocol ../../compression \ +SUBDIRS= ../../rasodmg ../../clientcomm ../../compression \ ../../raslib ../../conversion ../../commline ../../network $(RECURSIVE_CLEAN_TARGETS): 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 - diff --git a/configure.ac b/configure.ac index a7c6902..8a764f4 100644 --- a/configure.ac +++ b/configure.ac @@ -21,6 +21,7 @@ AC_PROG_MAKE_SET AC_PROG_RANLIB AC_PROG_RPCGEN AC_PROG_SED +AM_PROG_CC_C_O dnl we preffer java AC_PROG_JAVA_CC dnl we need bison not yacc @@ -114,7 +115,6 @@ AC_CONFIG_FILES([Makefile raslib/Makefile clientcomm/Makefile servercomm/Makefile - rnprotocol/Makefile rasodmg/Makefile qlparser/Makefile conversion/Makefile diff --git a/rnprotocol/Makefile.am b/rnprotocol/Makefile.am deleted file mode 100644 index d6a021d..0000000 --- a/rnprotocol/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -# -# This file is part of rasdaman community. -# -# Rasdaman community is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Rasdaman community is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with rasdaman community. If not, see <http://www.gnu.org/licenses/>. -# -# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Peter Baumann / -# rasdaman GmbH. -# -# For more information please see <http://www.rasdaman.org> -# or contact Peter Baumann via <baumann@rasdaman.com>. -# -# MAKEFILE FOR: -# module rnprotocol -# -# COMMENTS: -# -################################################################## - -noinst_LIBRARIES=libservercomm.a libclientcomm.a - -libservercomm_a_SOURCES=rnprotocol.cc rnprotocol.hh \ - rnpembedded.cc rnpembedded.hh \ - rnpcommunication.cc rnpcommunication.hh \ - rnpserver.cc rnpserver.hh \ - srvrasmgrcomm.cc srvrasmgrcomm.hh \ - rnprasserver.cc rnprasserver.hh \ - rnpservercomm.cc rnpservercomm.hh - -libclientcomm_a_SOURCES=rnprotocol.cc rnprotocol.hh \ - rnpembedded.cc rnpembedded.hh \ - rnpcommunication.cc rnpcommunication.hh \ - rnprasserver.cc \ - rnpclientcomm.cc rnpclientcomm2.cc rnpclientcomm.hh - -CLEANFILES=core - 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): 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 |