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.94 retrieving revision 1.98 diff -u -p -r1.94 -r1.98 --- src/share/mk/bsd.lib.mk 1997/05/06 20:54:35 1.94 +++ src/share/mk/bsd.lib.mk 1997/05/07 17:06:22 1.98 @@ -1,14 +1,16 @@ -# $NetBSD: bsd.lib.mk,v 1.94 1997/05/06 20:54:35 mycroft Exp $ +# $NetBSD: bsd.lib.mk,v 1.98 1997/05/07 17:06:22 mycroft Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif -.MAIN: all -.PHONY: cleanlib afterdepend beforeinstall libinstall afterinstall +.include -.include # for 'NOPIC' definition +.MAIN: all +.PHONY: cleanlib libinstall +install: libinstall +clean cleandir: cleanlib .if exists(${.CURDIR}/shlib_version) SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major @@ -153,7 +155,7 @@ _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHL _LIBS+=llib-l${LIB}.ln .endif -all: ${_LIBS} _SUBDIRUSE +all: ${_LIBS} OBJS+= ${SRCS:N*.h:R:S/$/.o/g} @@ -200,7 +202,6 @@ llib-l${LIB}.ln: ${LOBJS} @rm -f llib-l${LIB}.ln @${LINT} -C${LIB} ${LOBJS} ${LLIBS} -.if !target(clean) cleanlib: rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES} rm -f lib${LIB}.a ${OBJS} @@ -208,12 +209,6 @@ cleanlib: rm -f lib${LIB}_pic.a lib${LIB}.so.*.* ${SOBJS} rm -f llib-l${LIB}.ln ${LOBJS} -clean: _SUBDIRUSE cleanlib -cleandir: _SUBDIRUSE cleanlib -.else -cleandir: _SUBDIRUSE clean -.endif - .if defined(SRCS) afterdepend: .depend @(TMP=/tmp/_depend$$$$; \ @@ -222,11 +217,7 @@ afterdepend: .depend mv $$TMP .depend) .endif -.if !target(install) -.if !target(beforeinstall) -beforeinstall: -.endif - +.if !target(libinstall) libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.a .if !defined(UPDATE) .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.a @@ -235,6 +226,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/lib${LI ${DESTDIR}${LIBDIR}/lib${LIB}.a: .MADE .endif +.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.a ${DESTDIR}${LIBDIR}/lib${LIB}.a: lib${LIB}.a __archiveinstall .if !defined(NOPROFILE) @@ -246,6 +238,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/lib${LI ${DESTDIR}${LIBDIR}/lib${LIB}_p.a: .MADE .endif +.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a ${DESTDIR}${LIBDIR}/lib${LIB}_p.a: lib${LIB}_p.a __archiveinstall .endif @@ -258,6 +251,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/lib${LI ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: .MADE .endif +.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: lib${LIB}_pic.a __archiveinstall .endif @@ -270,6 +264,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/lib${LI ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: .MADE .endif +.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${.ALLSRC} \ ${.TARGET} @@ -292,18 +287,11 @@ libinstall:: ${DESTDIR}${LINTLIBDIR}/lli ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: .MADE .endif -${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln llib-l${LIB}.ln +.PRECIOUS: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln +${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: llib-l${LIB}.ln ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR} .endif - -libinstall:: linksinstall -realinstall: libinstall filesinstall - -install: ${MANINSTALL} _SUBDIRUSE -${MANINSTALL}: afterinstall -afterinstall: realinstall -realinstall: beforeinstall .endif .if !defined(NOMAN)