Gave libscxi independent version info from libcomedi. Removed

attempt to link to libcomedi when building libscxi.

diff --git a/configure.ac b/configure.ac
index 15da041302e96edc65598b5517a15e13e829dbf6..829be3c119ba12334526374845e66953271a2c0d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,9 @@ AM_INIT_AUTOMAKE([-Wall -Werror])
 #
 # AS_LIBTOOL arguments are (prefix, current, revision, age)
 AS_LIBTOOL(COMEDILIB, 8, 0, 8)
+#libscxi c:r:a
+SCXI_SO_VERSION=8:0:8
+AC_SUBST(SCXI_SO_VERSION)
 
 AM_CONFIG_HEADER(config.h)
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 11b88eadd7c323a21d00393ef090868e7b1ca812..7c137c897f9e430cc7bb3680d159d84ffa90674e 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,7 +22,6 @@ libcomedi_la_LDFLAGS = -soname libcomedi \
         $(COMEDILIB_LT_LDFLAGS) \
         -Wl,--version-script=$(srcdir)/version_script
 
-
 $(srcdir)/calib_yacc.c $(srcdir)/calib_yacc.h: $(srcdir)/calib_yacc.y
        $(YACC) -d -p calib_yy -o $(srcdir)/calib_yacc.c $<
 

diff --git a/scxi/Makefile.am b/scxi/Makefile.am
index 62a48b9dd741e0f13a158d9dcfc7f49afbfb9edb..c75aa67481b5b5c32315ad93387eb58ae0d1aae5 100644 (file)
--- a/scxi/Makefile.am
+++ b/scxi/Makefile.am
@@ -9,5 +9,4 @@ endif
 
 libscxi_la_SOURCES = scxi.c
 libscxi_la_CFLAGS = $(COMEDILIB_CFLAGS) -D_REENTRANT
-libscxi_la_LDFLAGS = -release $(VERSION) -Wl
-libscxi_la_LIBADD = -lcomedi
+libscxi_la_LDFLAGS = -version-info @SCXI_SO_VERSION@