You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by is...@apache.org on 2020/06/30 17:31:26 UTC

[ignite] branch master updated: IGNITE-13176 C++: Remove autotools build system

This is an automated email from the ASF dual-hosted git repository.

isapego pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new b0d1a4f  IGNITE-13176 C++: Remove autotools build system
b0d1a4f is described below

commit b0d1a4f9c421cebefa1b76b5bf963e15cd33c513
Author: Ivan Daschinskiy <iv...@gmail.com>
AuthorDate: Tue Jun 30 20:30:12 2020 +0300

    IGNITE-13176 C++: Remove autotools build system
    
    This closes #7956
---
 .gitignore                                         |  29 -----
 assembly/release-apache-ignite-base.xml            |  16 +--
 modules/platforms/cpp/DEVNOTES.txt                 |  58 +---------
 modules/platforms/cpp/Makefile.am                  |  77 -------------
 modules/platforms/cpp/Makefile.amrel               |  59 ----------
 modules/platforms/cpp/binary/Makefile.am           |  74 ------------
 modules/platforms/cpp/binary/configure.ac          |  62 ----------
 modules/platforms/cpp/binary/include/Makefile.am   |  51 ---------
 modules/platforms/cpp/common/Makefile.am           |  63 ----------
 modules/platforms/cpp/common/configure.ac          |  62 ----------
 modules/platforms/cpp/common/include/Makefile.am   |  45 --------
 .../cpp/common/os/linux/include/Makefile.am        |  25 ----
 modules/platforms/cpp/configure.ac                 | 126 --------------------
 modules/platforms/cpp/configure.acrel              | 109 ------------------
 modules/platforms/cpp/core-test/Makefile.am        |  96 ----------------
 modules/platforms/cpp/core-test/configure.ac       |  62 ----------
 .../platforms/cpp/core-test/include/Makefile.am    |  24 ----
 modules/platforms/cpp/core/Makefile.am             |  85 --------------
 modules/platforms/cpp/core/configure.ac            |  62 ----------
 modules/platforms/cpp/core/ignite.pc.in            |   9 --
 modules/platforms/cpp/core/include/Makefile.am     |  82 -------------
 modules/platforms/cpp/examples/Makefile.am         |  28 -----
 modules/platforms/cpp/examples/README.txt          |  21 ++--
 .../cpp/examples/compute-example/Makefile.am       |  59 ----------
 modules/platforms/cpp/examples/configure.ac        |  64 -----------
 .../examples/continuous-query-example/Makefile.am  |  58 ----------
 modules/platforms/cpp/examples/include/Makefile.am |  24 ----
 .../cpp/examples/odbc-example/Makefile.am          |  59 ----------
 .../cpp/examples/put-get-example/Makefile.am       |  58 ----------
 .../cpp/examples/query-example/Makefile.am         |  58 ----------
 .../thin-client-put-get-example/Makefile.am        |  53 ---------
 modules/platforms/cpp/ignite/Makefile.am           |  61 ----------
 modules/platforms/cpp/ignite/configure.ac          |  62 ----------
 modules/platforms/cpp/jni/Makefile.am              |  65 -----------
 modules/platforms/cpp/jni/configure.ac             |  62 ----------
 modules/platforms/cpp/jni/include/Makefile.am      |  25 ----
 modules/platforms/cpp/network/Makefile.am          |  63 ----------
 modules/platforms/cpp/network/configure.ac         |  62 ----------
 modules/platforms/cpp/network/include/Makefile.am  |  28 -----
 modules/platforms/cpp/odbc-test/Makefile.am        | 127 ---------------------
 .../platforms/cpp/odbc-test/include/Makefile.am    |  26 -----
 modules/platforms/cpp/odbc/Makefile.am             | 106 -----------------
 modules/platforms/cpp/odbc/configure.ac            |  62 ----------
 modules/platforms/cpp/odbc/include/Makefile.am     |  73 ------------
 .../platforms/cpp/thin-client-test/CMakeLists.txt  |  17 +++
 modules/platforms/cpp/thin-client-test/Makefile.am |  79 -------------
 .../platforms/cpp/thin-client-test/configure.ac    |  62 ----------
 .../cpp/thin-client-test/include/Makefile.am       |  24 ----
 modules/platforms/cpp/thin-client/Makefile.am      |  75 ------------
 .../platforms/cpp/thin-client/include/Makefile.am  |  32 ------
 pom.xml                                            |  81 +------------
 51 files changed, 39 insertions(+), 2911 deletions(-)

diff --git a/.gitignore b/.gitignore
index 88ffb94..2e01d60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,35 +73,6 @@ ipch/
 packages
 *.nupkg
 
-#Autotools temp files
-/modules/platforms/cpp/**/Makefile
-/modules/platforms/cpp/**/Makefile.in
-/modules/platforms/cpp/**/aclocal.m4
-/modules/platforms/cpp/**/.libs/
-/modules/platforms/cpp/**/.dirstamp
-/modules/platforms/cpp/**/*.la
-/modules/platforms/cpp/ar-lib
-/modules/platforms/cpp/compile
-/modules/platforms/cpp/confdefs.h
-/modules/platforms/cpp/config.guess
-/modules/platforms/cpp/config.h
-/modules/platforms/cpp/config.h.in
-/modules/platforms/cpp/config.status
-/modules/platforms/cpp/config.sub
-/modules/platforms/cpp/configure
-/modules/platforms/cpp/core-test/ignite-tests
-/modules/platforms/cpp/core/ignite.pc
-/modules/platforms/cpp/depcomp
-/modules/platforms/cpp/ignite/ignite
-/modules/platforms/cpp/install-sh
-/modules/platforms/cpp/libtool
-/modules/platforms/cpp/ltmain.sh
-/modules/platforms/cpp/m4/
-/modules/platforms/cpp/missing
-/modules/platforms/cpp/odbc-test/ignite-odbc-tests
-/modules/platforms/cpp/stamp-h1
-/modules/platforms/cpp/thin-client-test/ignite-thin-client-tests
-
 #CMake temp files
 /modules/platforms/cpp/**/cmake-build**
 
diff --git a/assembly/release-apache-ignite-base.xml b/assembly/release-apache-ignite-base.xml
index f300ae2..834d782 100644
--- a/assembly/release-apache-ignite-base.xml
+++ b/assembly/release-apache-ignite-base.xml
@@ -36,15 +36,9 @@
         </file>
 
         <file>
-            <source>modules/platforms/cpp/configure.acrel</source>
+            <source>modules/platforms/cpp/CMakeLists.txt</source>
             <outputDirectory>/platforms/cpp</outputDirectory>
-            <destName>configure.ac</destName>
-        </file>
-
-        <file>
-            <source>modules/platforms/cpp/Makefile.amrel</source>
-            <outputDirectory>/platforms/cpp</outputDirectory>
-            <destName>Makefile.am</destName>
+            <destName>CMakeLists.txt</destName>
         </file>
 
         <!-- Copy Node.js files. -->
@@ -152,6 +146,12 @@
             </includes>
         </fileSet>
 
+        <!-- Move CMake modules. -->
+        <fileSet>
+            <directory>modules/platforms/cpp/cmake</directory>
+            <outputDirectory>/platforms/cpp/cmake</outputDirectory>
+        </fileSet>
+
         <!-- Move CPP "common" module. -->
         <fileSet>
             <directory>modules/platforms/cpp/common</directory>
diff --git a/modules/platforms/cpp/DEVNOTES.txt b/modules/platforms/cpp/DEVNOTES.txt
index 8e92d36..2d75102 100644
--- a/modules/platforms/cpp/DEVNOTES.txt
+++ b/modules/platforms/cpp/DEVNOTES.txt
@@ -8,63 +8,7 @@ further instructions.
 For details on ODBC driver installation and usage please refer to
 $IGNITE_HOME/platforms/cpp/odbc/README.txt.
 
-Building on Linux With Autotools
-----------------------------------
-
-Common Requirements:
-
- * GCC, g++, autotools, automake, and libtool must be installed
- * OpenSSL, 1.0 or later
- * Java Development Kit (JDK) must be installed: https://java.com/en/download/index.jsp
- * JAVA_HOME environment variable must be set pointing to Java installation directory.
- * IGNITE_HOME environment variable must be set to Ignite installation directory.
- * To build ODBC driver you need to install ODBC Driver Manager on you system.
-   Apache Ignite has been tested with UnixODBC. Make sure that you install development
-   version of the driver manager which contains header files that are necessary for
-   building a driver.
-
-Building the Apache Ignite C++ components:
-
- * Navigate to the directory $IGNITE_HOME/platforms/cpp
- * Execute the following commands one by one to build the project:
-    * libtoolize && aclocal && autoheader && automake --add-missing && autoreconf
-    * ./configure
-    * make
-
-Among standard included by autotools options configure script also include following
-Ignite-specific options:
- * --enable-odbc - build included ODBC driver. Disabled by default.
- * --enable-core - build Ignite core library. Enabled by default.
- * --enable-thin-client - build thin client library. Enabled by default.
- * --enable-node - build stand-alone node executable. Enabled by default.
-
-If you only need to build ODBC driver and do not want to build anything else you may just
-use configure script with the following arguments:
- ./configure --enable-odbc --disable-core --disable-thin-client --disable-node
-
-With the config like that you should not have any ignite dependencies as jvm.dll installed
-to build ODBC driver.
-
-Similarly if you only want to build only thin client you may use configure script with
-the following arguments:
- ./configure --disable-core --disable-node
-
-NOTE: You may want to use "make install" command to install Ignite libraries and headers
-for your operation system. Note however that this action may require superuser privileges.
-
-Building tests:
-
-Boost framework is required to build tests. The following boost libraries are used:
- * boost_unit_test_framework
- * boost_thread
- * boost_system
- * boost_chrono
-
-Ignite expects for boost libraries and header to be found under default system paths, so
-it is recommended to use package repository for your OS to install boost package for the
-development.
-
-Building on Linux and Mac OS X with CMake
+Building on Linux and Mac OS X with CMake (Windows currently not yet supported)
 ----------------------------------
 
 Common Requirements:
diff --git a/modules/platforms/cpp/Makefile.am b/modules/platforms/cpp/Makefile.am
deleted file mode 100644
index 4a5b774..0000000
--- a/modules/platforms/cpp/Makefile.am
+++ /dev/null
@@ -1,77 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-if COND_THIN_CLIENT
-  MAYBE_THIN_CLIENT = thin-client
-  MAYBE_NETWORK = network
-
-if COND_TESTS
-    MAYBE_THIN_CLIENT_TESTS = thin-client-test
-endif
-endif
-
-if COND_ODBC
-  MAYBE_ODBC = odbc
-  MAYBE_NETWORK = network
-
-if COND_TESTS
-    MAYBE_ODBC_TESTS = odbc-test
-endif
-endif
-
-if COND_CORE
-  MAYBE_CORE = core
-  MAYBE_JNI = jni
-
-if COND_TESTS
-    MAYBE_CORE_TESTS = core-test
-endif
-endif
-
-if COND_NODE
-  MAYBE_CORE = core
-  MAYBE_JNI = jni
-  MAYBE_NODE = ignite
-endif
-
-SUBDIRS = \
-    common \
-    binary \
-    $(MAYBE_NETWORK) \
-    $(MAYBE_JNI) \
-    $(MAYBE_ODBC) \
-    $(MAYBE_CORE) \
-    $(MAYBE_THIN_CLIENT) \
-    $(MAYBE_NODE) \
-    $(MAYBE_ODBC_TESTS) \
-    $(MAYBE_CORE_TESTS) \
-    $(MAYBE_THIN_CLIENT_TESTS)
-
-DIST_SUBDIRS = \
-    common \
-    binary \
-    network \
-    jni \
-    odbc \
-    core \
-    thin-client \
-    ignite \
-    core-test \
-    odbc-test \
-    thin-client-test
diff --git a/modules/platforms/cpp/Makefile.amrel b/modules/platforms/cpp/Makefile.amrel
deleted file mode 100644
index 12222f7..0000000
--- a/modules/platforms/cpp/Makefile.amrel
+++ /dev/null
@@ -1,59 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-if COND_THIN_CLIENT
-  MAYBE_THIN_CLIENT = thin-client
-  MAYBE_NETWORK = network
-endif
-
-if COND_ODBC
-  MAYBE_ODBC = odbc
-  MAYBE_NETWORK = network
-endif
-
-if COND_CORE
-  MAYBE_CORE = core
-  MAYBE_JNI = jni
-endif
-
-if COND_NODE
-  MAYBE_CORE = core
-  MAYBE_JNI = jni
-  MAYBE_NODE = ignite
-endif
-
-SUBDIRS = \
-    common \
-    binary \
-    $(MAYBE_NETWORK) \
-    $(MAYBE_JNI) \
-    $(MAYBE_ODBC) \
-    $(MAYBE_CORE) \
-    $(MAYBE_THIN_CLIENT) \
-    $(MAYBE_NODE)
-
-DIST_SUBDIRS = \
-    common \
-    binary \
-    network \
-    jni \
-    odbc \
-    core \
-    thin-client \
-    ignite
diff --git a/modules/platforms/cpp/binary/Makefile.am b/modules/platforms/cpp/binary/Makefile.am
deleted file mode 100644
index 499c8a9..0000000
--- a/modules/platforms/cpp/binary/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-lib_LTLIBRARIES = libignite-binary.la
-
-SUBDIRS = \
-	include
-
-AM_CPPFLAGS = \
-	-I$(srcdir)/include \
-	-I@top_srcdir@/common/include \
-	-I@top_srcdir@/common/os/linux/include \
-	-DIGNITE_IMPL \
-	-D__STDC_LIMIT_MACROS \
-	-D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-	-Wall \
-	-std=c++03
-
-libignite_binary_la_LIBADD = \
-	@top_srcdir@/common/libignite-common.la
-
-libignite_binary_la_LDFLAGS = \
-	-no-undefined \
-	-version-info 0:0:0 \
-	-release $(PACKAGE_VERSION)
-
-libignite_binary_la_DEPENDENCIES = \
-	@top_srcdir@/common/libignite-common.la
-
-libignite_binary_la_SOURCES = \
-	src/binary/binary_containers.cpp \
-	src/binary/binary_raw_writer.cpp \
-	src/binary/binary_writer.cpp \
-	src/binary/binary_reader.cpp \
-	src/binary/binary_type.cpp \
-	src/binary/binary_raw_reader.cpp \
-	src/impl/binary/binary_type_manager.cpp \
-	src/impl/binary/binary_type_impl.cpp \
-	src/impl/binary/binary_utils.cpp \
-	src/impl/binary/binary_reader_impl.cpp \
-	src/impl/binary/binary_type_handler.cpp \
-	src/impl/binary/binary_writer_impl.cpp \
-	src/impl/binary/binary_schema.cpp \
-	src/impl/binary/binary_type_snapshot.cpp \
-	src/impl/binary/binary_object_header.cpp \
-	src/impl/binary/binary_object_impl.cpp \
-	src/impl/binary/binary_field_meta.cpp \
-	src/impl/interop/interop_memory.cpp \
-	src/impl/interop/interop_output_stream.cpp \
-	src/impl/interop/interop_input_stream.cpp
-
-clean-local:
-	$(RM) *.gcno *.gcda
-
-clean-docs:
-	$(RM) $(DX_CLEANFILES)
diff --git a/modules/platforms/cpp/binary/configure.ac b/modules/platforms/cpp/binary/configure.ac
deleted file mode 100644
index 71ef5c8..0000000
--- a/modules/platforms/cpp/binary/configure.ac
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite binary protocol library for C++], [2.9.0.42453], [dev@ignite.apache.org], [ignite-binary], [ignite.apache.org])
-AC_CONFIG_SRCDIR(src)
-
-AC_CANONICAL_SYSTEM
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-# Initialize automake
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADER(config.h)
-
-AM_PROG_AR
-
-# Checks for programs.
-GXX="-g -O2"
-
-AC_PROG_CXX
-
-# Initialize Libtool
-LT_INIT
-
-# Checks for libraries.
-AC_CHECK_LIB([pthread], [pthread_mutex_lock])
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-
-AC_CONFIG_FILES(Makefile include/Makefile ignite-binary.pc)
-
-AC_OUTPUT
diff --git a/modules/platforms/cpp/binary/include/Makefile.am b/modules/platforms/cpp/binary/include/Makefile.am
deleted file mode 100644
index 85a5516..0000000
--- a/modules/platforms/cpp/binary/include/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-nobase_include_HEADERS = \
-	ignite/binary/binary_raw_reader.h \
-	ignite/binary/binary_reader.h \
-	ignite/binary/binary_writer.h \
-	ignite/binary/binary_raw_writer.h \
-	ignite/binary/binary_containers.h \
-	ignite/binary/binary.h \
-	ignite/binary/binary_consts.h \
-	ignite/binary/binary_type.h \
-	ignite/binary/binary_object.h \
-	ignite/impl/binary/binary_type_handler.h \
-	ignite/impl/binary/binary_id_resolver.h \
-	ignite/impl/binary/binary_type_impl.h \
-	ignite/impl/binary/binary_type_manager.h \
-	ignite/impl/binary/binary_type_updater.h \
-	ignite/impl/binary/binary_common.h \
-	ignite/impl/binary/binary_writer_impl.h \
-	ignite/impl/binary/binary_field_meta.h \
-	ignite/impl/binary/binary_type_snapshot.h \
-	ignite/impl/binary/binary_reader_impl.h \
-	ignite/impl/binary/binary_schema.h \
-	ignite/impl/binary/binary_utils.h \
-	ignite/impl/binary/binary_object_header.h \
-	ignite/impl/binary/binary_object_impl.h \
-	ignite/impl/interop/interop_memory.h \
-	ignite/impl/interop/interop.h \
-	ignite/impl/interop/interop_stream_position_guard.h \
-	ignite/impl/interop/interop_output_stream.h \
-	ignite/impl/interop/interop_input_stream.h
-
-uninstall-hook:
-	if [ -d ${includedir}/ignite ]; then find ${includedir}/ignite -type d -empty -delete; fi
diff --git a/modules/platforms/cpp/common/Makefile.am b/modules/platforms/cpp/common/Makefile.am
deleted file mode 100644
index df9068d..0000000
--- a/modules/platforms/cpp/common/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-lib_LTLIBRARIES = libignite-common.la
-
-SUBDIRS = \
-	include \
-	os/linux/include
-
-AM_CPPFLAGS = \
-	-I$(srcdir)/include \
-	-I$(srcdir)/os/linux/include \
-	-DIGNITE_IMPL \
-	-D__STDC_LIMIT_MACROS \
-	-D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-	-Wall \
-	-std=c++03
-
-libignite_common_la_LDFLAGS = \
-	-no-undefined \
-	-L/usr/local/lib \
-	-ldl \
-	-version-info 0:0:0 \
-	-release $(PACKAGE_VERSION)
-
-libignite_common_la_SOURCES = \
-	os/linux/src/common/concurrent_os.cpp \
-	os/linux/src/common/platform_utils.cpp \
-	os/linux/src/common/dynamic_load_os.cpp \
-	src/common/big_integer.cpp \
-	src/common/bits.cpp \
-	src/common/concurrent.cpp \
-	src/common/decimal.cpp \
-	src/common/utils.cpp \
-	src/date.cpp \
-	src/ignite_error.cpp \
-	src/guid.cpp \
-	src/timestamp.cpp \
-	src/time.cpp
-
-clean-local:
-	$(RM) *.gcno *.gcda
-
-clean-docs:
-	$(RM) $(DX_CLEANFILES)
diff --git a/modules/platforms/cpp/common/configure.ac b/modules/platforms/cpp/common/configure.ac
deleted file mode 100644
index 5e3ed8f..0000000
--- a/modules/platforms/cpp/common/configure.ac
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite common library for C++], [2.9.0.42453], [dev@ignite.apache.org], [ignite-common], [ignite.apache.org])
-AC_CONFIG_SRCDIR(src)
-
-AC_CANONICAL_SYSTEM
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-# Initialize automake
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADER(config.h)
-
-AM_PROG_AR
-
-# Checks for programs.
-GXX="-g -O2"
-
-AC_PROG_CXX
-
-# Initialize Libtool
-LT_INIT
-
-# Checks for libraries.
-AC_CHECK_LIB([pthread], [pthread_mutex_lock])
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-
-AC_CONFIG_FILES(Makefile include/Makefile os/linux/include/Makefile ignite-common.pc)
-
-AC_OUTPUT
diff --git a/modules/platforms/cpp/common/include/Makefile.am b/modules/platforms/cpp/common/include/Makefile.am
deleted file mode 100644
index 8079579..0000000
--- a/modules/platforms/cpp/common/include/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-nobase_include_HEADERS = \
-	ignite/common/big_integer.h \
-	ignite/common/bits.h \
-	ignite/common/cancelable.h \
-	ignite/common/concurrent.h \
-	ignite/common/decimal.h \
-	ignite/common/default_allocator.h \
-	ignite/common/expected.h \
-	ignite/common/reference_impl.h \
-	ignite/common/dynamic_size_array.h \
-	ignite/common/fixed_size_array.h \
-	ignite/common/lazy.h \
-	ignite/common/utils.h \
-	ignite/common/platform_utils.h \
-	ignite/common/shared_state.h \
-	ignite/common/promise.h \
-	ignite/date.h \
-	ignite/guid.h \
-	ignite/ignite_error.h \
-	ignite/timestamp.h \
-	ignite/time.h \
-	ignite/reference.h \
-	ignite/future.h
-
-uninstall-hook:
-	if [ -d ${includedir}/ignite ]; then find ${includedir}/ignite -type d -empty -delete; fi
diff --git a/modules/platforms/cpp/common/os/linux/include/Makefile.am b/modules/platforms/cpp/common/os/linux/include/Makefile.am
deleted file mode 100644
index 9332f4f..0000000
--- a/modules/platforms/cpp/common/os/linux/include/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-nobase_include_HEADERS = \
-    ignite/common/common.h \
-    ignite/common/concurrent_os.h
-
-uninstall-hook:
-	if [ -d ${includedir}/ignite ]; then find ${includedir}/ignite -type d -empty -delete; fi
diff --git a/modules/platforms/cpp/configure.ac b/modules/platforms/cpp/configure.ac
deleted file mode 100644
index 289aa57..0000000
--- a/modules/platforms/cpp/configure.ac
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++], [2.9.0.42453], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
-
-AC_CANONICAL_HOST
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADERS(config.h)
-
-# Enable silent rules by default
-AM_SILENT_RULES([yes])
-
-# Checks for programs.
-AC_PROG_CPP
-AM_PROG_AR
-
-# Initialize Libtool
-LT_INIT
-
-AC_ARG_ENABLE([odbc],
-    [AS_HELP_STRING([--enable-odbc],[build included ODBC driver [default=yes]])],
-    [ case "${enableval}" in
-        yes) odbc=true ;;
-        no) odbc=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-odbc) ;;
-        esac
-    ],
-    [odbc=true]
-)
-
-AC_ARG_ENABLE([core],
-    [AS_HELP_STRING([--enable-core],[build Ignite core library [default=yes]])],
-    [ case "${enableval}" in
-        yes) core=true ;;
-        no) core=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-core) ;;
-        esac],
-    [core=true]
-)
-
-AC_ARG_ENABLE([thin-client],
-    [AS_HELP_STRING([--enable-thin-client],[build Thin C++ client [default=yes]])],
-    [ case "${enableval}" in
-        yes) thin_client=true ;;
-        no) thin_client=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-thin-client) ;;
-        esac
-    ],
-    [thin_client=true]
-)
-
-AC_ARG_ENABLE([node],
-    [AS_HELP_STRING([--enable-node],[build stand-alone node binary [default=yes]])],
-    [ case "${enableval}" in
-        yes) node=true ;;
-        no) node=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-node) ;;
-        esac],
-    [node=true]
-)
-
-AC_ARG_ENABLE([tests],
-    [AS_HELP_STRING([--enable-tests],[build tests for enabled components [default=yes]])],
-    [ case "${enableval}" in
-        yes) tests=true ;;
-        no) tests=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-tests) ;;
-        esac],
-    [tests=true]
-)
-
-AM_CONDITIONAL([COND_ODBC], [test "x$odbc" = "xtrue"])
-AM_CONDITIONAL([COND_CORE], [test "x$core" = "xtrue"])
-AM_CONDITIONAL([COND_THIN_CLIENT], [test "x$thin_client" = "xtrue"])
-AM_CONDITIONAL([COND_NODE], [test "x$node" = "xtrue"])
-AM_CONDITIONAL([COND_TESTS], [test "x$tests" = "xtrue"])
-
-AC_CONFIG_FILES([ \
-    Makefile \
-    core-test/include/Makefile \
-    core-test/Makefile \
-    common/os/linux/include/Makefile \
-    common/include/Makefile \
-    common/Makefile \
-    binary/include/Makefile \
-    binary/Makefile \
-    network/include/Makefile \
-    network/Makefile \
-    odbc/include/Makefile \
-    odbc/Makefile \
-    odbc-test/include/Makefile \
-    odbc-test/Makefile \
-    core/include/Makefile \
-    core/Makefile \
-    core/ignite.pc \
-    jni/include/Makefile \
-    jni/Makefile \
-    thin-client/include/Makefile \
-    thin-client/Makefile \
-    thin-client-test/include/Makefile \
-    thin-client-test/Makefile \
-    ignite/Makefile \
-])
-
-AC_OUTPUT
diff --git a/modules/platforms/cpp/configure.acrel b/modules/platforms/cpp/configure.acrel
deleted file mode 100644
index 75eda8e..0000000
--- a/modules/platforms/cpp/configure.acrel
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++], [2.9.0.42453], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
-
-AC_CANONICAL_HOST
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADERS(config.h)
-
-# Enable silent rules by default
-AM_SILENT_RULES([yes])
-
-# Checks for programs.
-AC_PROG_CPP
-AM_PROG_AR
-
-# Initialize Libtool
-LT_INIT
-
-AC_ARG_ENABLE([odbc],
-    [AS_HELP_STRING([--enable-odbc],[build included ODBC driver [default=no]])],
-    [ case "${enableval}" in
-        yes) odbc=true ;;
-        no) odbc=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-odbc) ;;
-        esac
-    ],
-    [odbc=false]
-)
-
-AC_ARG_ENABLE([core],
-    [AS_HELP_STRING([--enable-core],[build Ignite core library [default=yes]])],
-    [ case "${enableval}" in
-        yes) core=true ;;
-        no) core=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-core) ;;
-        esac],
-    [core=true]
-)
-
-AC_ARG_ENABLE([thin-client],
-    [AS_HELP_STRING([--enable-thin-client],[build Thin C++ client [default=yes]])],
-    [ case "${enableval}" in
-        yes) thin_client=true ;;
-        no) thin_client=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-thin-client) ;;
-        esac
-    ],
-    [thin_client=true]
-)
-
-AC_ARG_ENABLE([node],
-    [AS_HELP_STRING([--enable-node],[build stand-alone node binary [default=yes]])],
-    [ case "${enableval}" in
-        yes) node=true ;;
-        no) node=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-node) ;;
-        esac],
-    [node=true]
-)
-
-AM_CONDITIONAL([COND_ODBC], [test "x$odbc" = "xtrue"])
-AM_CONDITIONAL([COND_CORE], [test "x$core" = "xtrue"])
-AM_CONDITIONAL([COND_THIN_CLIENT], [test "x$thin_client" = "xtrue"])
-AM_CONDITIONAL([COND_NODE], [test "x$node" = "xtrue"])
-
-AC_CONFIG_FILES([ \
-    Makefile \
-    common/os/linux/include/Makefile \
-    common/include/Makefile \
-    common/Makefile \
-    binary/include/Makefile \
-    binary/Makefile \
-    network/include/Makefile \
-    network/Makefile \
-    odbc/include/Makefile \
-    odbc/Makefile \
-    core/include/Makefile \
-    core/Makefile \
-    core/ignite.pc \
-    jni/include/Makefile \
-    jni/Makefile \
-    thin-client/include/Makefile \
-    thin-client/Makefile \
-    ignite/Makefile \
-])
-
-AC_OUTPUT
diff --git a/modules/platforms/cpp/core-test/Makefile.am b/modules/platforms/cpp/core-test/Makefile.am
deleted file mode 100644
index 7c3757c..0000000
--- a/modules/platforms/cpp/core-test/Makefile.am
+++ /dev/null
@@ -1,96 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_PROGRAMS = ignite-tests
-
-SUBDIRS = \
-	include
-
-AM_CPPFLAGS = \
-	-I$(srcdir)/include \
-	-I@top_srcdir@/core/include \
-	-I@top_srcdir@/core/os/linux/include \
-	-I@top_srcdir@/common/include \
-	-I@top_srcdir@/common/os/linux/include \
-	-I@top_srcdir@/binary/include \
-	-I@top_srcdir@/jni/include \
-	-I@top_srcdir@/jni/os/linux/include \
-	-I$(JAVA_HOME)/include \
-	-I$(JAVA_HOME)/include/linux \
-	-DIGNITE_IMPL \
-	-D__STDC_LIMIT_MACROS \
-	-D__STDC_CONSTANT_MACROS \
-	-DBOOST_TEST_DYN_LINK
-
-AM_CXXFLAGS = \
-	-Wall \
-	-std=c++03
-
-ignite_tests_LDADD = \
-	@top_srcdir@/core/libignite.la \
-	-lpthread \
-	-lboost_thread \
-	-lboost_system \
-	-lboost_chrono \
-	-lboost_unit_test_framework
-
-ignite_tests_LDFLAGS = \
-	-static-libtool-libs \
-	-rdynamic
-
-ignite_tests_SOURCES = \
-	src/reference_test.cpp \
-	src/bits_test.cpp \
-	src/binary_identity_resolver_test.cpp \
-	src/cache_test.cpp \
-	src/cache_query_test.cpp \
-	src/cache_store_test.cpp \
-	src/continuous_query_test.cpp \
-	src/concurrent_test.cpp \
-	src/compute_test.cpp \
-	src/ignition_test.cpp \
-	src/interop_memory_test.cpp \
-	src/interop_test.cpp \
-	src/cluster_test.cpp \
-	src/cache_invoke_test.cpp \
-	src/handle_registry_test.cpp \
-	src/ignite_error_test.cpp \
-	src/binary_test_defs.cpp \
-	src/binary_object_test.cpp \
-	src/binary_reader_writer_raw_test.cpp \
-	src/binary_reader_writer_test.cpp \
-	src/binary_session_test.cpp \
-	src/date_time_test.cpp \
-	src/decimal_test.cpp \
-	src/dynamic_size_array_test.cpp \
-	src/fixed_size_array_test.cpp \
-	src/future_test.cpp \
-	src/transactions_test.cpp \
-	src/teamcity_messages.cpp \
-	src/teamcity_boost.cpp \
-	src/test_utils.cpp
-
-run-check: check
-	./ignite-tests -p
-
-clean-local: clean-check
-	$(RM) *.gcno *.gcda
-
-clean-check:
-	$(RM) $(ignite_tests_OBJECTS)
diff --git a/modules/platforms/cpp/core-test/configure.ac b/modules/platforms/cpp/core-test/configure.ac
deleted file mode 100644
index 50bb13d..0000000
--- a/modules/platforms/cpp/core-test/configure.ac
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Test], [2.9.0.42453], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
-AC_CONFIG_SRCDIR(src)
-
-AC_CANONICAL_SYSTEM
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-# Initialize automake
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADER(config.h)
-
-AM_PROG_AR
-
-# Checks for programs.
-GXX="-g -O2"
-
-AC_PROG_CXX
-
-# Initialize Libtool
-LT_INIT
-
-# Checks for libraries.
-AC_CHECK_LIB([pthread], [pthread_mutex_lock])
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-
-AC_CONFIG_FILES(Makefile include/Makefile)
-
-AC_OUTPUT
diff --git a/modules/platforms/cpp/core-test/include/Makefile.am b/modules/platforms/cpp/core-test/include/Makefile.am
deleted file mode 100644
index 06d1a2f..0000000
--- a/modules/platforms/cpp/core-test/include/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_HEADERS = \
-    ignite/binary_test_defs.h \
-    ignite/binary_test_utils.h \
-    teamcity_messages.h
-
diff --git a/modules/platforms/cpp/core/Makefile.am b/modules/platforms/cpp/core/Makefile.am
deleted file mode 100644
index 1c970e8..0000000
--- a/modules/platforms/cpp/core/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-lib_LTLIBRARIES = libignite.la
-
-SUBDIRS = \
-	include
-
-AM_CPPFLAGS = \
-	-I$(srcdir)/include \
-	-I@top_srcdir@/common/include \
-	-I@top_srcdir@/common/os/linux/include \
-	-I@top_srcdir@/binary/include \
-	-I@top_srcdir@/jni/include \
-	-I@top_srcdir@/jni/os/linux/include \
-	-I$(JAVA_HOME)/include \
-	-I$(JAVA_HOME)/include/linux \
-	-DIGNITE_IMPL \
-	-D__STDC_LIMIT_MACROS \
-	-D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-	-Wall \
-	-std=c++03
-
-libignite_la_LIBADD = \
-	@top_srcdir@/jni/libignite-jni.la \
-	@top_srcdir@/binary/libignite-binary.la
-
-libignite_la_LDFLAGS = \
-	-no-undefined \
-	-ldl \
-	-version-info 0:0:0 \
-	-release $(PACKAGE_VERSION)
-
-libignite_la_DEPENDENCIES = \
-	@top_srcdir@/jni/libignite-jni.la \
-	@top_srcdir@/binary/libignite-binary.la
-
-libignite_la_SOURCES = \
-	src/ignite.cpp \
-	src/ignition.cpp \
-	src/impl/ignite_environment.cpp \
-	src/impl/binary/binary_type_updater_impl.cpp \
-	src/impl/handle_registry.cpp \
-	src/impl/cache/query/continuous/continuous_query_handle_impl.cpp \
-	src/impl/cache/query/query_impl.cpp \
-	src/impl/cache/cache_impl.cpp \
-	src/impl/cache/query/query_batch.cpp \
-	src/impl/interop/interop_external_memory.cpp \
-	src/impl/interop/interop_target.cpp \
-	src/impl/transactions/transaction_impl.cpp \
-	src/impl/transactions/transactions_impl.cpp \
-	src/impl/cluster/cluster_group_impl.cpp \
-	src/impl/compute/cancelable_impl.cpp \
-	src/impl/compute/compute_impl.cpp \
-	src/impl/ignite_impl.cpp \
-	src/impl/ignite_binding_impl.cpp \
-	src/transactions/transaction.cpp \
-	src/transactions/transactions.cpp
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(srcdir)/ignite.pc
-
-clean-local:
-	$(RM) *.gcno *.gcda
-
-clean-docs:
-	$(RM) $(DX_CLEANFILES)
diff --git a/modules/platforms/cpp/core/configure.ac b/modules/platforms/cpp/core/configure.ac
deleted file mode 100644
index 51c4f44..0000000
--- a/modules/platforms/cpp/core/configure.ac
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++], [2.9.0.42453], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
-AC_CONFIG_SRCDIR(src)
-
-AC_CANONICAL_SYSTEM
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-# Initialize automake
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADER(config.h)
-
-AM_PROG_AR
-
-# Checks for programs.
-GXX="-g -O2"
-
-AC_PROG_CXX
-
-# Initialize Libtool
-LT_INIT
-
-# Checks for libraries.
-AC_CHECK_LIB([pthread], [pthread_mutex_lock])
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-
-AC_CONFIG_FILES(Makefile include/Makefile os/linux/include/Makefile ignite.pc)
-
-AC_OUTPUT
diff --git a/modules/platforms/cpp/core/ignite.pc.in b/modules/platforms/cpp/core/ignite.pc.in
deleted file mode 100644
index 613fd1a..0000000
--- a/modules/platforms/cpp/core/ignite.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: ignite
-Description: Apache Ignite C++.
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lignite
diff --git a/modules/platforms/cpp/core/include/Makefile.am b/modules/platforms/cpp/core/include/Makefile.am
deleted file mode 100644
index 1e9369f..0000000
--- a/modules/platforms/cpp/core/include/Makefile.am
+++ /dev/null
@@ -1,82 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-nobase_include_HEADERS = \
-	ignite/cache/cache.h \
-	ignite/cache/cache_entry.h \
-	ignite/cache/cache_entry_processor.h \
-	ignite/cache/cache_peek_mode.h \
-	ignite/cache/event/cache_entry_event.h \
-	ignite/cache/event/cache_entry_event_filter.h \
-	ignite/cache/event/cache_entry_event_listener.h \
-	ignite/cache/mutable_cache_entry.h \
-	ignite/cache/query/continuous/continuous_query.h \
-	ignite/cache/query/continuous/continuous_query_handle.h \
-	ignite/cache/query/query.h \
-	ignite/cache/query/query_cursor.h \
-	ignite/cache/query/query_fields_cursor.h \
-	ignite/cache/query/query_fields_row.h \
-	ignite/cache/query/query_scan.h \
-	ignite/cache/query/query_sql.h \
-	ignite/cache/query/query_sql_fields.h \
-	ignite/cache/query/query_text.h \
-	ignite/compute/compute.h \
-	ignite/compute/compute_func.h \
-	ignite/ignite.h \
-	ignite/ignite_binding.h \
-	ignite/ignite_binding_context.h \
-	ignite/ignite_configuration.h \
-	ignite/ignition.h \
-	ignite/impl/binary/binary_type_updater_impl.h \
-	ignite/impl/bindings.h \
-	ignite/impl/cache/cache_entry_processor_holder.h \
-	ignite/impl/cache/cache_impl.h \
-	ignite/impl/cache/event/cache_entry_event_filter_base.h \
-	ignite/impl/cache/event/cache_entry_event_filter_holder.h \
-	ignite/impl/cache/query/continuous/continuous_query_handle_impl.h \
-	ignite/impl/cache/query/continuous/continuous_query_impl.h \
-	ignite/impl/cache/query/query_argument.h \
-	ignite/impl/cache/query/query_batch.h \
-	ignite/impl/cache/query/query_fields_row_impl.h \
-	ignite/impl/cache/query/query_impl.h \
-	ignite/impl/cluster/cluster_group_impl.h \
-	ignite/impl/compute/cancelable_impl.h \
-	ignite/impl/compute/compute_impl.h \
-	ignite/impl/compute/compute_job_holder.h \
-	ignite/impl/compute/compute_job_result.h \
-	ignite/impl/compute/compute_task_holder.h \
-	ignite/impl/compute/single_job_compute_task_holder.h \
-	ignite/impl/compute/multiple_job_compute_task_holder.h \
-	ignite/impl/handle_registry.h \
-	ignite/impl/ignite_binding_impl.h \
-	ignite/impl/ignite_environment.h \
-	ignite/impl/ignite_impl.h \
-	ignite/impl/interop/interop_external_memory.h \
-	ignite/impl/interop/interop_target.h \
-	ignite/impl/module_manager.h \
-	ignite/impl/operations.h \
-	ignite/impl/transactions/transactions_impl.h \
-	ignite/impl/transactions/transaction_impl.h \
-	ignite/transactions/transaction.h \
-	ignite/transactions/transactions.h \
-	ignite/transactions/transaction_consts.h \
-	ignite/transactions/transaction_metrics.h
-
-uninstall-hook:
-	if [ -d ${includedir}/ignite ]; then find ${includedir}/ignite -type d -empty -delete; fi
diff --git a/modules/platforms/cpp/examples/Makefile.am b/modules/platforms/cpp/examples/Makefile.am
deleted file mode 100644
index d7a49b7..0000000
--- a/modules/platforms/cpp/examples/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-SUBDIRS = \
-    put-get-example \
-    odbc-example \
-    query-example \
-	continuous-query-example \
-	compute-example \
-	thin-client-put-get-example \
-    include
-
diff --git a/modules/platforms/cpp/examples/README.txt b/modules/platforms/cpp/examples/README.txt
index 823f12d..148ce11 100644
--- a/modules/platforms/cpp/examples/README.txt
+++ b/modules/platforms/cpp/examples/README.txt
@@ -14,25 +14,24 @@ Common requirements
    $IGNITE_HOME/platforms/cpp/DEVNOTES.txt for build instructions and to $IGNITE_HOME/platforms/cpp/odbc/README.txt.
    for installation instructions.
 
-Running examples on Linux
+Running examples on Linux and MacOS
 ----------------------------------
 
 Prerequisites:
- * GCC, g++, autotools, automake, and libtool must be installed.
+ * GCC, g++, CMake >= 3.6 must be installed
+ * Apache Ignite C++ should be installed. Refer to $IGNITE_HOME/platforms/cpp/DEVNOTES.txt for instructions.
 
 To build examples execute the following commands one by one from examples root directory:
- * libtoolize && aclocal && autoheader && automake --add-missing && autoreconf
- * ./configure
+ * mkdir cmake-build-release
+ * cd ./cmake-build-release
+ * cmake -DCMAKE_BUILD_TYPE=[Release|Debug] [-DIGNITE_CPP_DIR=<ignite_install_dir>] ..
  * make
 
-As a result executables will appear in every example's directory.
+If Apache Ignite C++ is installed in default directories (i.e. /usr/local or /usr), setting IGNITE_CPP_DIR property
+is not necessary. As a result executables will be in corresponding subdirectories in cmake-build-release directory.
 
-Before running examples ensure that:
- * LD_LIBRARY_PATH environment variable is set and pointing to a directory with "libjvm.so" library. Typically this
-   library is located in $JAVA_HOME/jre/lib/amd64/server directory.
- * For odbc-example additionaly ODBC Driver Manager must be present and installed on your platform and
-   Apache Ignite ODBC driver must be built and installed according to instructions for your platform.
- * For odbc-example make sure that path to Ignite libraries is added to LD_LIBRARY_PATH (usually it is /usr/local/lib).
+For odbc-example additionaly ODBC Driver Manager must be present and installed on your platform and
+Apache Ignite ODBC driver must be built and installed according to instructions for your platform.
 
 Running examples on Windows
 ----------------------------------
diff --git a/modules/platforms/cpp/examples/compute-example/Makefile.am b/modules/platforms/cpp/examples/compute-example/Makefile.am
deleted file mode 100644
index d757bf7..0000000
--- a/modules/platforms/cpp/examples/compute-example/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_PROGRAMS = ignite-compute-example
-
-AM_CPPFLAGS = \
-    -I@top_srcdir@/include \
-    -I@top_srcdir@/../core/include \
-    -I@top_srcdir@/../core/os/linux/include \
-    -I@top_srcdir@/../common/include \
-    -I@top_srcdir@/../common/os/linux/include \
-    -I@top_srcdir@/../binary/include \
-    -I@top_srcdir@/../jni/include \
-    -I@top_srcdir@/../jni/os/linux/include \
-    -I$(JAVA_HOME)/include \
-    -I$(JAVA_HOME)/include/linux \
-    -DIGNITE_IMPL \
-    -D__STDC_LIMIT_MACROS \
-    -D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-    -Wall \
-    -std=c++03
-
-ignite_compute_example_LDADD = \
-    @top_srcdir@/../core/libignite.la \
-    -lodbc \
-    -lpthread
-
-ignite_compute_example_LDFLAGS = \
-    -static-libtool-libs
-
-ignite_compute_example_SOURCES = \
-    src/compute_example.cpp
-
-run-check: check
-	./ignite-compute-example -p
-
-clean-local: clean-check
-	$(RM) *.gcno *.gcda
-
-clean-check:
-	$(RM) $(ignite_compute_example_OBJECTS)
diff --git a/modules/platforms/cpp/examples/configure.ac b/modules/platforms/cpp/examples/configure.ac
deleted file mode 100644
index cba0308..0000000
--- a/modules/platforms/cpp/examples/configure.ac
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Examples], [2.9.0.42453], [dev@ignite.apache.org], [ignite-examples], [ignite.apache.org])
-
-AC_CANONICAL_HOST
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADERS(config.h)
-
-# Enable silent rules by default
-AM_SILENT_RULES([yes])
-
-# Checks for programs.
-AC_PROG_CXX
-AM_PROG_AR
-
-# Initialize Libtool
-LT_INIT
-
-AC_ARG_ENABLE([debug],
-    [AS_HELP_STRING([--enable-debug],[enable debug build [default=no]])],
-    [],
-    [enable_debug=no]
-)
-
-if test "x$enable_debug" = xyes; then
-    CXXFLAGS="-g -O0"
-else
-    CXXFLAGS="-g -O3"
-fi
-
-AC_CONFIG_FILES([ \
-    Makefile \
-    include/Makefile \
-    put-get-example/Makefile \
-    odbc-example/Makefile \
-    query-example/Makefile \
-    continuous-query-example/Makefile \
-    compute-example/Makefile \
-    thin-client-put-get-example/Makefile \
-])
-
-AC_OUTPUT
diff --git a/modules/platforms/cpp/examples/continuous-query-example/Makefile.am b/modules/platforms/cpp/examples/continuous-query-example/Makefile.am
deleted file mode 100644
index 2566689..0000000
--- a/modules/platforms/cpp/examples/continuous-query-example/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_PROGRAMS = ignite-continuous-query-example
-
-AM_CPPFLAGS = \
-    -I@top_srcdir@/include \
-    -I@top_srcdir@/../core/include \
-    -I@top_srcdir@/../core/os/linux/include \
-    -I@top_srcdir@/../common/include \
-    -I@top_srcdir@/../common/os/linux/include \
-    -I@top_srcdir@/../binary/include \
-    -I@top_srcdir@/../jni/include \
-    -I@top_srcdir@/../jni/os/linux/include \
-    -I$(JAVA_HOME)/include \
-    -I$(JAVA_HOME)/include/linux \
-    -DIGNITE_IMPL \
-    -D__STDC_LIMIT_MACROS \
-    -D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-    -Wall \
-    -std=c++0x
-
-ignite_continuous_query_example_LDADD = \
-    @top_srcdir@/../core/libignite.la \
-    -lpthread
-
-ignite_continuous_query_example_LDFLAGS = \
-    -static-libtool-libs
-
-ignite_continuous_query_example_SOURCES = \
-    src/continuous_query_example.cpp
-
-run-check: check
-	./ignite-continuous-query-example -p
-
-clean-local: clean-check
-	$(RM) *.gcno *.gcda
-
-clean-check:
-	$(RM) $(ignite_continuous_query_example_OBJECTS)
diff --git a/modules/platforms/cpp/examples/include/Makefile.am b/modules/platforms/cpp/examples/include/Makefile.am
deleted file mode 100644
index a54f87c..0000000
--- a/modules/platforms/cpp/examples/include/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_HEADERS = \
-    ignite/examples/address.h \
-    ignite/examples/organization.h \
-    ignite/examples/person.h
-
diff --git a/modules/platforms/cpp/examples/odbc-example/Makefile.am b/modules/platforms/cpp/examples/odbc-example/Makefile.am
deleted file mode 100644
index 88645d3..0000000
--- a/modules/platforms/cpp/examples/odbc-example/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_PROGRAMS = ignite-odbc-example
-
-AM_CPPFLAGS = \
-    -I@top_srcdir@/include \
-    -I@top_srcdir@/../core/include \
-    -I@top_srcdir@/../core/os/linux/include \
-    -I@top_srcdir@/../common/include \
-    -I@top_srcdir@/../common/os/linux/include \
-    -I@top_srcdir@/../binary/include \
-    -I@top_srcdir@/../jni/include \
-    -I@top_srcdir@/../jni/os/linux/include \
-    -I$(JAVA_HOME)/include \
-    -I$(JAVA_HOME)/include/linux \
-    -DIGNITE_IMPL \
-    -D__STDC_LIMIT_MACROS \
-    -D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-    -Wall \
-    -std=c++03
-
-ignite_odbc_example_LDADD = \
-    @top_srcdir@/../core/libignite.la \
-    -lodbc \
-    -lpthread
-
-ignite_odbc_example_LDFLAGS = \
-    -static-libtool-libs
-
-ignite_odbc_example_SOURCES = \
-    src/odbc_example.cpp
-
-run-check: check
-	./ignite-odbc-example -p
-
-clean-local: clean-check
-	$(RM) *.gcno *.gcda
-
-clean-check:
-	$(RM) $(ignite_odbc_example_OBJECTS)
diff --git a/modules/platforms/cpp/examples/put-get-example/Makefile.am b/modules/platforms/cpp/examples/put-get-example/Makefile.am
deleted file mode 100644
index 27154c5..0000000
--- a/modules/platforms/cpp/examples/put-get-example/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_PROGRAMS = ignite-put-get-example
-
-AM_CPPFLAGS = \
-    -I@top_srcdir@/include \
-    -I@top_srcdir@/../core/include \
-    -I@top_srcdir@/../core/os/linux/include \
-    -I@top_srcdir@/../common/include \
-    -I@top_srcdir@/../common/os/linux/include \
-    -I@top_srcdir@/../binary/include \
-    -I@top_srcdir@/../jni/include \
-    -I@top_srcdir@/../jni/os/linux/include \
-    -I$(JAVA_HOME)/include \
-    -I$(JAVA_HOME)/include/linux \
-    -DIGNITE_IMPL \
-    -D__STDC_LIMIT_MACROS \
-    -D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-    -Wall \
-    -std=c++03
-
-ignite_put_get_example_LDADD = \
-    @top_srcdir@/../core/libignite.la \
-    -lpthread
-
-ignite_put_get_example_LDFLAGS = \
-    -static-libtool-libs
-
-ignite_put_get_example_SOURCES = \
-    src/put_get_example.cpp
-
-run-check: check
-	./ignite-put-get-example -p
-
-clean-local: clean-check
-	$(RM) *.gcno *.gcda
-
-clean-check:
-	$(RM) $(ignite_put_get_example_OBJECTS)
diff --git a/modules/platforms/cpp/examples/query-example/Makefile.am b/modules/platforms/cpp/examples/query-example/Makefile.am
deleted file mode 100644
index 368d4bc..0000000
--- a/modules/platforms/cpp/examples/query-example/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_PROGRAMS = ignite-query-example
-
-AM_CPPFLAGS = \
-    -I@top_srcdir@/include \
-    -I@top_srcdir@/../core/include \
-    -I@top_srcdir@/../core/os/linux/include \
-    -I@top_srcdir@/../common/include \
-    -I@top_srcdir@/../common/os/linux/include \
-    -I@top_srcdir@/../binary/include \
-    -I@top_srcdir@/../jni/include \
-    -I@top_srcdir@/../jni/os/linux/include \
-    -I$(JAVA_HOME)/include \
-    -I$(JAVA_HOME)/include/linux \
-    -DIGNITE_IMPL \
-    -D__STDC_LIMIT_MACROS \
-    -D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-    -Wall \
-    -std=c++03
-
-ignite_query_example_LDADD = \
-    @top_srcdir@/../core/libignite.la \
-    -lpthread
-
-ignite_query_example_LDFLAGS = \
-    -static-libtool-libs
-
-ignite_query_example_SOURCES = \
-    src/query_example.cpp
-
-run-check: check
-	./ignite-query-example -p
-
-clean-local: clean-check
-	$(RM) *.gcno *.gcda
-
-clean-check:
-	$(RM) $(ignite_query_example_OBJECTS)
diff --git a/modules/platforms/cpp/examples/thin-client-put-get-example/Makefile.am b/modules/platforms/cpp/examples/thin-client-put-get-example/Makefile.am
deleted file mode 100644
index f9f7345..0000000
--- a/modules/platforms/cpp/examples/thin-client-put-get-example/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_PROGRAMS = ignite-thin-client-put-get-example
-
-AM_CPPFLAGS = \
-    -I@top_srcdir@/include \
-    -I@top_srcdir@/../thin-client/include \
-    -I@top_srcdir@/../thin-client/os/linux/include \
-    -I@top_srcdir@/../common/include \
-    -I@top_srcdir@/../common/os/linux/include \
-    -I@top_srcdir@/../binary/include \
-    -D__STDC_LIMIT_MACROS \
-    -D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-    -Wall \
-    -std=c++03
-
-ignite_thin_client_put_get_example_LDADD = \
-    @top_srcdir@/../thin-client/libignite-thin-client.la \
-    -lpthread
-
-ignite_thin_client_put_get_example_LDFLAGS = \
-    -static-libtool-libs
-
-ignite_thin_client_put_get_example_SOURCES = \
-    src/thin_client_put_get_example.cpp
-
-run-check: check
-	./ignite-thin-client-put-get-example -p
-
-clean-local: clean-check
-	$(RM) *.gcno *.gcda
-
-clean-check:
-	$(RM) $(ignite_thin_client_put_get_example_OBJECTS)
diff --git a/modules/platforms/cpp/ignite/Makefile.am b/modules/platforms/cpp/ignite/Makefile.am
deleted file mode 100644
index 9b65f05..0000000
--- a/modules/platforms/cpp/ignite/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_PROGRAMS = ignite
-
-AM_CPPFLAGS = \
-    -I$(srcdir)/include \
-    -I@top_srcdir@/core/include \
-    -I@top_srcdir@/core/os/linux/include \
-    -I@top_srcdir@/common/include \
-    -I@top_srcdir@/common/os/linux/include \
-    -I@top_srcdir@/binary/include \
-    -I@top_srcdir@/jni/include \
-    -I@top_srcdir@/jni/os/linux/include \
-    -I$(JAVA_HOME)/include \
-    -I$(JAVA_HOME)/include/linux \
-    -DIGNITE_IMPL \
-    -D__STDC_LIMIT_MACROS \
-    -D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-    -Wall \
-    -std=c++03
-
-ignite_LDADD = \
-    @top_srcdir@/core/libignite.la \
-    -lpthread
-
-ignite_LDFLAGS = \
-    -static-libtool-libs
-
-ignite_SOURCES = \
-    src/ignite.cpp
-
-ignite_DEPENDENCIES = \
-    @top_srcdir@/core/libignite.la
-
-run-check: check
-	./ignite
-
-clean-local: clean-check
-	$(RM) *.gcno *.gcda
-
-clean-check:
-	$(RM) $(ignite_OBJECTS)
diff --git a/modules/platforms/cpp/ignite/configure.ac b/modules/platforms/cpp/ignite/configure.ac
deleted file mode 100644
index a0275db..0000000
--- a/modules/platforms/cpp/ignite/configure.ac
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Runner], [2.9.0.42453], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
-AC_CONFIG_SRCDIR(src)
-
-AC_CANONICAL_SYSTEM
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-# Initialize automake
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADER(config.h)
-
-AM_PROG_AR
-
-# Checks for programs.
-GXX="-g -O2"
-
-AC_PROG_CXX
-
-# Initialize Libtool
-LT_INIT
-
-# Checks for libraries.
-AC_CHECK_LIB([pthread], [pthread_mutex_lock])
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-
-AC_CONFIG_FILES(Makefile)
-
-AC_OUTPUT
diff --git a/modules/platforms/cpp/jni/Makefile.am b/modules/platforms/cpp/jni/Makefile.am
deleted file mode 100644
index da107a2..0000000
--- a/modules/platforms/cpp/jni/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-SUBDIRS = \
-    include
-
-lib_LTLIBRARIES = libignite-jni.la
-
-AM_CPPFLAGS = \
-    -I$(srcdir)/include \
-    -I$(srcdir)/os/linux/include \
-    -I@top_srcdir@/common/include \
-    -I@top_srcdir@/common/os/linux/include \
-    -I$(JAVA_HOME)/include \
-    -I$(JAVA_HOME)/include/linux \
-    -DIGNITE_IMPL \
-    -D__STDC_LIMIT_MACROS \
-    -D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-    -Wall \
-    -std=c++03
-
-libignite_jni_la_LIBADD = \
-    -L$(JAVA_HOME)/jre/lib/amd64/server \
-    -L$(JAVA_HOME)/lib/server \
-    @top_srcdir@/common/libignite-common.la
-
-libignite_jni_la_LDFLAGS = \
-    -no-undefined \
-    -ljvm \
-    -version-info 0:0:0 \
-    -release $(PACKAGE_VERSION)
-
-libignite_jni_la_DEPENDENCIES = \
-    @top_srcdir@/common/libignite-common.la
-
-libignite_jni_la_SOURCES = \
-    os/linux/src/utils.cpp \
-    src/java.cpp \
-    src/exports.cpp
-
-clean-local:
-	$(RM) *.gcno *.gcda
-
-clean-docs:
-	$(RM) $(DX_CLEANFILES)
-
-
diff --git a/modules/platforms/cpp/jni/configure.ac b/modules/platforms/cpp/jni/configure.ac
deleted file mode 100644
index 36a6266..0000000
--- a/modules/platforms/cpp/jni/configure.ac
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite JNI bridge for C++], [2.9.0.42453], [dev@ignite.apache.org], [ignite-jni], [ignite.apache.org])
-AC_CONFIG_SRCDIR(src)
-
-AC_CANONICAL_SYSTEM
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-# Initialize automake
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADER(config.h)
-
-AM_PROG_AR
-
-# Checks for programs.
-GXX="-g -O2"
-
-AC_PROG_CXX
-
-# Initialize Libtool
-LT_INIT
-
-# Checks for libraries.
-AC_CHECK_LIB([pthread], [pthread_mutex_lock])
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-
-AC_CONFIG_FILES(Makefile include/Makefile ignite-jni.pc)
-
-AC_OUTPUT
diff --git a/modules/platforms/cpp/jni/include/Makefile.am b/modules/platforms/cpp/jni/include/Makefile.am
deleted file mode 100644
index ad64a87..0000000
--- a/modules/platforms/cpp/jni/include/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-nobase_include_HEADERS = \
-    ignite/jni/java.h \
-    ignite/jni/exports.h
-
-uninstall-hook:
-	if [ -d ${includedir}/ignite ]; then find ${includedir}/ignite -type d -empty -delete; fi
diff --git a/modules/platforms/cpp/network/Makefile.am b/modules/platforms/cpp/network/Makefile.am
deleted file mode 100644
index 2db45f4..0000000
--- a/modules/platforms/cpp/network/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-lib_LTLIBRARIES = libignite-network.la
-
-SUBDIRS = \
-	include
-
-AM_CPPFLAGS = \
-	-I$(srcdir)/include \
-	-I$(srcdir)/src \
-	-I$(srcdir)/os/linux/include \
-	-I$(srcdir)/os/linux/src \
-	-I@top_srcdir@/common/include \
-	-I@top_srcdir@/common/os/linux/include \
-	-DIGNITE_IMPL \
-	-D__STDC_LIMIT_MACROS \
-	-D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-	-Wall \
-	-std=c++03
-
-libignite_network_la_LIBADD = \
-	@top_srcdir@/common/libignite-common.la
-
-libignite_network_la_LDFLAGS = \
-	-no-undefined \
-	-version-info 0:0:0 \
-	-release $(PACKAGE_VERSION)
-
-libignite_network_la_DEPENDENCIES = \
-	@top_srcdir@/common/libignite-common.la
-
-libignite_network_la_SOURCES = \
-	os/linux/src/network/utils.cpp \
-	os/linux/src/network/tcp_socket_client.cpp \
-	os/linux/src/network/sockets.cpp \
-	src/network/network.cpp \
-	src/network/ssl/secure_socket_client.cpp \
-	src/network/ssl/ssl_gateway.cpp
-
-clean-local:
-	$(RM) *.gcno *.gcda
-
-clean-docs:
-	$(RM) $(DX_CLEANFILES)
diff --git a/modules/platforms/cpp/network/configure.ac b/modules/platforms/cpp/network/configure.ac
deleted file mode 100644
index f3ff9ba..0000000
--- a/modules/platforms/cpp/network/configure.ac
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite network library for C++], [2.9.0.42453], [dev@ignite.apache.org], [ignite-network], [ignite.apache.org])
-AC_CONFIG_SRCDIR(src)
-
-AC_CANONICAL_SYSTEM
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-# Initialize automake
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADER(config.h)
-
-AM_PROG_AR
-
-# Checks for programs.
-GXX="-g -O2"
-
-AC_PROG_CXX
-
-# Initialize Libtool
-LT_INIT
-
-# Checks for libraries.
-AC_CHECK_LIB([pthread], [pthread_mutex_lock])
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-
-AC_CONFIG_FILES(Makefile include/Makefile ignite-network.pc)
-
-AC_OUTPUT
diff --git a/modules/platforms/cpp/network/include/Makefile.am b/modules/platforms/cpp/network/include/Makefile.am
deleted file mode 100644
index da4b1c2..0000000
--- a/modules/platforms/cpp/network/include/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-nobase_include_HEADERS = \
-	ignite/network/end_point.h \
-	ignite/network/network.h \
-	ignite/network/socket_client.h \
-	ignite/network/tcp_range.h \
-	ignite/network/utils.h
-
-uninstall-hook:
-	if [ -d ${includedir}/ignite ]; then find ${includedir}/ignite -type d -empty -delete; fi
diff --git a/modules/platforms/cpp/odbc-test/Makefile.am b/modules/platforms/cpp/odbc-test/Makefile.am
deleted file mode 100644
index 6c84d91..0000000
--- a/modules/platforms/cpp/odbc-test/Makefile.am
+++ /dev/null
@@ -1,127 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_PROGRAMS = ignite-odbc-tests
-
-SUBDIRS = \
-    include
-
-AM_CPPFLAGS = \
-    -I$(srcdir)/include \
-    -I@top_srcdir@/common/include \
-    -I@top_srcdir@/common/os/linux/include \
-    -I@top_srcdir@/binary/include \
-    -I@top_srcdir@/network/include \
-    -I@top_srcdir@/network/os/linux/include \
-    -I@top_srcdir@/odbc/include \
-    -I@top_srcdir@/jni/include \
-    -I@top_srcdir@/jni/os/linux/include \
-    -I@top_srcdir@/core/include \
-    -I@top_srcdir@/core/os/linux/include \
-    -I$(JAVA_HOME)/include \
-    -I$(JAVA_HOME)/include/linux \
-    -DIGNITE_IMPL \
-    -D__STDC_LIMIT_MACROS \
-    -D__STDC_CONSTANT_MACROS \
-    -DBOOST_TEST_DYN_LINK
-
-AM_CXXFLAGS = \
-    -Wall \
-    -std=c++03
-
-ignite_odbc_tests_LDADD = \
-    @top_srcdir@/core/libignite.la \
-    -ldl \
-    -lodbc \
-    -lpthread \
-    -lboost_thread \
-    -lboost_system \
-    -lboost_chrono \
-    -lboost_unit_test_framework
-
-ignite_odbc_tests_LDFLAGS = \
-    -static-libtool-libs
-
-ignite_odbc_tests_SOURCES = \
-    src/teamcity/teamcity_boost.cpp \
-    src/teamcity/teamcity_messages.cpp \
-    src/parser_test.cpp \
-    src/cursor_test.cpp \
-    src/connection_info_test.cpp \
-    src/connection_test.cpp \
-    src/application_data_buffer_test.cpp \
-    src/column_test.cpp \
-    src/configuration_test.cpp \
-    src/row_test.cpp \
-    src/meta_queries_test.cpp \
-    src/utility_test.cpp \
-    src/queries_test.cpp \
-    src/queries_ssl_test.cpp \
-    src/test_utils.cpp \
-    src/sql_test_suite_fixture.cpp \
-    src/sql_string_functions_test.cpp \
-    src/sql_numeric_functions_test.cpp \
-    src/sql_aggregate_functions_test.cpp \
-    src/sql_system_functions_test.cpp \
-    src/sql_esc_convert_function_test.cpp \
-    src/sql_operators_test.cpp \
-    src/sql_value_expressions_test.cpp \
-    src/sql_types_test.cpp \
-    src/sql_date_time_functions_test.cpp \
-    src/sql_outer_join_test.cpp \
-    src/sql_get_info_test.cpp \
-    src/api_robustness_test.cpp \
-    src/attributes_test.cpp \
-    src/errors_test.cpp \
-    src/odbc_test_suite.cpp \
-    src/types_test.cpp \
-    src/transaction_test.cpp \
-    src/authentication_test.cpp \
-    src/sql_parsing_test.cpp \
-    src/streaming_test.cpp \
-    ../odbc/src/log.cpp \
-    ../odbc/src/cursor.cpp \
-    ../odbc/src/diagnostic/diagnostic_record.cpp \
-    ../odbc/src/diagnostic/diagnostic_record_storage.cpp \
-    ../odbc/src/config/config_tools.cpp \
-    ../odbc/src/config/configuration.cpp \
-    ../odbc/src/config/connection_info.cpp \
-    ../odbc/src/config/connection_string_parser.cpp \
-    ../odbc/src/app/application_data_buffer.cpp \
-    ../odbc/src/ssl_mode.cpp \
-    ../odbc/src/sql/sql_parser.cpp \
-    ../odbc/src/sql/sql_lexer.cpp \
-    ../odbc/src/sql/sql_set_streaming_command.cpp \
-    ../odbc/src/sql/sql_utils.cpp \
-    ../odbc/src/row.cpp \
-    ../odbc/src/protocol_version.cpp \
-    ../odbc/src/column.cpp \
-    ../odbc/src/common_types.cpp \
-    ../odbc/src/utility.cpp \
-    ../odbc/src/result_page.cpp \
-    ../odbc/src/nested_tx_mode.cpp
-
-run-check: check
-	./ignite-odbc-tests -p
-
-clean-local: clean-check
-	$(RM) *.gcno *.gcda
-
-clean-docs:
-	$(RM) $(ignite_odbc_tests_OBJECTS)
diff --git a/modules/platforms/cpp/odbc-test/include/Makefile.am b/modules/platforms/cpp/odbc-test/include/Makefile.am
deleted file mode 100644
index d13e7b6..0000000
--- a/modules/platforms/cpp/odbc-test/include/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_HEADERS = \
-    teamcity/teamcity_messages.h \
-    complex_type.h \
-    test_type.h \
-    test_utils.h \
-    sql_test_suite_fixture.h
-
diff --git a/modules/platforms/cpp/odbc/Makefile.am b/modules/platforms/cpp/odbc/Makefile.am
deleted file mode 100644
index ee88009..0000000
--- a/modules/platforms/cpp/odbc/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-lib_LTLIBRARIES = libignite-odbc.la
-
-SUBDIRS = \
-    include
-
-AM_CPPFLAGS = \
-    -I$(srcdir)/include \
-    -I@top_srcdir@/common/include \
-    -I@top_srcdir@/common/os/linux/include \
-    -I@top_srcdir@/binary/include \
-    -I@top_srcdir@/network/include \
-    -I@top_srcdir@/network/os/linux/include \
-    -DIGNITE_IMPL \
-    -D__STDC_LIMIT_MACROS \
-    -D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-    -Wall \
-    -std=c++03
-
-libignite_odbc_la_LIBADD = \
-    @top_srcdir@/binary/libignite-binary.la \
-    @top_srcdir@/network/libignite-network.la \
-    -lodbcinst
-
-libignite_odbc_la_LDFLAGS = \
-    -no-undefined \
-    -ldl \
-    -version-info 0:0:0 \
-    -release $(PACKAGE_VERSION)
-
-libignite_odbc_la_DEPENDENCIES = \
-    @top_srcdir@/binary/libignite-binary.la \
-    @top_srcdir@/network/libignite-network.la
-
-libignite_odbc_la_SOURCES = \
-    src/app/application_data_buffer.cpp \
-    src/app/parameter.cpp \
-    src/app/parameter_set.cpp \
-    src/common_types.cpp \
-    src/config/config_tools.cpp \
-    src/config/configuration.cpp \
-    src/config/connection_info.cpp \
-    src/config/connection_string_parser.cpp \
-    src/connection.cpp \
-    src/cursor.cpp \
-    src/diagnostic/diagnosable_adapter.cpp \
-    src/diagnostic/diagnostic_record.cpp \
-    src/diagnostic/diagnostic_record_storage.cpp \
-    src/environment.cpp \
-    src/meta/column_meta.cpp \
-    src/meta/table_meta.cpp \
-    src/odbc.cpp \
-    src/entry_points.cpp \
-    src/dsn_config.cpp \
-    src/query/column_metadata_query.cpp \
-    src/query/data_query.cpp \
-    src/query/batch_query.cpp \
-    src/query/foreign_keys_query.cpp \
-    src/query/primary_keys_query.cpp \
-    src/query/table_metadata_query.cpp \
-    src/query/type_info_query.cpp \
-    src/query/special_columns_query.cpp \
-    src/query/streaming_query.cpp \
-    src/sql/sql_parser.cpp \
-    src/sql/sql_lexer.cpp \
-    src/sql/sql_set_streaming_command.cpp \
-    src/sql/sql_utils.cpp \
-    src/streaming/streaming_batch.cpp \
-    src/streaming/streaming_context.cpp \
-    src/ssl_mode.cpp \
-    src/protocol_version.cpp \
-    src/result_page.cpp \
-    src/row.cpp \
-    src/nested_tx_mode.cpp \
-    src/message.cpp \
-    src/column.cpp \
-    src/statement.cpp \
-    src/type_traits.cpp \
-    src/utility.cpp \
-    src/log.cpp
-
-clean-local:
-	$(RM) *.gcno *.gcda
-
-clean-docs:
-	$(RM) $(DX_CLEANFILES)
diff --git a/modules/platforms/cpp/odbc/configure.ac b/modules/platforms/cpp/odbc/configure.ac
deleted file mode 100644
index d3d02c2..0000000
--- a/modules/platforms/cpp/odbc/configure.ac
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite ODBC driver for C++], [2.9.0.42453], [dev@ignite.apache.org], [ignite-odbc], [ignite.apache.org])
-AC_CONFIG_SRCDIR(src)
-
-AC_CANONICAL_SYSTEM
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-# Initialize automake
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADER(config.h)
-
-AM_PROG_AR
-
-# Checks for programs.
-GXX="-g -O2"
-
-AC_PROG_CXX
-
-# Initialize Libtool
-LT_INIT
-
-# Checks for libraries.
-AC_CHECK_LIB([pthread], [pthread_mutex_lock])
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-
-AC_CONFIG_FILES(Makefile include/Makefile ignite-odbc.pc)
-
-AC_OUTPUT
diff --git a/modules/platforms/cpp/odbc/include/Makefile.am b/modules/platforms/cpp/odbc/include/Makefile.am
deleted file mode 100644
index f34205e..0000000
--- a/modules/platforms/cpp/odbc/include/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_HEADERS = \
-    ignite/odbc.h \
-    ignite/odbc/query/table_metadata_query.h \
-    ignite/odbc/query/special_columns_query.h \
-    ignite/odbc/query/streaming_query.h \
-    ignite/odbc/query/type_info_query.h \
-    ignite/odbc/query/batch_query.h \
-    ignite/odbc/query/data_query.h \
-    ignite/odbc/query/foreign_keys_query.h \
-    ignite/odbc/query/internal_query.h \
-    ignite/odbc/query/column_metadata_query.h \
-    ignite/odbc/query/query.h \
-    ignite/odbc/query/primary_keys_query.h \
-    ignite/odbc/protocol_version.h \
-    ignite/odbc/statement.h \
-    ignite/odbc/config/configuration.h \
-    ignite/odbc/config/connection_info.h \
-    ignite/odbc/column.h \
-    ignite/odbc/parser.h \
-    ignite/odbc/app/application_data_buffer.h \
-    ignite/odbc/app/parameter.h \
-    ignite/odbc/app/parameter_set.h \
-    ignite/odbc/row.h \
-    ignite/odbc/utility.h \
-    ignite/odbc/environment.h \
-    ignite/odbc/dsn_config.h \
-    ignite/odbc/system/odbc_constants.h \
-    ignite/odbc/meta/primary_key_meta.h \
-    ignite/odbc/meta/column_meta.h \
-    ignite/odbc/meta/table_meta.h \
-    ignite/odbc/diagnostic/diagnostic_record.h \
-    ignite/odbc/diagnostic/diagnostic_record_storage.h \
-    ignite/odbc/diagnostic/diagnosable.h \
-    ignite/odbc/diagnostic/diagnosable_adapter.h \
-    ignite/odbc/sql/sql_command.h \
-    ignite/odbc/sql/sql_lexer.h \
-    ignite/odbc/sql/sql_parser.h \
-    ignite/odbc/sql/sql_set_streaming_command.h \
-    ignite/odbc/sql/sql_token.h \
-    ignite/odbc/sql/sql_utils.h \
-    ignite/odbc/streaming/streaming_batch.h \
-    ignite/odbc/streaming/streaming_context.h \
-    ignite/odbc/connection.h \
-    ignite/odbc/odbc_error.h \
-    ignite/odbc/ssl_mode.h \
-    ignite/odbc/message.h \
-    ignite/odbc/cursor.h \
-    ignite/odbc/common_types.h \
-    ignite/odbc/result_page.h \
-    ignite/odbc/type_traits.h \
-    ignite/odbc/log.h
-
-uninstall-hook:
-	if [ -d ${includedir}/ignite ]; then find ${includedir}/ignite -type d -empty -delete; fi
diff --git a/modules/platforms/cpp/thin-client-test/CMakeLists.txt b/modules/platforms/cpp/thin-client-test/CMakeLists.txt
index 381220b..d0ebe58 100644
--- a/modules/platforms/cpp/thin-client-test/CMakeLists.txt
+++ b/modules/platforms/cpp/thin-client-test/CMakeLists.txt
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 project(ignite-thin-client-tests)
 
 set(TARGET ${PROJECT_NAME})
diff --git a/modules/platforms/cpp/thin-client-test/Makefile.am b/modules/platforms/cpp/thin-client-test/Makefile.am
deleted file mode 100644
index 8dce61b..0000000
--- a/modules/platforms/cpp/thin-client-test/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_PROGRAMS = ignite-thin-client-tests
-
-SUBDIRS = \
-	include
-
-AM_CPPFLAGS = \
-	-I$(srcdir)/include \
-	-I@top_srcdir@/core/include \
-	-I@top_srcdir@/core/os/linux/include \
-	-I@top_srcdir@/common/include \
-	-I@top_srcdir@/common/os/linux/include \
-	-I@top_srcdir@/binary/include \
-	-I@top_srcdir@/network/include \
-	-I@top_srcdir@/network/os/linux/include \
-	-I@top_srcdir@/jni/include \
-	-I@top_srcdir@/jni/os/linux/include \
-	-I@top_srcdir@/thin-client/include \
-	-I@top_srcdir@/thin-client/os/linux/include \
-	-I$(JAVA_HOME)/include \
-	-I$(JAVA_HOME)/include/linux \
-	-DIGNITE_IMPL \
-	-D__STDC_LIMIT_MACROS \
-	-D__STDC_CONSTANT_MACROS \
-	-DBOOST_TEST_DYN_LINK
-
-AM_CXXFLAGS = \
-	-Wall \
-	-std=c++03
-
-ignite_thin_client_tests_LDADD = \
-	@top_srcdir@/core/libignite.la \
-	@top_srcdir@/network/libignite-network.la \
-	@top_srcdir@/thin-client/libignite-thin-client.la \
-	-lpthread \
-	-lboost_thread \
-	-lboost_system \
-	-lboost_chrono \
-	-lboost_unit_test_framework
-
-ignite_thin_client_tests_LDFLAGS = \
-	-static-libtool-libs \
-	-rdynamic
-
-ignite_thin_client_tests_SOURCES = \
-        src/teamcity/teamcity_boost.cpp \
-        src/teamcity/teamcity_messages.cpp \
-        src/cache_client_test.cpp \
-        src/test_utils.cpp \
-        src/ignite_client_test.cpp \
-        src/auth_test.cpp \
-        src/ssl_test.cpp
-
-run-check: check
-	./ignite-thin-client-tests -p
-
-clean-local: clean-check
-	$(RM) *.gcno *.gcda
-
-clean-check:
-	$(RM) $(ignite_thin_client_tests_OBJECTS)
diff --git a/modules/platforms/cpp/thin-client-test/configure.ac b/modules/platforms/cpp/thin-client-test/configure.ac
deleted file mode 100644
index fcae75df..0000000
--- a/modules/platforms/cpp/thin-client-test/configure.ac
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite C++ Thin Client Test], [2.9.0.42453], [dev@ignite.apache.org], [ignite], [ignite.apache.org])
-AC_CONFIG_SRCDIR(src)
-
-AC_CANONICAL_SYSTEM
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-# Initialize automake
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADER(config.h)
-
-AM_PROG_AR
-
-# Checks for programs.
-GXX="-g -O2"
-
-AC_PROG_CXX
-
-# Initialize Libtool
-LT_INIT
-
-# Checks for libraries.
-AC_CHECK_LIB([pthread], [pthread_mutex_lock])
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-
-AC_CONFIG_FILES(Makefile include/Makefile)
-
-AC_OUTPUT
diff --git a/modules/platforms/cpp/thin-client-test/include/Makefile.am b/modules/platforms/cpp/thin-client-test/include/Makefile.am
deleted file mode 100644
index 46a1825..0000000
--- a/modules/platforms/cpp/thin-client-test/include/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-noinst_HEADERS = \
-    teamcity/teamcity_messages.h \
-    ignite/complex_type.h \
-    test_utils.h
-
diff --git a/modules/platforms/cpp/thin-client/Makefile.am b/modules/platforms/cpp/thin-client/Makefile.am
deleted file mode 100644
index 5ce2904..0000000
--- a/modules/platforms/cpp/thin-client/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-lib_LTLIBRARIES = libignite-thin-client.la
-
-SUBDIRS = \
-    include
-
-AM_CPPFLAGS = \
-    -I$(srcdir)/include \
-    -I$(srcdir)/src \
-    -I@top_srcdir@/common/include \
-    -I@top_srcdir@/common/os/linux/include \
-    -I@top_srcdir@/binary/include \
-    -I@top_srcdir@/network/include \
-    -I@top_srcdir@/network/os/linux/include \
-    -DIGNITE_IMPL \
-    -D__STDC_LIMIT_MACROS \
-    -D__STDC_CONSTANT_MACROS
-
-AM_CXXFLAGS = \
-    -Wall \
-    -std=c++03
-
-libignite_thin_client_la_LIBADD = \
-    @top_srcdir@/binary/libignite-binary.la \
-    @top_srcdir@/network/libignite-network.la
-
-libignite_thin_client_la_LDFLAGS = \
-    -no-undefined \
-    -ldl \
-    -version-info 0:0:0 \
-    -release $(PACKAGE_VERSION)
-
-libignite_thin_client_la_DEPENDENCIES = \
-    @top_srcdir@/binary/libignite-binary.la \
-    @top_srcdir@/network/libignite-network.la
-
-libignite_thin_client_la_SOURCES = \
-    src/impl/data_channel.cpp \
-    src/impl/utility.cpp \
-    src/impl/protocol_version.cpp \
-    src/impl/ignite_node.cpp \
-    src/impl/ignite_client_impl.cpp \
-    src/impl/data_router.cpp \
-    src/impl/affinity/affinity_topology_version.cpp \
-    src/impl/affinity/affinity_assignment.cpp \
-    src/impl/affinity/affinity_manager.cpp \
-    src/impl/remote_type_updater.cpp \
-    src/impl/message.cpp \
-    src/impl/cache/cache_client_proxy.cpp \
-    src/impl/cache/cache_client_impl.cpp \
-    src/ignite_client.cpp
-
-clean-local:
-	$(RM) *.gcno *.gcda
-
-clean-docs:
-	$(RM) $(DX_CLEANFILES)
diff --git a/modules/platforms/cpp/thin-client/include/Makefile.am b/modules/platforms/cpp/thin-client/include/Makefile.am
deleted file mode 100644
index 7af4377..0000000
--- a/modules/platforms/cpp/thin-client/include/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-ACLOCAL_AMFLAGS =-I m4
-
-nobase_include_HEADERS = \
-    ignite/thin/ssl_mode.h \
-    ignite/thin/ignite_client.h \
-    ignite/thin/ignite_client_configuration.h \
-    ignite/thin/cache/cache_client.h \
-    ignite/thin/cache/cache_peek_mode.h \
-    ignite/impl/thin/writable_key.h \
-    ignite/impl/thin/readable.h \
-    ignite/impl/thin/writable.h \
-    ignite/impl/thin/cache/cache_client_proxy.h
-
-uninstall-hook:
-	if [ -d ${includedir}/ignite ]; then find ${includedir}/ignite -type d -empty -delete; fi
diff --git a/pom.xml b/pom.xml
index ede52d1..bd44b9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,79 +297,7 @@
             <id>release</id>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>exec-libtoolize</id>
-                                <phase>initialize</phase>
-                                <configuration>
-                                    <executable>libtoolize</executable>
-                                    <arguments>
-                                        <argument>--copy</argument>
-                                    </arguments>
-                                    <workingDirectory>${basedir}/target/release-package-${ignite.edition}/platforms/cpp</workingDirectory>
-                                </configuration>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                            </execution>
-
-                            <execution>
-                                <id>exec-aclocal</id>
-                                <phase>initialize</phase>
-                                <configuration>
-                                    <executable>aclocal</executable>
-                                    <workingDirectory>${basedir}/target/release-package-${ignite.edition}/platforms/cpp</workingDirectory>
-                                </configuration>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                            </execution>
-
-                            <execution>
-                                <id>exec-autoheader</id>
-                                <phase>initialize</phase>
-                                <configuration>
-                                    <executable>autoheader</executable>
-                                    <workingDirectory>${basedir}/target/release-package-${ignite.edition}/platforms/cpp</workingDirectory>
-                                </configuration>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                            </execution>
-
-                            <execution>
-                                <id>exec-automake</id>
-                                <phase>initialize</phase>
-                                <configuration>
-                                    <executable>automake</executable>
-                                    <arguments>
-                                        <argument>--add-missing</argument>
-                                        <argument>--copy</argument>
-                                    </arguments>
-                                    <workingDirectory>${basedir}/target/release-package-${ignite.edition}/platforms/cpp</workingDirectory>
-                                </configuration>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                            </execution>
-
-                            <execution>
-                                <id>exec-autoreconf</id>
-                                <phase>initialize</phase>
-                                <configuration>
-                                    <executable>autoreconf</executable>
-                                    <workingDirectory>${basedir}/target/release-package-${ignite.edition}/platforms/cpp</workingDirectory>
-                                </configuration>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
+                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
                         <version>1.7</version>
@@ -390,8 +318,6 @@
                                 <phase>initialize</phase>
                                 <configuration>
                                     <target>
-                                        <delete dir="${basedir}/target/release-package-${ignite.edition}/platforms/cpp/autom4te.cache" quiet="true"/>
-
                                         <replaceregexp byline="true">
                                             <regexp pattern="pushd &quot;%~dp0&quot;/\.\./\.\.(\s*&amp;::.+)?" />
                                             <substitution expression="pushd &quot;%~dp0&quot;/.." />
@@ -756,11 +682,10 @@
 
                                         <echo message="Update ignite.version in C++" />
                                         <replaceregexp byline="true" encoding="UTF-8">
-                                            <regexp pattern="(AC_INIT.+\[)\d+\.\d+\.\d+.*?(\].+)" />
+                                            <regexp pattern="(project\(.*\s)\d+\.\d+\.\d+.*?(\))" />
                                             <substitution expression="\1${new.client.version}\2" />
                                             <fileset dir="${basedir}/">
-                                                <include name="**/configure.ac" />
-                                                <include name="**/configure.acrel" />
+                                                <include name="**/CMakeLists.txt" />
                                             </fileset>
                                         </replaceregexp>