From ba5c37630ea2137f9f87402146f2872de00fb395 Mon Sep 17 00:00:00 2001
From: Alexander Vdolainen <vdo@askele.com>
Date: Thu, 22 Oct 2015 05:04:00 +0300
Subject: [PATCH] renaming in lib, initial, some better naming;

---
 Makefile.am                          |  6 +++---
 configure.ac                         |  4 ++--
 lib/Makefile.am                      | 20 ++++++++++----------
 lib/{chansx.c => channel.c}          |  0
 lib/{libsntl.pc.in => libsxmp.pc.in} |  6 +++---
 lib/{connex.c => link.c}             |  0
 lib/{messagesx.c => message.c}       |  0
 lib/{rpclist.c => rpc.c}             |  0
 lib/{sntllv2.c => sxmplv2.c}         |  0
 9 files changed, 18 insertions(+), 18 deletions(-)
 rename lib/{chansx.c => channel.c} (100%)
 rename lib/{libsntl.pc.in => libsxmp.pc.in} (62%)
 rename lib/{connex.c => link.c} (100%)
 rename lib/{messagesx.c => message.c} (100%)
 rename lib/{rpclist.c => rpc.c} (100%)
 rename lib/{sntllv2.c => sxmplv2.c} (100%)

diff --git a/Makefile.am b/Makefile.am
index 82a0896..38d595d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ endif
 
 SUBDIRS = include lib man $(EXAMPLES) $(TESTS)
 
-libsntldocdir = ${prefix}/doc/libsntl
+libsxmpdocdir = ${prefix}/doc/libsxmp
 libsntldoc_DATA = \
 	README\
 	COPYING\
@@ -23,11 +23,11 @@ libsntldoc_DATA = \
 	INSTALL\
 	NEWS
 
-EXTRA_DIST = $(libsntldoc_DATA)
+EXTRA_DIST = $(libsxmpdoc_DATA)
 
 clean-local:
 
 
 # Remove doc directory on uninstall
 uninstall-local:
-	-rm -r $(libsntldocdir)
+	-rm -r $(libsxmpdocdir)
diff --git a/configure.ac b/configure.ac
index f4e6297..8b85839 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(libsntl, 0.3.0)
+AC_INIT(libsxmp, 0.4.0)
 
 AC_CONFIG_HEADERS([config.h])
 
@@ -48,7 +48,7 @@ AM_CONDITIONAL(BUILD_WIN32, test "x$enable_win32_build" = "xyes")
 
 AC_OUTPUT([
 Makefile
-lib/libsntl.pc
+lib/libsxmp.pc
 lib/Makefile
 include/Makefile
 man/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4f20f19..febba3d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,31 +4,31 @@ AM_CPPFLAGS = \
 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
-	$(LIBSNTL_CFLAGS) -I../include 
+	$(LIBSXMP_CFLAGS) -I../include 
 
 AM_CFLAGS =\
 	 -Wall\
 	 -g
 
-lib_LTLIBRARIES = libsntl.la
+lib_LTLIBRARIES = libsxmp.la
 
 
-libsntl_la_SOURCES = \
-	connex.c sntllv2.c chansx.c messagesx.c rpclist.c uuid.c
+libsxmp_la_SOURCES = \
+	sxmplv2.c link.c channel.c message.c rpc.c uuid.c
 
-libsntl_la_LDFLAGS = 
+libsxmp_la_LDFLAGS = 
 
-libsntl_la_LIBADD = -lpthread -lcrypto $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) 
+libsxmp_la_LIBADD = -lpthread -lcrypto $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) 
 
 if BUILD_WIN32
-libsntl_la_LIBADD += -luuid
+libsxmp_la_LIBADD += -luuid
 else
-libsntl_la_LIBADD += $(LIBUUID_LIBS)
+libsxmp_la_LIBADD += $(LIBUUID_LIBS)
 endif !BUILD_WIN32
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libsntl.pc
+pkgconfig_DATA = libsxmp.pc
 
 EXTRA_DIST = \
-	libsntl.pc.in
+	libsxmp.pc.in
 
diff --git a/lib/chansx.c b/lib/channel.c
similarity index 100%
rename from lib/chansx.c
rename to lib/channel.c
diff --git a/lib/libsntl.pc.in b/lib/libsxmp.pc.in
similarity index 62%
rename from lib/libsntl.pc.in
rename to lib/libsxmp.pc.in
index cd463bb..5df54c4 100644
--- a/lib/libsntl.pc.in
+++ b/lib/libsxmp.pc.in
@@ -5,9 +5,9 @@ datarootdir=@datarootdir@
 datadir=@datadir@
 includedir=@includedir@
 
-Name: libsntllv2
-Description: Secure Network Transport Layer library implementation
+Name: libsxmp
+Description: Secure X Message Passing library
 Version: @VERSION@
 Requires: 
-Libs: -L${libdir} -lsntl
+Libs: -L${libdir} -lsxmp
 Cflags: -I${includedir}
diff --git a/lib/connex.c b/lib/link.c
similarity index 100%
rename from lib/connex.c
rename to lib/link.c
diff --git a/lib/messagesx.c b/lib/message.c
similarity index 100%
rename from lib/messagesx.c
rename to lib/message.c
diff --git a/lib/rpclist.c b/lib/rpc.c
similarity index 100%
rename from lib/rpclist.c
rename to lib/rpc.c
diff --git a/lib/sntllv2.c b/lib/sxmplv2.c
similarity index 100%
rename from lib/sntllv2.c
rename to lib/sxmplv2.c