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.65 retrieving revision 1.102 diff -u -p -r1.65 -r1.102 --- src/share/mk/bsd.prog.mk 1997/03/27 11:05:32 1.65 +++ src/share/mk/bsd.prog.mk 1999/08/21 06:17:46 1.102 @@ -1,17 +1,34 @@ -# $NetBSD: bsd.prog.mk,v 1.65 1997/03/27 11:05:32 mycroft Exp $ -# @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 +# $NetBSD: bsd.prog.mk,v 1.102 1999/08/21 06:17:46 simonb Exp $ +# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 +.if !target(__initialized__) +__initialized__: .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif - .include +.include +.MAIN: all +.endif -.SUFFIXES: .out .o .c .cc .C .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0 +.PHONY: cleanprog proginstall scriptsinstall +realinstall: proginstall scriptsinstall +clean cleandir distclean: cleanprog CFLAGS+= ${COPTS} +# ELF platforms depend on crtbegin.o and crtend.o +.if ${OBJECT_FMT} == "ELF" +LIBCRTBEGIN?= ${DESTDIR}/usr/lib/crtbegin.o +LIBCRTEND?= ${DESTDIR}/usr/lib/crtend.o +.else +LIBCRTBEGIN?= +LIBCRTEND?= +.endif + LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o + +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 @@ -22,15 +39,19 @@ LIBDES?= ${DESTDIR}/usr/lib/libdes.a LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a LIBGNUMALLOC?= ${DESTDIR}/usr/lib/libgnumalloc.a +LIBIPSEC?= ${DESTDIR}/usr/lib/libipsec.a LIBKDB?= ${DESTDIR}/usr/lib/libkdb.a LIBKRB?= ${DESTDIR}/usr/lib/libkrb.a LIBKVM?= ${DESTDIR}/usr/lib/libkvm.a LIBL?= ${DESTDIR}/usr/lib/libl.a LIBM?= ${DESTDIR}/usr/lib/libm.a LIBMP?= ${DESTDIR}/usr/lib/libmp.a +LIBNTP?= ${DESTDIR}/usr/lib/libntp.a +LIBOBJC?= ${DESTDIR}/usr/lib/libobjc.a LIBPC?= ${DESTDIR}/usr/lib/libpc.a LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a LIBPLOT?= ${DESTDIR}/usr/lib/libplot.a +LIBPOSIX?= ${DESTDIR}/usr/lib/libposix.a LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a @@ -63,45 +84,45 @@ CLEANFILES+=strings .if defined(PROG) -SRCS?= ${PROG}.c +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} -LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} +OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g} +LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} .endif .if defined(OBJS) && !empty(OBJS) +.NOPATH: ${OBJS} .if defined(DESTDIR) -${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD} - ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib ${LIBCRT0} ${OBJS} ${LDADD} -lgcc -lc -lgcc +${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} + ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -lgcc -lc -lgcc ${LIBCRTEND} .else -${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD} +${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} .endif # defined(DESTDIR) .endif # defined(OBJS) && !empty(OBJS) -.if !defined(MAN) +.if !defined(MAN) MAN= ${PROG}.1 .endif # !defined(MAN) .endif # defined(PROG) -.MAIN: all -all: ${PROG} _SUBDIRUSE +all: ${PROG} -.if !target(clean) cleanprog: rm -f a.out [Ee]rrs mklog core *.core \ ${PROG} ${OBJS} ${LOBJS} ${CLEANFILES} -clean: _SUBDIRUSE cleanprog -cleandir: _SUBDIRUSE cleanprog -.else -cleandir: _SUBDIRUSE clean -.endif - .if defined(SRCS) afterdepend: .depend @(TMP=/tmp/_depend$$$$; \ @@ -110,17 +131,7 @@ afterdepend: .depend mv $$TMP .depend) .endif -.if !target(install) -.if !target(beforeinstall) -beforeinstall: -.endif -.if !target(afterinstall) -afterinstall: -.endif - -.if !target(realinstall) - -.if defined(PROG) +.if defined(PROG) && !target(proginstall) PROGNAME?= ${PROG} proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME} .if !defined(UPDATE) @@ -130,42 +141,17 @@ proginstall:: ${DESTDIR}${BINDIR}/${PROG ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE .endif +.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME} ${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} - ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.ALLSRC} ${.TARGET} -.endif - -.if defined(FILES) -FILESDIR?=${BINDIR} -FILESOWN?=${BINOWN} -FILESGRP?=${BINGRP} -FILESMODE?=${NONBINMODE} -.for F in ${FILES} -FILESDIR_${F}?=${FILESDIR} -FILESOWN_${F}?=${FILESOWN} -FILESGRP_${F}?=${FILESGRP} -FILESMODE_${F}?=${FILESMODE} -.if defined(FILESNAME) -FILESNAME_${F} ?= ${FILESNAME} -.else -FILESNAME_${F} ?= ${F:T} -.endif -FILESDIR_${F} ?= ${FILESDIR} -proginstall:: ${DESTDIR}${FILESDIR_${F}}/${FILESNAME_${F}} -.if !defined(UPDATE) -.PHONY: ${DESTDIR}${FILESDIR_${F}}/${FILESNAME_${F}} -.endif -.if !defined(BUILD) -${DESTDIR}${FILESDIR_${F}}/${FILESNAME_${F}}: .MADE + ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \ + -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${.ALLSRC} ${.TARGET} .endif -${DESTDIR}${FILESDIR_${F}}/${FILESNAME_${F}}: ${F} - ${INSTALL} ${COPY} -o ${FILESOWN_${F}} -g ${FILESGRP_${F}} \ - -m ${FILESMODE_${F}} ${.ALLSRC} ${.TARGET} -.endfor +.if !target(proginstall) +proginstall:: .endif -.if defined(SCRIPTS) +.if defined(SCRIPTS) && !target(scriptsinstall) SCRIPTSDIR?=${BINDIR} SCRIPTSOWN?=${BINOWN} SCRIPTSGRP?=${BINGRP} @@ -181,7 +167,7 @@ SCRIPTSNAME_${S} ?= ${SCRIPTSNAME} SCRIPTSNAME_${S} ?= ${S:T:R} .endif SCRIPTSDIR_${S} ?= ${SCRIPTSDIR} -proginstall:: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}} +scriptsinstall:: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}} .if !defined(UPDATE) .PHONY: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}} .endif @@ -189,44 +175,30 @@ proginstall:: ${DESTDIR}${SCRIPTSDIR_${S ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}: .MADE .endif +.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} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \ + -o ${SCRIPTSOWN_${S}} -g ${SCRIPTSGRP_${S}} -m ${SCRIPTSMODE_${S}} \ + ${.ALLSRC} ${.TARGET} .endfor .endif -.if target(proginstall) -realinstall: proginstall -.else -realinstall: -.endif +.if !target(scriptsinstall) +scriptsinstall:: .endif -install: ${MANINSTALL} _SUBDIRUSE linksinstall - -${MANINSTALL}: afterinstall -afterinstall: realinstall -realinstall: beforeinstall -.endif - -.if !target(lint) lint: ${LOBJS} .if defined(LOBJS) && !empty(LOBJS) - @${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD} -.endif + ${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD} .endif -.if !defined(NOMAN) .include -.endif - -.if !defined(NONLS) .include -.endif - -.include -.include +.include .include +.include .include -.include .include + +# Make sure all of the standard targets are defined, even if they do nothing. +regress: