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.88.2.2 retrieving revision 1.96 diff -u -p -r1.88.2.2 -r1.96 --- src/share/mk/bsd.prog.mk 1998/11/09 08:01:10 1.88.2.2 +++ src/share/mk/bsd.prog.mk 1998/09/28 08:13:39 1.96 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.88.2.2 1998/11/09 08:01:10 cgd Exp $ +# $NetBSD: bsd.prog.mk,v 1.96 1998/09/28 08:13:39 christos Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .if !target(__initialized__) @@ -13,12 +13,13 @@ __initialized__: .PHONY: cleanprog proginstall scriptsinstall realinstall: proginstall scriptsinstall -clean cleandir: cleanprog +clean cleandir distclean: cleanprog CFLAGS+= ${COPTS} # ELF platforms depend on crtbegin.o and crtend.o -.if (${OBJECT_FMT} == "ELF") +.if (${MACHINE_ARCH} == "alpha") || \ + (${MACHINE_ARCH} == "powerpc") LIBCRTBEGIN?= ${DESTDIR}/usr/lib/crtbegin.o LIBCRTEND?= ${DESTDIR}/usr/lib/crtend.o .else @@ -27,7 +28,9 @@ LIBCRTEND?= .endif LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o + LIBBFD?= ${DESTDIR}/usr/lib/libbfd.a +LIBBZ2?= ${DESTDIR}/usr/lib/libbz2.a LIBC?= ${DESTDIR}/usr/lib/libc.a LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a @@ -86,6 +89,9 @@ SRCS?= ${PROG}.c DPSRCS+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} CLEANFILES+= ${DPSRCS} +.if defined(YHEADER) +CLEANFILES+= ${SRCS:M*.y:.y=.h} +.endif .if !empty(SRCS:N*.h:N*.sh) OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g} @@ -138,7 +144,7 @@ ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE .PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME} ${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} - ${INSTALL} ${COPY} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} \ + ${INSTALL} ${PRESERVE} ${COPY} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} \ -m ${BINMODE} ${.ALLSRC} ${.TARGET} .endif @@ -172,8 +178,8 @@ ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNA .PRECIOUS: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}} ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}: ${S} - ${INSTALL} ${COPY} -o ${SCRIPTSOWN_${S}} -g ${SCRIPTSGRP_${S}} \ - -m ${SCRIPTSMODE_${S}} ${.ALLSRC} ${.TARGET} + ${INSTALL} ${PRESERVE} ${COPY} -o ${SCRIPTSOWN_${S}} -g \ + ${SCRIPTSGRP_${S}} -m ${SCRIPTSMODE_${S}} ${.ALLSRC} ${.TARGET} .endfor .endif