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.43 retrieving revision 1.75 diff -u -p -r1.43 -r1.75 --- src/share/mk/bsd.prog.mk 1994/06/30 05:21:32 1.43 +++ src/share/mk/bsd.prog.mk 1997/05/07 17:06:28 1.75 @@ -1,34 +1,61 @@ -# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $Id: bsd.prog.mk,v 1.43 1994/06/30 05:21:32 cgd Exp $ +# $NetBSD: bsd.prog.mk,v 1.75 1997/05/07 17:06:28 mycroft Exp $ +# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif +.include + +.MAIN: all +.PHONY: cleanprog proginstall scriptsinstall +install: 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} -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 -LIBKVM?= /usr/lib/libkvm.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 -LIBRPCSVC?= /usr/lib/librpcsvc.a -LIBSKEY?= /usr/lib/libskey.a -LIBTERMCAP?= /usr/lib/libtermcap.a -LIBUTIL?= /usr/lib/libutil.a +# ELF platforms depend on crtbegin.o and crtend.o +.if (${MACHINE_ARCH} == "alpha") || \ + (${MACHINE_ARCH} == "powerpc") +LIBCRTBEGIN?= ${DESTDIR}/usr/lib/crtbegin.o +LIBCRTEND?= ${DESTDIR}/usr/lib/crtend.o +.else +LIBCRTBEGIN?= +LIBCRTEND?= +.endif + +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 +LIBNTP?= ${DESTDIR}/usr/lib/libntp.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 @@ -53,79 +80,103 @@ CLEANFILES+=strings .if defined(PROG) SRCS?= ${PROG}.c -OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g} +.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 -.if defined(LDONLY) +.if defined(OBJS) && !empty(OBJS) +.if defined(DESTDIR) -${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD} - ${LD} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${LIBCRT0} ${OBJS} ${LIBC} ${LDADD} +${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} + ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -lgcc -lc -lgcc ${LIBCRTEND} -.else defined(LDONLY) +.else -${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD} +${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} -.endif +.endif # defined(DESTDIR) +.endif # defined(OBJS) && !empty(OBJS) -.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} _SUBDIRUSE +all: ${PROG} -.if !target(clean) -clean: _SUBDIRUSE - rm -f a.out [Ee]rrs mklog core *.core ${PROG} ${OBJS} ${CLEANFILES} +cleanprog: + rm -f a.out [Ee]rrs mklog core *.core \ + ${PROG} ${OBJS} ${LOBJS} ${CLEANFILES} + +.if defined(SRCS) +afterdepend: .depend + @(TMP=/tmp/_depend$$$$; \ + sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.ln:/' \ + < .depend > $$TMP; \ + mv $$TMP .depend) .endif -cleandir: _SUBDIRUSE clean +.if defined(PROG) && !target(proginstall) +PROGNAME?= ${PROG} +proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME} +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${BINDIR}/${PROGNAME} +.endif +.if !defined(BUILD) +${DESTDIR}${BINDIR}/${PROGNAME}: .MADE +.endif -.if !target(install) -.if !target(beforeinstall) -beforeinstall: +.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME} +${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} + ${INSTALL} ${COPY} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} \ + -m ${BINMODE} ${.ALLSRC} ${.TARGET} .endif -.if !target(afterinstall) -afterinstall: + +.if !target(proginstall) +proginstall:: .endif -.if !target(realinstall) -realinstall: -.if defined(PROG) - install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${PROG} ${DESTDIR}${BINDIR} +.if defined(SCRIPTS) && !target(scriptsinstall) +SCRIPTSDIR?=${BINDIR} +SCRIPTSOWN?=${BINOWN} +SCRIPTSGRP?=${BINGRP} +SCRIPTSMODE?=${BINMODE} +.for S in ${SCRIPTS} +SCRIPTSDIR_${S}?=${SCRIPTSDIR} +SCRIPTSOWN_${S}?=${SCRIPTSOWN} +SCRIPTSGRP_${S}?=${SCRIPTSGRP} +SCRIPTSMODE_${S}?=${SCRIPTSMODE} +.if defined(SCRIPTSNAME) +SCRIPTSNAME_${S} ?= ${SCRIPTSNAME} +.else +SCRIPTSNAME_${S} ?= ${S:T:R} +.endif +SCRIPTSDIR_${S} ?= ${SCRIPTSDIR} +scriptsinstall:: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}} +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}} .endif -.if defined(HIDEGAME) - (cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}) +.if !defined(BUILD) +${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} +.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 -.endif - -maninstall: afterinstall -afterinstall: realinstall -realinstall: beforeinstall +.if !target(scriptsinstall) +scriptsinstall:: .endif .if !target(lint) -lint: ${SRCS} _SUBDIRUSE -.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 @@ -133,6 +184,14 @@ lint: ${SRCS} _SUBDIRUSE .include .endif +.if !defined(NONLS) +.include +.endif + .include +.include +.include +.include .include .include +.include