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.20 retrieving revision 1.26 diff -u -p -r1.20 -r1.26 --- src/share/mk/bsd.lib.mk 1993/07/29 22:04:55 1.20 +++ src/share/mk/bsd.lib.mk 1993/08/16 01:41:01 1.26 @@ -1,29 +1,15 @@ -# @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 +# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 +# $Id: bsd.lib.mk,v 1.26 1993/08/16 01:41:01 mycroft Exp $ .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif -LIBDIR?= /usr/lib -LINTLIBDIR?= /usr/libdata/lint -LIBGRP?= bin -LIBOWN?= bin -LIBMODE?= 444 - -STRIP?= -s - -BINGRP?= bin -BINOWN?= bin -BINMODE?= 555 - .MAIN: all # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries .SUFFIXES: -.SUFFIXES: .out .o .po .s .c .cc .C .f .y .l .8 .7 .6 .5 .4 .3 .2 .1 .0 - -.8.0 .7.0 .6.0 .5.0 .4.0 .3.0 .2.0 .1.0: - nroff -mandoc ${.IMPSRC} > ${.TARGET} +.SUFFIXES: .out .o .po .s .c .cc .C .f .y .l .0 .1 .2 .3 .4 .5 .6 .7 .8 .c.o: ${CC} ${CFLAGS} -c ${.IMPSRC} @@ -57,19 +43,15 @@ BINMODE?= 555 @${LD} -X -r ${.TARGET} @mv a.out ${.TARGET} -.if !defined(NOMAN) -MANALL= ${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8} -.endif - .if !defined(NOPROFILE) _LIBS=lib${LIB}.a lib${LIB}_p.a .else _LIBS=lib${LIB}.a .endif -all: ${_LIBS} ${MANALL}# llib-l${LIB}.ln +all: ${_LIBS} # llib-l${LIB}.ln -OBJS+= ${SRCS:R:S/$/.o/g} +OBJS+= ${SRCS:N*.h:R:S/$/.o/g} lib${LIB}.a:: ${OBJS} @echo building standard ${LIB} library @@ -95,27 +77,10 @@ clean: rm -f lib${LIB}.a lib${LIB}_p.a llib-l${LIB}.ln .endif -.if !target(cleandir) -cleandir: - rm -f a.out Errs errs mklog core ${CLEANFILES} - rm -f ${OBJS} - rm -f ${POBJS} profiled/*.o - rm -f lib${LIB}.a lib${LIB}_p.a llib-l${LIB}.ln - rm -f ${MANALL} ${.CURDIR}/tags .depend -.endif +cleandir: clean -.if !target(depend) -depend: .depend -.depend: ${SRCS} - rm -f .depend - files="${.ALLSRC:M*.c}"; \ - if [ "$$files" != "" ]; then \ - mkdep -a ${MKDEP} ${CFLAGS:M-[ID]*} $$files; \ - fi - files="${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cxx}"; \ - if [ "$$files" != " " ]; then \ - mkdep -a ${MKDEP} -+ ${CXXFLAGS:M-[ID]*} $$files; \ - fi +.if defined(SRCS) +afterdepend: @(TMP=/tmp/_depend$$$$; \ sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po:/' < .depend > $$TMP; \ mv $$TMP .depend) @@ -124,14 +89,7 @@ depend: .depend .if !target(install) .if !target(beforeinstall) beforeinstall: - @if [ ! -d "${DESTDIR}${LIBDIR}" ]; then \ - /bin/rm -f ${DESTDIR}${LIBDIR} ; \ - mkdir -p ${DESTDIR}${LIBDIR} ; \ - chown root.wheel ${DESTDIR}${LIBDIR} ; \ - chmod 755 ${DESTDIR}${LIBDIR} ; \ - else \ - true ; \ - fi + @install -d -o root -g wheel -m 755 ${DESTDIR}${LIBDIR} .endif realinstall: @@ -166,42 +124,9 @@ afterinstall: realinstall realinstall: beforeinstall .endif -.if !target(lint) -lint: -.endif - -.if !target(tags) -tags: ${SRCS} - -cd ${.CURDIR}; ctags -f /dev/stdout ${.ALLSRC:M*.c} | \ - sed "s;\${.CURDIR}/;;" > tags -.endif - .if !defined(NOMAN) .include .endif -.if !target(obj) -.if defined(NOOBJ) -obj: -.else -obj: - @cd ${.CURDIR}; rm -f obj > /dev/null 2>&1 || true; \ - here=`pwd`; subdir=`echo $$here | sed 's,^/usr/src/,,'`; \ - if test $$here != $$subdir ; then \ - dest=/usr/obj/$$subdir ; \ - echo "$$here -> $$dest"; ln -s $$dest obj; \ - if test -d /usr/obj -a ! -d $$dest; then \ - mkdir -p $$dest; \ - else \ - true; \ - fi; \ - else \ - true ; \ - dest=$$here/obj ; \ - if test ! -d obj ; then \ - echo "making $$dest" ; \ - mkdir $$dest; \ - fi; \ - fi; -.endif -.endif +.include +.include