Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- src/share/mk/bsd.lib.mk 1993/10/27 00:58:31 1.34 +++ src/share/mk/bsd.lib.mk 1993/11/02 22:02:12 1.35 @@ -1,10 +1,15 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $Id: bsd.lib.mk,v 1.34 1993/10/27 00:58:31 pk Exp $ +# $Id: bsd.lib.mk,v 1.35 1993/11/02 22:02:12 pk Exp $ .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif +.if exists(${.CURDIR}/shlib_version) +MAJOR != . ${.CURDIR}/shlib_version ; echo $$major +MINOR != . ${.CURDIR}/shlib_version ; echo $$minor +.endif + .MAIN: all # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries @@ -62,6 +67,9 @@ _LIBS=lib${LIB}.a .if !defined(NOPIC) _LIBS+=lib${LIB}_pic.a +.if defined(MAJOR) && defined(MINOR) +_LIBS+=lib${LIB}.so.${MAJOR}.${MINOR} +.endif .endif .if !defined(PICFLAG) @@ -92,6 +100,10 @@ lib${LIB}_pic.a:: ${SOBJS} @${AR} cTq lib${LIB}_pic.a `lorder ${SOBJS} | tsort` ${LDADD} ${RANLIB} lib${LIB}_pic.a +lib${LIB}.so.${MAJOR}.${MINOR}: + @rm -f lib${LIB}.so.${MAJOR}.${MINOR} + $(LD) -Bforcearchive -o lib${LIB}.so.${MAJOR}.${MINOR} lib${LIB}_pic.a + llib-l${LIB}.ln: ${SRCS} ${LINT} -C${LIB} ${CFLAGS} ${.ALLSRC:M*.c} @@ -137,12 +149,9 @@ realinstall: lib${LIB}_pic.a ${DESTDIR}${LIBDIR} ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a .endif -.if !defined(NOPIC) && exists (${.CURDIR}/shlib_version) - . ${.CURDIR}/shlib_version; \ - $(LD) -Bshareable -Bforcearchive -o lib${LIB}.so.$$major.$$minor lib${LIB}_pic.a - . ${.CURDIR}/shlib_version; \ +.if !defined(NOPIC) && defined(MAJOR) && defined(MINOR) install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - lib${LIB}.so.$$major.$$minor ${DESTDIR}${LIBDIR} + lib${LIB}.so.${MAJOR}.${MINOR} ${DESTDIR}${LIBDIR} .endif # install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ # llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR}