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 rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.30 retrieving revision 1.57 diff -u -p -r1.30 -r1.57 --- src/share/mk/bsd.lib.mk 1993/10/07 01:34:07 1.30 +++ src/share/mk/bsd.lib.mk 1995/04/21 20:29:40 1.57 @@ -1,60 +1,71 @@ -# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $Id: bsd.lib.mk,v 1.30 1993/10/07 01:34:07 cgd Exp $ +# $NetBSD: bsd.lib.mk,v 1.57 1995/04/21 20:29:40 jtc Exp $ +# @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif +.include # for 'NOPIC' definition + +.if exists(${.CURDIR}/shlib_version) +SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major +SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor +.endif + .MAIN: all -# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries +# prefer .S to a .c, add .po, remove stuff not used in the BSD libraries # .so used for PIC object files .SUFFIXES: -.SUFFIXES: .out .o .po .so .s .c .cc .C .f .y .l .0 .1 .2 .3 .4 .5 .6 .7 .8 +.SUFFIXES: .out .o .po .so .S .s .c .cc .C .f .y .l .m4 .c.o: - ${CC} ${CFLAGS} -c ${.IMPSRC} + ${COMPILE.c} ${.IMPSRC} @${LD} -x -r ${.TARGET} @mv a.out ${.TARGET} .c.po: - ${CC} -p ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${COMPILE.c} -p ${.IMPSRC} -o ${.TARGET} @${LD} -X -r ${.TARGET} @mv a.out ${.TARGET} .c.so: - ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET} + @${LD} -x -r ${.TARGET} + @mv a.out ${.TARGET} .cc.o .C.o: - ${CXX} ${CXXFLAGS} -c ${.IMPSRC} + ${COMPILE.cc} ${.IMPSRC} @${LD} -x -r ${.TARGET} @mv a.out ${.TARGET} .cc.po .C.po: - ${CXX} -p ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${COMPILE.cc} -p ${.IMPSRC} -o ${.TARGET} @${LD} -X -r ${.TARGET} @mv a.out ${.TARGET} .cc.so .C.so: - ${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} - @${LD} -X -r ${.TARGET} + ${COMPILE.cc} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET} + @${LD} -x -r ${.TARGET} @mv a.out ${.TARGET} -.s.o: - ${CPP} -E ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ +.S.o .s.o: + ${CPP} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ ${AS} -o ${.TARGET} @${LD} -x -r ${.TARGET} @mv a.out ${.TARGET} -.s.po: - ${CPP} -E -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ +.S.po .s.po: + ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ ${AS} -o ${.TARGET} @${LD} -X -r ${.TARGET} @mv a.out ${.TARGET} -.s.so: - ${CPP} -E -DPIC ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ +.S.so .s.so: + ${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ ${AS} -k -o ${.TARGET} + @${LD} -x -r ${.TARGET} + @mv a.out ${.TARGET} .if !defined(NOPROFILE) _LIBS=lib${LIB}.a lib${LIB}_p.a @@ -64,49 +75,59 @@ _LIBS=lib${LIB}.a .if !defined(NOPIC) _LIBS+=lib${LIB}_pic.a +.if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR) +_LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} +.endif .endif .if !defined(PICFLAG) PICFLAG=-fpic .endif -all: ${_LIBS} # llib-l${LIB}.ln +all: ${_LIBS} _SUBDIRUSE # llib-l${LIB}.ln OBJS+= ${SRCS:N*.h:R:S/$/.o/g} lib${LIB}.a:: ${OBJS} @echo building standard ${LIB} library @rm -f lib${LIB}.a - @${AR} cTq lib${LIB}.a `lorder ${OBJS} | tsort` ${LDADD} + @${AR} cq lib${LIB}.a `lorder ${OBJS} | tsort` ${RANLIB} lib${LIB}.a POBJS+= ${OBJS:.o=.po} lib${LIB}_p.a:: ${POBJS} @echo building profiled ${LIB} library @rm -f lib${LIB}_p.a - @${AR} cTq lib${LIB}_p.a `lorder ${POBJS} | tsort` ${LDADD} + @${AR} cq lib${LIB}_p.a `lorder ${POBJS} | tsort` ${RANLIB} lib${LIB}_p.a SOBJS+= ${OBJS:.o=.so} lib${LIB}_pic.a:: ${SOBJS} @echo building shared object ${LIB} library @rm -f lib${LIB}_pic.a - @${AR} cTq lib${LIB}_pic.a `lorder ${SOBJS} | tsort` ${LDADD} + @${AR} cq lib${LIB}_pic.a `lorder ${SOBJS} | tsort` ${RANLIB} lib${LIB}_pic.a +lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}_pic.a ${DPADD} + @echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\) + @rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} + $(LD) -x -Bshareable -Bforcearchive \ + -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} lib${LIB}_pic.a ${LDADD} + llib-l${LIB}.ln: ${SRCS} ${LINT} -C${LIB} ${CFLAGS} ${.ALLSRC:M*.c} .if !target(clean) -clean: - rm -f a.out Errs errs mklog core ${CLEANFILES} +clean: _SUBDIRUSE + rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES} rm -f ${OBJS} rm -f ${POBJS} profiled/*.o rm -f ${SOBJS} shared/*.o rm -f lib${LIB}.a lib${LIB}_p.a lib${LIB}_pic.a llib-l${LIB}.ln + rm -f lib${LIB}.so.*.* .endif -cleandir: clean +cleandir: _SUBDIRUSE clean .if defined(SRCS) afterdepend: @@ -118,19 +139,31 @@ afterdepend: .if !target(install) .if !target(beforeinstall) beforeinstall: - @install -d -o root -g wheel -m 755 ${DESTDIR}${LIBDIR} .endif realinstall: # ranlib lib${LIB}.a - install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} lib${LIB}.a \ + install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 lib${LIB}.a \ ${DESTDIR}${LIBDIR} ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}.a + chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}.a .if !defined(NOPROFILE) # ranlib lib${LIB}_p.a - install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \ lib${LIB}_p.a ${DESTDIR}${LIBDIR} ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_p.a + chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_p.a +.endif +.if !defined(NOPIC) +# ranlib lib${LIB}_pic.a + install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \ + lib${LIB}_pic.a ${DESTDIR}${LIBDIR} + ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a + chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a +.endif +.if !defined(NOPIC) && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR) + install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR} .endif # install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ # llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR} @@ -147,7 +180,7 @@ realinstall: done; true .endif -install: maninstall +install: maninstall _SUBDIRUSE maninstall: afterinstall afterinstall: realinstall realinstall: beforeinstall @@ -157,5 +190,10 @@ realinstall: beforeinstall .include .endif +.if !defined(NONLS) +.include +.endif + .include .include +.include