From d07ea0c651857e6d33f3c341f5896e27c205a354 Mon Sep 17 00:00:00 2001
From: glenux <glenux@eaee96b3-f302-0410-b096-c6cfd47f7835>
Date: Tue, 10 Jan 2006 12:43:24 +0000
Subject: [PATCH]

---
 Makefile.am                                    |  2 +-
 configure.in                                   | 18 +++++++++++++++---
 lib/Makefile.am                                |  5 +++--
 {lib/test => test}/Makefile.am                 |  0
 {lib/test => test}/client_Echo_udp/Makefile.am |  0
 {lib/test => test}/server_Echo_udp/Makefile.am |  0
 6 files changed, 19 insertions(+), 6 deletions(-)
 rename {lib/test => test}/Makefile.am (100%)
 rename {lib/test => test}/client_Echo_udp/Makefile.am (100%)
 rename {lib/test => test}/server_Echo_udp/Makefile.am (100%)

diff --git a/Makefile.am b/Makefile.am
index d7df6e9..d126126 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src
+SUBDIRS = lib
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = xsock.m4
diff --git a/configure.in b/configure.in
index a3cf379..469b77e 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([xsock],[0.5])
 
 AM_CONFIG_HEADER(config.h)
-AC_CONFIG_SRCDIR([src/XSock.h])
+AC_CONFIG_SRCDIR([lib/xsock.h])
 AC_PROG_INSTALL
 
 AC_ISC_POSIX
@@ -26,10 +26,22 @@ AC_HEADER_STDC([stdio.h stdlib.h string.h unistd.h math.h time.h fcntl.h sys/sta
 
 AC_CHECK_HEADERS([iostream sstream],,AC_MSG_ERROR([You need to have the libstdc++ headers installed]))
 
-
 AM_PROG_LIBTOOL
 
-AC_CONFIG_FILES([Makefile src/Makefile])
+XSOCK_LIB_CURRENT=0
+XSOCK_LIB_REVISION=9
+XSOCK_LIB_AGE=0
+
+AC_SUBST(XSOCK_LIB_CURRENT)
+AC_SUBST(XSOCK_LIB_REVISION)
+AC_SUBST(XSOCK_LIB_AGE)
+
+AC_CONFIG_FILES([
+	Makefile 
+	lib/Makefile
+	xsock.pc
+	])
+	#libvorbis.spec
 AC_OUTPUT
 
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 418cf7b..d5a5b9c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = .
+#SUBDIRS = .
 
 lib_LTLIBRARIES = libXSock.la
 
@@ -19,7 +19,8 @@ libXSock_la_SOURCES += \
 libXSock_la_CFLAGS = -DTRACE -static
 
 libXSock_la_LDFLAGS = \
-	-version-info 0:1:0 -no-undefined
+	-no-undefined \
+	-version-info @XSOCK_LIB_CURRENT@:@XSOCK_LIB_REVISION@:@XSOCK_LIB_AGE@
 
 INCLUDES= \
 	-I../
diff --git a/lib/test/Makefile.am b/test/Makefile.am
similarity index 100%
rename from lib/test/Makefile.am
rename to test/Makefile.am
diff --git a/lib/test/client_Echo_udp/Makefile.am b/test/client_Echo_udp/Makefile.am
similarity index 100%
rename from lib/test/client_Echo_udp/Makefile.am
rename to test/client_Echo_udp/Makefile.am
diff --git a/lib/test/server_Echo_udp/Makefile.am b/test/server_Echo_udp/Makefile.am
similarity index 100%
rename from lib/test/server_Echo_udp/Makefile.am
rename to test/server_Echo_udp/Makefile.am