Merge branch 'master' of github.com:mailru/tarantool

client/tarantool/tnt.c

@@ -39,9 +39,9 @@
 #include <errcode.h>
 #include <third_party/gopt/gopt.h>
 
-#include <connector/c/include/libtnt/tnt.h>
-#include <connector/c/include/libtnt/tnt_sql.h>
-#include <connector/c/include/libtnt/tnt_net.h>
+#include <connector/c/include/tarantool/tnt.h>
+#include <connector/c/include/tarantool/tnt_sql.h>
+#include <connector/c/include/tarantool/tnt_net.h>
 
 #include <client/tarantool/tnt_admin.h>
 

connector/c/CMakeLists.txt

+
+#
+# library soname version
+#
+set(LIBTNT_VERSION_MAJOR "1")
+set(LIBTNT_VERSION_MINOR "1")
+
+set(LIBTNT_VERSION   "${LIBTNT_VERSION_MAJOR}.${LIBTNT_VERSION_MINOR}")
+set(LIBTNT_SOVERSION "${LIBTNT_VERSION_MAJOR}")
+
 add_subdirectory(tnt)
 add_subdirectory(tntsql)
 add_subdirectory(tntnet)

connector/c/include/CMakeLists.txt

@@ -3,4 +3,4 @@
 # installation of tarantool C client library headers
 #
 
-install(DIRECTORY libtnt DESTINATION include)
+install(DIRECTORY tarantool DESTINATION include)

connector/c/include/libtnt/tnt.h → connector/c/include/tarantool/tnt.h

@@ -33,20 +33,20 @@ extern "C" {
 #include <stdint.h>
 #include <stdarg.h>
 
-#include <libtnt/tnt_mem.h>
-#include <libtnt/tnt_proto.h>
-#include <libtnt/tnt_enc.h>
-#include <libtnt/tnt_tuple.h>
-#include <libtnt/tnt_reply.h>
-#include <libtnt/tnt_stream.h>
-#include <libtnt/tnt_iter.h>
-#include <libtnt/tnt_buf.h>
-#include <libtnt/tnt_ping.h>
-#include <libtnt/tnt_insert.h>
-#include <libtnt/tnt_update.h>
-#include <libtnt/tnt_delete.h>
-#include <libtnt/tnt_call.h>
-#include <libtnt/tnt_select.h>
+#include <tarantool/tnt_mem.h>
+#include <tarantool/tnt_proto.h>
+#include <tarantool/tnt_enc.h>
+#include <tarantool/tnt_tuple.h>
+#include <tarantool/tnt_reply.h>
+#include <tarantool/tnt_stream.h>
+#include <tarantool/tnt_iter.h>
+#include <tarantool/tnt_buf.h>
+#include <tarantool/tnt_ping.h>
+#include <tarantool/tnt_insert.h>
+#include <tarantool/tnt_update.h>
+#include <tarantool/tnt_delete.h>
+#include <tarantool/tnt_call.h>
+#include <tarantool/tnt_select.h>
 
 #ifdef __cplusplus
 } /* extern "C" */

connector/c/include/libtnt/tnt_net.h → connector/c/include/tarantool/tnt_net.h

@@ -32,8 +32,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <libtnt/tnt_opt.h>
-#include <libtnt/tnt_iob.h>
+#include <tarantool/tnt_opt.h>
+#include <tarantool/tnt_iob.h>
 
 enum tnt_error {
 	TNT_EOK,