Commit 6ed2c4e0 authored by Marco De Marco's avatar Marco De Marco
Browse files

Makefile modified, id key not exported

parent 40eb595d

Makefile

+15 −13
Original line number Diff line number Diff line
@@ -4,30 +4,32 @@ INST_NAME=test 
DEBUG_LEV=-v3

INSTALL_DIR=/usr/local/bin

#================================================================================

INC_DIR=/usr/local/omniORB-4.1.7/include \

	   /usr/local/zeromq-3.2.3/include/zmq \

	   /usr/local/tango-8.1.2/include/tango \

	   /usr/local/soci-3.2.1/include \

	   /usr/local/soci-3.2.1/include/soci \

INC_DIR=/usr/local/omniORB/include \

	   /usr/local/zeromq/include/zmq \

	   /usr/local/tango/include/tango \

	   /usr/local/boost/include \

	   /usr/local/soci/include \

	   /usr/local/soci/include/soci \

	   /usr/include/mysql \

	   /usr/local/protobuf-2.5.0/include \

	   /usr/local/protobuf/include \

	   ./src

LIB_DIR=/usr/local/omniORB-4.1.7/lib \

	   /usr/local/zeromq-3.2.3/lib \

	   /usr/local/tango-8.1.2/lib \

	   /usr/local/soci-3.2.1/lib64 \

	   /usr/local/protobuf-2.5.0/lib

LIB_DIR=/usr/local/omniORB/lib \

	   /usr/local/zeromq/lib \

	   /usr/local/tango/lib \

	   /usr/local/boost/lib \

	   /usr/local/soci/lib64 \

	   /usr/local/protobuf/lib

#================================================================================

CC=g++

CXX_DEBUG_FLAGS=-g -DVERBOSE_DEBUG

CXX_RELEASE_FLAGS=-O3

CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++11 -std=gnu++11

CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x

LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \

	-lsoci_core -lsoci_mysql -lboost_system -lboost_thread -lboost_filesystem \

	-lboost_date_time-mt -lprotobuf -lssl

INC_PARM=$(foreach d, $(INC_DIR), -I$d)

LIB_PARM=$(foreach d, $(LIB_DIR), -L$d)

PROTOC :=/usr/local/protobuf-2.5.0/bin/protoc

PROTOC :=/usr/local/protobuf/bin/protoc

#================================================================================

SRC_DIR=./src

OBJ_DIR=./obj

src/DBManager.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ protected: 
    virtual ~DBManager();



    class Deleter;

    friend Deleter;

    friend class Deleter;

    class Deleter

    {

        public:

src/PlainServer.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ class PlainServer : public Server 
    virtual ~PlainServer();



    class Deleter;

    friend Deleter;

    friend class Deleter;

    class Deleter

    {

	public:

src/ProtocolManager.cpp

+3 −1
Original line number Diff line number Diff line
@@ -447,7 +447,9 @@ void ProtocolManager::fillRow(Response::Metadata::Row* row) 


        std::string name = props.get_name();



        if(name.compare("storage_path")==0 || name.compare("file_path")==0)

        if(name.compare("id")==0 || 

        	name.compare("storage_path")==0 || 

		name.compare("file_path")==0)

        {

            #ifdef VERBOSE_DEBUG

                INFO_STREAM << "ProtocolManager::fillRow() skipping " << name << endl;

src/ProtocolManager.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ protected: 
    virtual ~ProtocolManager();



    class Deleter;

    friend Deleter;

    friend class Deleter;

    class Deleter

    {

        public: