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.30 retrieving revision 1.64 diff -u -p -r1.30 -r1.64 --- src/share/mk/bsd.prog.mk 1993/10/07 01:35:30 1.30 +++ src/share/mk/bsd.prog.mk 1997/03/27 09:10:10 1.64 @@ -1,33 +1,45 @@ -# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $Id: bsd.prog.mk,v 1.30 1993/10/07 01:35:30 cgd Exp $ +# $NetBSD: bsd.prog.mk,v 1.64 1997/03/27 09:10:10 mycroft Exp $ +# @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif +.include + .SUFFIXES: .out .o .c .cc .C .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0 CFLAGS+= ${COPTS} -LIBCRT0?= /usr/lib/crt0.o -LIBC?= /usr/lib/libc.a -LIBCOMPAT?= /usr/lib/libcompat.a -LIBCRYPT?= /usr/lib/libcrypt.a -LIBCURSES?= /usr/lib/libcurses.a -LIBDBM?= /usr/lib/libdbm.a -LIBDES?= /usr/lib/libdes.a -LIBL?= /usr/lib/libl.a -LIBKDB?= /usr/lib/libkdb.a -LIBKRB?= /usr/lib/libkrb.a -LIBM?= /usr/lib/libm.a -LIBMP?= /usr/lib/libmp.a -LIBPC?= /usr/lib/libpc.a -LIBPLOT?= /usr/lib/libplot.a -LIBRESOLV?= /usr/lib/libresolv.a -LIBRPC?= /usr/lib/librpc.a -LIBRPCSVC?= /usr/lib/librpcsvc.a -LIBTERM?= /usr/lib/libterm.a -LIBUTIL?= /usr/lib/libutil.a +LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o +LIBC?= ${DESTDIR}/usr/lib/libc.a +LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a +LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a +LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a +LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a +LIBDBM?= ${DESTDIR}/usr/lib/libdbm.a +LIBDES?= ${DESTDIR}/usr/lib/libdes.a +LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a +LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a +LIBGNUMALLOC?= ${DESTDIR}/usr/lib/libgnumalloc.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 +LIBPC?= ${DESTDIR}/usr/lib/libpc.a +LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a +LIBPLOT?= ${DESTDIR}/usr/lib/libplot.a +LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a +LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a +LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a +LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a +LIBTELNET?= ${DESTDIR}/usr/lib/libtelnet.a +LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a +LIBWRAP?= ${DESTDIR}/usr/lib/libwrap.a +LIBY?= ${DESTDIR}/usr/lib/liby.a +LIBZ?= ${DESTDIR}/usr/lib/libz.a .if defined(SHAREDSTRINGS) CLEANFILES+=strings @@ -49,97 +61,149 @@ CLEANFILES+=strings @rm -f x.C .endif -.if defined(PROG) -.if defined(SRCS) - -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} - -.if defined(LDONLY) -${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD} - ${LD} ${LDFLAGS} -o ${.TARGET} ${LIBCRT0} ${OBJS} ${LIBC} ${LDADD} +.if defined(PROG) +SRCS?= ${PROG}.c +.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} +.endif -.else defined(LDONLY) +.if defined(OBJS) && !empty(OBJS) +.if defined(DESTDIR) ${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD} - ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} - -.endif + ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib ${LIBCRT0} ${OBJS} ${LDADD} -lgcc -lc -lgcc .else -SRCS= ${PROG}.c - -${PROG}: ${SRCS} ${LIBC} ${DPADD} - ${CC} ${LDFLAGS} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} ${LDADD} +${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD} + ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} -MKDEP= -p +.endif # defined(DESTDIR) +.endif # defined(OBJS) && !empty(OBJS) -.endif - -.if !defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \ - !defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \ - !defined(MAN7) && !defined(MAN8) -MAN1= ${PROG}.0 -.endif -.endif +.if !defined(MAN) +MAN= ${PROG}.1 +.endif # !defined(MAN) +.endif # defined(PROG) .MAIN: all -all: ${PROG} +all: ${PROG} _SUBDIRUSE .if !target(clean) -clean: - rm -f a.out [Ee]rrs mklog core ${PROG} ${OBJS} ${CLEANFILES} +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 -cleandir: clean +.if defined(SRCS) +afterdepend: .depend + @(TMP=/tmp/_depend$$$$; \ + sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.ln:/' \ + < .depend > $$TMP; \ + mv $$TMP .depend) +.endif .if !target(install) .if !target(beforeinstall) beforeinstall: -.if defined(DESTDIR) || defined(BINDIR) - @install -d -o root -g wheel -m 755 ${DESTDIR}${BINDIR} -.endif .endif .if !target(afterinstall) afterinstall: .endif .if !target(realinstall) -realinstall: + .if defined(PROG) - install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${PROG} ${DESTDIR}${BINDIR} +PROGNAME?= ${PROG} +proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME} +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${BINDIR}/${PROGNAME} +.endif +.if !defined(BUILD) +${DESTDIR}${BINDIR}/${PROGNAME}: .MADE +.endif + +${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 +.endif + +${DESTDIR}${FILESDIR_${F}}/${FILESNAME_${F}}: ${F} + ${INSTALL} ${COPY} -o ${FILESOWN_${F}} -g ${FILESGRP_${F}} \ + -m ${FILESMODE_${F}} ${.ALLSRC} ${.TARGET} +.endfor +.endif + +.if defined(SCRIPTS) +.for S in ${SCRIPTS} +.if defined(SCRIPTSNAME) +SCRIPTSNAME_${S} ?= ${SCRIPTSNAME} +.else +SCRIPTSNAME_${S} ?= ${S:T:R} +.endif +proginstall:: ${DESTDIR}${BINDIR}/${SCRIPTSNAME_${S}} +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${BINDIR}/${SCRIPTSNAME_${S}} .endif -.if defined(HIDEGAME) - (cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}; \ - chown games.bin ${PROG}) +.if !defined(BUILD) +${DESTDIR}${BINDIR}/${SCRIPTSNAME_${S}}: .MADE .endif + +${DESTDIR}${BINDIR}/${SCRIPTSNAME_${S}}: ${S} + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${.ALLSRC} ${.TARGET} +.endfor .endif -install: maninstall _SUBDIRUSE -.if defined(LINKS) && !empty(LINKS) - @set ${LINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - echo $$t -\> $$l; \ - rm -f $$t; \ - ln $$l $$t; \ - done; true +.if target(proginstall) +realinstall: proginstall +.else +realinstall: .endif +.endif + +install: ${MANINSTALL} _SUBDIRUSE linksinstall -maninstall: afterinstall +${MANINSTALL}: afterinstall afterinstall: realinstall realinstall: beforeinstall .endif .if !target(lint) -lint: ${SRCS} -.if defined(PROG) - @${LINT} ${LINTFLAGS} ${CFLAGS} ${.ALLSRC} | more 2>&1 +lint: ${LOBJS} +.if defined(LOBJS) && !empty(LOBJS) + @${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD} .endif .endif @@ -147,6 +211,13 @@ lint: ${SRCS} .include .endif +.if !defined(NONLS) +.include +.endif + .include +.include +.include .include .include +.include