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.61 retrieving revision 1.131 diff -u -p -r1.61 -r1.131 --- src/share/mk/bsd.prog.mk 1997/03/13 02:46:00 1.61 +++ src/share/mk/bsd.prog.mk 2001/06/01 17:49:33 1.131 @@ -1,38 +1,82 @@ -# $NetBSD: bsd.prog.mk,v 1.61 1997/03/13 02:46:00 perry Exp $ -# @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 +# $NetBSD: bsd.prog.mk,v 1.131 2001/06/01 17:49:33 tv 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 +.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: 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 +LIBCDK?= ${DESTDIR}/usr/lib/libcdk.a +LIBCOM_ERR?= ${DESTDIR}/usr/lib/libcom_err.a LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a +LIBCRYPTO?= ${DESTDIR}/usr/lib/libcrypto.a +LIBCRYPTO_RC5?= ${DESTDIR}/usr/lib/libcrypto_rc5.a +LIBCRYPTO_IDEA?=${DESTDIR}/usr/lib/libcrypto_idea.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 +LIBFORM?= ${DESTDIR}/usr/lib/libform.a LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a +LIBGNUMALLOC?= ${DESTDIR}/usr/lib/libgnumalloc.a +LIBGSSAPI?= ${DESTDIR}/usr/lib/libgssapi.a +LIBHDB?= ${DESTDIR}/usr/lib/libhdb.a +LIBINTL?= ${DESTDIR}/usr/lib/libintl.a +LIBIPSEC?= ${DESTDIR}/usr/lib/libipsec.a +LIBKADM?= ${DESTDIR}/usr/lib/libkadm.a +LIBKADM5CLNT?= ${DESTDIR}/usr/lib/libkadm5clnt.a +LIBKADM5SRV?= ${DESTDIR}/usr/lib/libkadm5srv.a +LIBKAFS?= ${DESTDIR}/usr/lib/libkafs.a LIBKDB?= ${DESTDIR}/usr/lib/libkdb.a LIBKRB?= ${DESTDIR}/usr/lib/libkrb.a +LIBKRB5?= ${DESTDIR}/usr/lib/libkrb5.a +LIBKSTREAM?= ${DESTDIR}/usr/lib/libkstream.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 +LIBMENU?= ${DESTDIR}/usr/lib/libmenu.a +LIBOBJC?= ${DESTDIR}/usr/lib/libobjc.a +LIBOSSAUDIO?= ${DESTDIR}/usr/lib/libossaudio.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 +LIBRMT?= ${DESTDIR}/usr/lib/librmt.a +LIBROKEN?= ${DESTDIR}/usr/lib/libroken.a LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a +LIBSS?= ${DESTDIR}/usr/lib/libss.a +LIBSSL?= ${DESTDIR}/usr/lib/libssl.a +LIBSL?= ${DESTDIR}/usr/lib/libsl.a LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a +LIBTELNET?= ${DESTDIR}/usr/lib/libtelnet.a +LIBUSB?= ${DESTDIR}/usr/lib/libusb.a LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a LIBWRAP?= ${DESTDIR}/usr/lib/libwrap.a LIBY?= ${DESTDIR}/usr/lib/liby.a @@ -60,46 +104,50 @@ CLEANFILES+=strings .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} +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:N*.fth) +OBJS+= ${SRCS:N*.h:N*.sh:N*.fth: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} +.if !commands(${PROG}) + ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -Wl,-rpath-link,${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${DESTDIR}/usr/lib -lgcc -lc -lgcc ${LIBCRTEND} +.endif .else -${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD} +${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +.if !commands(${PROG}) ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} +.endif .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 +realall: ${PROG} ${SCRIPTS} -.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) +.if defined(SRCS) && !target(afterdepend) afterdepend: .depend @(TMP=/tmp/_depend$$$$; \ sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.ln:/' \ @@ -107,72 +155,72 @@ afterdepend: .depend mv $$TMP .depend) .endif -.if !target(install) -.if !target(beforeinstall) -beforeinstall: -.endif -.if !target(afterinstall) -afterinstall: +.if defined(PROG) && !target(proginstall) +PROGNAME?=${PROG} + +proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME} +.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME} +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${BINDIR}/${PROGNAME} .endif -.if !target(realinstall) -realinstall: -.if defined(PROG) - ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${PROG} ${DESTDIR}${BINDIR} +__proginstall: .USE + ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \ + -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${.ALLSRC} ${.TARGET} + +.if !defined(BUILD) && !make(all) && !make(${PROG}) +${DESTDIR}${BINDIR}/${PROGNAME}: .MADE .endif -.if defined(HIDEGAME) - (cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}) +${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} __proginstall .endif + +.if !target(proginstall) +proginstall:: .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 -.if defined(SYMLINKS) && !empty(SYMLINKS) - @set ${SYMLINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - echo $$t -\> $$l; \ - rm -f $$t; \ - ln -s $$l $$t; \ - done; true -.endif - -maninstall: afterinstall -afterinstall: realinstall -realinstall: beforeinstall +.if defined(SCRIPTS) && !target(scriptsinstall) +SCRIPTSDIR?=${BINDIR} +SCRIPTSOWN?=${BINOWN} +SCRIPTSGRP?=${BINGRP} +SCRIPTSMODE?=${BINMODE} + +scriptsinstall:: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@} +.PRECIOUS: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@} +.if !defined(UPDATE) +.PHONY: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@} .endif -.if !target(lint) -lint: ${LOBJS} -.if defined(LOBJS) && !empty(LOBJS) - @${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD} +__scriptinstall: .USE + ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \ + -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \ + -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \ + -m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \ + ${.ALLSRC} ${.TARGET} + +.for S in ${SCRIPTS:O:u} +.if !defined(BUILD) && !make(all) && !make(${S}) +${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: .MADE .endif +${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: ${S} __scriptinstall +.endfor .endif -.if !defined(NOMAN) -.include +.if !target(scriptsinstall) +scriptsinstall:: .endif -.if !defined(NONLS) -.include +lint: ${LOBJS} +.if defined(LOBJS) && !empty(LOBJS) + ${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD} .endif -.include +.include +.include +.include +.include +.include .include -.include .include + +# Make sure all of the standard targets are defined, even if they do nothing. +regress: