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.prog.mk,v rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.37 retrieving revision 1.45 diff -u -p -r1.37 -r1.45 --- src/share/mk/bsd.prog.mk 1994/04/06 06:37:38 1.37 +++ src/share/mk/bsd.prog.mk 1994/06/30 06:35:50 1.45 @@ -1,5 +1,5 @@ -# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $Id: bsd.prog.mk,v 1.37 1994/04/06 06:37:38 chopps Exp $ +# $NetBSD: bsd.prog.mk,v 1.45 1994/06/30 06:35:50 cgd Exp $ +# @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" @@ -26,6 +26,7 @@ LIBPC?= /usr/lib/libpc.a LIBPLOT?= /usr/lib/libplot.a LIBRESOLV?= /usr/lib/libresolv.a LIBRPCSVC?= /usr/lib/librpcsvc.a +LIBSKEY?= /usr/lib/libskey.a LIBTERMCAP?= /usr/lib/libtermcap.a LIBUTIL?= /usr/lib/libutil.a @@ -49,10 +50,12 @@ CLEANFILES+=strings @rm -f x.C .endif -.if defined(PROG) -.if defined(SRCS) -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +.if defined(PROG) +SRCS?= ${PROG}.c +.if !empty(SRCS:N*.h:N*.sh) +OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g} +.endif .if defined(LDONLY) @@ -66,17 +69,6 @@ ${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DP .endif -.else - -SRCS= ${PROG}.c - -${PROG}: ${LIBCRT0} ${SRCS} ${LIBC} ${DPADD} - ${CC} ${LDFLAGS} ${LDSTATIC} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} ${LDADD} - -MKDEP= -p - -.endif - .if !defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \ !defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \ !defined(MAN7) && !defined(MAN8) @@ -85,14 +77,14 @@ MAN1= ${PROG}.0 .endif .MAIN: all -all: ${PROG} +all: ${PROG} _SUBDIRUSE .if !target(clean) -clean: +clean: _SUBDIRUSE rm -f a.out [Ee]rrs mklog core *.core ${PROG} ${OBJS} ${CLEANFILES} .endif -cleandir: clean +cleandir: _SUBDIRUSE clean .if !target(install) .if !target(beforeinstall) @@ -109,8 +101,7 @@ realinstall: ${PROG} ${DESTDIR}${BINDIR} .endif .if defined(HIDEGAME) - (cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}; \ - chown games.bin ${PROG}) + (cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}) .endif .endif @@ -134,7 +125,7 @@ realinstall: beforeinstall .endif .if !target(lint) -lint: ${SRCS} +lint: ${SRCS} _SUBDIRUSE .if defined(PROG) @${LINT} ${LINTFLAGS} ${CFLAGS} ${.ALLSRC} | more 2>&1 .endif