minors: protobuf upgraded (syntax version explicit); MySql->MariaDB names...

minors:  protobuf upgraded (syntax version explicit); MySql->MariaDB names changed; objectfiles before libs

Makefile

@@ -12,7 +12,7 @@ INC_DIR=/usr/local/omniORB/include \
 	   /usr/local/boost/include \
 	   /usr/local/soci/include \
 	   /usr/local/soci/include/soci \
-	   /usr/include/mysql \
+	   /usr/include/mariadb \
 	   /usr/include/soci \
 	   /usr/local/protobuf/include \
 	   ./src
@@ -29,11 +29,11 @@ CXX_DEBUG_FLAGS=-g -DVERBOSE_DEBUG
 CXX_RELEASE_FLAGS=-O3
 CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x -Wno-unused-local-typedefs -DHAVE_BOOST
 LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \
-	-lsoci_core -lsoci_mysql -lmysqlclient -lboost_system -lboost_thread \
+	-lsoci_core -lsoci_mysql -lmariadbclient -lboost_system -lboost_thread \
 	-lboost_filesystem -lboost_date_time -lprotobuf -lssl -lcrypto -lpthread
 INC_PARM=$(foreach d, $(INC_DIR), -I$d)
 LIB_PARM=$(foreach d, $(LIB_DIR), -L$d)
-PROTOC :=/usr/local/protobuf/bin/protoc
+PROTOC :=/usr/bin/protoc
 #================================================================================
 SRC_DIR=./src
 OBJ_DIR=./obj
@@ -67,7 +67,7 @@ debug: CXXFLAGS+=$(CXX_DEBUG_FLAGS) $(CXX_DEFAULT_FLAGS)
 debug: $(EXECUTABLE)
 
 $(EXECUTABLE): makedir $(OBJ_FILES)
-	$(CC) $(LDFLAGS) $(LIB_PARM) -o $@ $(OBJ_FILES)
+	$(CC) $(OBJ_FILES) $(LDFLAGS) $(LIB_PARM) -o $@ 
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
 	$(CC) $(CXXFLAGS) $(INC_PARM) -o $@ $<

proto/Request.proto

+
+syntax = "proto2";
+
 package DataImporter_ns;
 
 message Request

proto/Response.proto

+
+syntax = "proto2";
+
 package DataImporter_ns;
 
 message Response