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.79 retrieving revision 1.84 diff -u -p -r1.79 -r1.84 --- src/share/mk/bsd.prog.mk 1997/05/09 07:56:03 1.79 +++ src/share/mk/bsd.prog.mk 1997/05/18 20:21:54 1.84 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.79 1997/05/09 07:56:03 mycroft Exp $ +# $NetBSD: bsd.prog.mk,v 1.84 1997/05/18 20:21:54 kleink Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .if exists(${.CURDIR}/../Makefile.inc) @@ -9,11 +9,9 @@ .MAIN: all .PHONY: cleanprog proginstall scriptsinstall -install: proginstall scriptsinstall +realinstall: proginstall scriptsinstall clean cleandir: cleanprog -.SUFFIXES: .out .o .c .cc .C .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0 - CFLAGS+= ${COPTS} # ELF platforms depend on crtbegin.o and crtend.o @@ -47,6 +45,7 @@ LIBNTP?= ${DESTDIR}/usr/lib/libntp.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 @@ -79,22 +78,26 @@ 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 !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} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +${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} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} .endif # defined(DESTDIR) @@ -105,7 +108,7 @@ MAN= ${PROG}.1 .endif # !defined(MAN) .endif # defined(PROG) -all: ${SRCS} ${PROG} +all: ${PROG} cleanprog: rm -f a.out [Ee]rrs mklog core *.core \ @@ -188,9 +191,9 @@ lint: ${LOBJS} .endif .include -.include .include .include +.include .include .include .include