versioning fixes

diff --git a/Makefile b/Makefile
index 6c6f88307235f63fed703ae4a4a759e422ea3d4b..14bff328d280cae58e481f4eaa62cd959b3dab63 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,8 @@
 
 .EXPORT_ALL_VARIABLES:
 
-VERSION = 0
-SUBVERSION = 7
-SUBSUBVERSION = 10
-
-VERSION_CODE = ${VERSION}.${SUBVERSION}.${SUBSUBVERSION}
+include version
+MAJOR=0
 
 CFLAGS = -Wall -O2
 
@@ -29,9 +26,9 @@ install:      dummy
        install -d ${INSTALLDIR}/include
        (cd include;install -m 644 comedilib.h ${INSTALLDIR}/include)
        (cd include;install -m 644 comedi.h ${INSTALLDIR}/include)
-       install lib/libcomedi.so.${VERSION_CODE} ${INSTALLDIR_LIB}
-       (cd $(INSTALLDIR_LIB);ln -s libcomedi.so.${VERSION_CODE} libcomedi.so.${VERSION})
-       (cd $(INSTALLDIR_LIB);ln -s libcomedi.so.${VERSION_CODE} libcomedi.so)
+       install lib/libcomedi.so.${MAJOR} ${INSTALLDIR_LIB}
+       (cd $(INSTALLDIR_LIB);ln -s libcomedi.so.${version} libcomedi.so.${MAJOR})
+       (cd $(INSTALLDIR_LIB);ln -s libcomedi.so.${version} libcomedi.so)
        install -m 644 lib/libcomedi.a ${INSTALLDIR_LIB}
        #/sbin/ldconfig -n ${INSTALLDIR}/lib
        install -d ${INSTALLDIR_DOC}

diff --git a/debian/rules b/debian/rules
index 8b15fbbbf7f11d27b6198bfd2298c3bc36a64223..718c3e842b2d60304c17091c9b329d8af1886657 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,8 @@
 export DH_COMPAT=1
 
 # shared library versions, option 1
-version=0.7.8
+include version
+#version=0.7.8
 major=0
 # option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
 #version=`ls lib/lib*.so.* | \

diff --git a/lib/Makefile b/lib/Makefile
index a326197533216dcdf84169067744d20a41183d41..6ffbdbf8b910a29ca874df7147d71b99b7ec6f5e 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,10 +6,10 @@ OBJS=comedi.o timer.o sv.o range.o ioctl.o filler.o timed.o error.o \
 
 libcomedi.a: $(OBJS)
        #gcc -shared -Wl,-soname,libcomedi.so,-T,version_script -o libcomedi.so.${VERSION_CODE} $(OBJS) -lm
-       gcc -shared -Wl,-soname,libcomedi.so.0 -o libcomedi.so.${VERSION_CODE} $(OBJS) -lm
+       gcc -shared -Wl,-soname,libcomedi.so.0 -o libcomedi.so.${version} $(OBJS) -lm
        ar rs libcomedi.a $(OBJS)
-       ln -sf libcomedi.so.${VERSION_CODE} libcomedi.so
-       ln -sf libcomedi.so.${VERSION_CODE} libcomedi.so.0
+       ln -sf libcomedi.so.${version} libcomedi.so
+       ln -sf libcomedi.so.${version} libcomedi.so.0
 
 clean:
        rm -f libcomedi.a libcomedi.so* *.o