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.11
retrieving revision 1.152
diff -u -p -r1.11 -r1.152
--- src/share/mk/bsd.prog.mk	1993/04/25 04:55:52	1.11
+++ src/share/mk/bsd.prog.mk	2002/02/04 17:25:44	1.152
@@ -1,208 +1,312 @@
-#	@(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
+#	$NetBSD: bsd.prog.mk,v 1.152 2002/02/04 17:25:44 christos Exp $
+#	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
-.if exists(${.CURDIR}/../Makefile.inc)
-.include "${.CURDIR}/../Makefile.inc"
-.endif
-
-.SUFFIXES: .out .o .c .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0
+.include <bsd.init.mk>
 
-.8.0 .7.0 .6.0 .5.0 .4.0 .3.0 .2.0 .1.0:
-	nroff -mandoc ${.IMPSRC} > ${.TARGET}
-
-CFLAGS+=${COPTS}
-
-STRIP?=	-s
-
-BINGRP?=	bin
-BINOWN?=	bin
-BINMODE?=	555
-
-LIBCRT0?=	/usr/lib/crt0.o
-LIBC?=		/usr/lib/libc.a
-LIBCOMPAT?=	/usr/lib/libcompat.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
-LIBTERM?=	/usr/lib/libterm.a
-LIBUTIL?=	/usr/lib/libutil.a
+##### Basic targets
+.PHONY:		cleanextra cleanobjs cleanprog proginstall scriptsinstall
+realinstall:	proginstall scriptsinstall
+clean:		cleanprog
+
+##### Default values
+CPPFLAGS+=	${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
+CXXFLAGS+=	${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include/g++}
+CFLAGS+=	${COPTS}
+
+# ELF platforms depend on crtbegin.o and crtend.o
+.if ${OBJECT_FMT} == "ELF"
+LIBCRTBEGIN?=	${DESTDIR}/usr/lib/crtbegin.o
+.MADE: ${LIBCRTBEGIN}
+LIBCRTEND?=	${DESTDIR}/usr/lib/crtend.o
+.MADE: ${LIBCRTEND}
+_SHLINKER=	${SHLINKDIR}/ld.elf_so
+.else
+LIBCRTBEGIN?=
+LIBCRTEND?=
+_SHLINKER=	${SHLINKDIR}/ld.so
+.endif
+
+LIBCRT0?=	${DESTDIR}/usr/lib/crt0.o
+.MADE: ${LIBCRT0}
+
+LIBBZ2?=	${DESTDIR}/usr/lib/libbz2.a
+.MADE: ${LIBBZ2}
+LIBC?=		${DESTDIR}/usr/lib/libc.a
+.MADE: ${LIBC}
+LIBC_PIC?=	${DESTDIR}/usr/lib/libc_pic.a
+.MADE: ${LIBC_PIC}
+LIBCDK?=	${DESTDIR}/usr/lib/libcdk.a
+.MADE: ${LIBCDK}
+LIBCOM_ERR?=	${DESTDIR}/usr/lib/libcom_err.a
+.MADE: ${LIBCOM_ERR}
+LIBCOMPAT?=	${DESTDIR}/usr/lib/libcompat.a
+.MADE: ${LIBCOMPAT}
+LIBCRYPT?=	${DESTDIR}/usr/lib/libcrypt.a
+.MADE: ${LIBCRYPT}
+LIBCRYPTO?=	${DESTDIR}/usr/lib/libcrypto.a
+.MADE: ${LIBCRYPTO}
+LIBCRYPTO_RC5?=	${DESTDIR}/usr/lib/libcrypto_rc5.a
+.MADE: ${LIBCRYPTO_RC5}
+LIBCRYPTO_IDEA?=${DESTDIR}/usr/lib/libcrypto_idea.a
+.MADE: ${LIBCRYPTO_IDEA}
+LIBCURSES?=	${DESTDIR}/usr/lib/libcurses.a
+.MADE: ${LIBCURSES}
+LIBDBM?=	${DESTDIR}/usr/lib/libdbm.a
+.MADE: ${LIBDBM}
+LIBDES?=	${DESTDIR}/usr/lib/libdes.a
+.MADE: ${LIBDES}
+LIBEDIT?=	${DESTDIR}/usr/lib/libedit.a
+.MADE: ${LIBEDIT}
+LIBFORM?=	${DESTDIR}/usr/lib/libform.a
+.MADE: ${LIBFORM}
+LIBGCC?=	${DESTDIR}/usr/lib/libgcc.a
+.MADE: ${LIBGCC}
+LIBGNUMALLOC?=	${DESTDIR}/usr/lib/libgnumalloc.a
+.MADE: ${LIBGNUMALLOC}
+LIBGSSAPI?=	${DESTDIR}/usr/lib/libgssapi.a
+.MADE: ${LIBGSSAPI}
+LIBHDB?=	${DESTDIR}/usr/lib/libhdb.a
+.MADE: ${LIBHDB}
+LIBINTL?=	${DESTDIR}/usr/lib/libintl.a
+.MADE: ${LIBINTL}
+LIBIPSEC?=	${DESTDIR}/usr/lib/libipsec.a
+.MADE: ${LIBIPSEC}
+LIBKADM?=	${DESTDIR}/usr/lib/libkadm.a
+.MADE: ${LIBKADM}
+LIBKADM5CLNT?=	${DESTDIR}/usr/lib/libkadm5clnt.a
+.MADE: ${LIBKADM5CLNT}
+LIBKADM5SRV?=	${DESTDIR}/usr/lib/libkadm5srv.a
+.MADE: ${LIBKADM5SRV}
+LIBKAFS?=	${DESTDIR}/usr/lib/libkafs.a
+.MADE: ${LIBKAFS}
+LIBKDB?=	${DESTDIR}/usr/lib/libkdb.a
+.MADE: ${LIBKDB}
+LIBKRB?=	${DESTDIR}/usr/lib/libkrb.a
+.MADE: ${LIBKRB}
+LIBKRB5?=	${DESTDIR}/usr/lib/libkrb5.a
+.MADE: ${LIBKRB5}
+LIBKSTREAM?=	${DESTDIR}/usr/lib/libkstream.a
+.MADE: ${LIBKSTREAM}
+LIBKVM?=	${DESTDIR}/usr/lib/libkvm.a
+.MADE: ${LIBKVM}
+LIBL?=		${DESTDIR}/usr/lib/libl.a
+.MADE: ${LIBL}
+LIBM?=		${DESTDIR}/usr/lib/libm.a
+.MADE: ${LIBM}
+LIBMENU?=	${DESTDIR}/usr/lib/libmenu.a
+.MADE: ${LIBMENU}
+LIBOBJC?=	${DESTDIR}/usr/lib/libobjc.a
+.MADE: ${LIBOBJC}
+LIBOSSAUDIO?=	${DESTDIR}/usr/lib/libossaudio.a
+.MADE: ${LIBOSSAUDIO}
+LIBPCAP?=	${DESTDIR}/usr/lib/libpcap.a
+.MADE: ${LIBPCAP}
+LIBPCI?=	${DESTDIR}/usr/lib/libpci.a
+.MADE: ${LIBPCI}
+LIBPOSIX?=	${DESTDIR}/usr/lib/libposix.a
+.MADE: ${LIBPOSIX}
+LIBRESOLV?=	${DESTDIR}/usr/lib/libresolv.a
+.MADE: ${LIBRESOLV}
+LIBRMT?=	${DESTDIR}/usr/lib/librmt.a
+.MADE: ${LIBRMT}
+LIBROKEN?=	${DESTDIR}/usr/lib/libroken.a
+.MADE: ${LIBROKEN}
+LIBRPCSVC?=	${DESTDIR}/usr/lib/librpcsvc.a
+.MADE: ${LIBRPCSVC}
+LIBSKEY?=	${DESTDIR}/usr/lib/libskey.a
+.MADE: ${LIBSKEY}
+LIBSS?=		${DESTDIR}/usr/lib/libss.a
+.MADE: ${LIBSS}
+LIBSSL?=	${DESTDIR}/usr/lib/libssl.a
+.MADE: ${LIBSSL}
+LIBSL?=		${DESTDIR}/usr/lib/libsl.a
+.MADE: ${LIBSL}
+LIBTERMCAP?=	${DESTDIR}/usr/lib/libtermcap.a
+.MADE: ${LIBTERMCAP}
+LIBTELNET?=	${DESTDIR}/usr/lib/libtelnet.a
+.MADE: ${LIBTELNET}
+LIBUSBHID?=	${DESTDIR}/usr/lib/libusbhid.a
+.MADE: ${LIBUSBHID}
+LIBUTIL?=	${DESTDIR}/usr/lib/libutil.a
+.MADE: ${LIBUTIL}
+LIBWRAP?=	${DESTDIR}/usr/lib/libwrap.a
+.MADE: ${LIBWRAP}
+LIBY?=		${DESTDIR}/usr/lib/liby.a
+.MADE: ${LIBY}
+LIBZ?=		${DESTDIR}/usr/lib/libz.a
+.MADE: ${LIBZ}
 
+##### Build and install rules
 .if defined(SHAREDSTRINGS)
 CLEANFILES+=strings
 .c.o:
 	${CC} -E ${CFLAGS} ${.IMPSRC} | xstr -c -
 	@${CC} ${CFLAGS} -c x.c -o ${.TARGET}
 	@rm -f x.c
+
+.cc.o:
+	${CXX} -E ${CXXFLAGS} ${.IMPSRC} | xstr -c -
+	@mv -f x.c x.cc
+	@${CXX} ${CXXFLAGS} -c x.cc -o ${.TARGET}
+	@rm -f x.cc
+
+.C.o:
+	${CXX} -E ${CXXFLAGS} ${.IMPSRC} | xstr -c -
+	@mv -f x.c x.C
+	@${CXX} ${CXXFLAGS} -c x.C -o ${.TARGET}
+	@rm -f x.C
+.endif
+
+.if defined(PROG_CXX)
+PROG=	${PROG_CXX}
 .endif
 
 .if defined(PROG)
-.if defined(SRCS)
+.if defined(PROG_CXX)
+SRCS?=		${PROG}.cc
+.else
+SRCS?=		${PROG}.c
+.endif
 
-OBJS+=  ${SRCS:R:S/$/.o/g}
+DPSRCS+=	${SRCS:M*.[ly]:C/\..$/.c/}
+CLEANFILES+=	${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}}
 
-.if defined(LDONLY)
+.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
 
-${PROG}: ${LIBCRT0} ${LIBC} ${OBJS} ${DPADD}
-	${LD} ${LDFLAGS} -o ${.TARGET} ${LIBCRT0} ${OBJS} ${LIBC} ${LDADD}
+.if defined(OBJS) && !empty(OBJS)
+.NOPATH: ${OBJS} ${PROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}
 
-.else defined(LDONLY)
+_PROGLDOPTS=
+.if ${SHLINKDIR} != "/usr/libexec"	# XXX: change or remove if ld.so moves
+_PROGLDOPTS+=	-Wl,-dynamic-linker=${_SHLINKER}
+.endif
+.if ${SHLIBDIR} != ${LIBDIR}
+_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
+		-Wl,-rpath,${SHLIBDIR}:/usr/lib \
+		-L${DESTDIR}${SHLIBDIR}
+.endif
+
+.if defined(PROG_CXX)
+_CCLINK=	${CXX}
+_SUPCXX=	-lstdc++ -lm
+.else
+_CCLINK=	${CC}
+.endif
 
-${PROG}: ${OBJS} ${LIBC} ${DPADD}
-	${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
+.if defined(DESTDIR)
 
+${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
+.if !commands(${PROG})
+	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib ${_PROGLDOPTS} ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${DESTDIR}/usr/lib ${_SUPCXX} -lgcc -lc -lgcc ${LIBCRTEND}
 .endif
 
-.else defined(PROG)
+.else
 
-SRCS= ${PROG}.c
+${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
+.if !commands(${PROG})
+	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD}
+.endif
 
-${PROG}: ${SRCS} ${LIBC} ${DPADD}
-	${CC} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} ${LDADD}
+.endif	# defined(DESTDIR)
+.endif	# defined(OBJS) && !empty(OBJS)
 
-MKDEP=	-p
+.if !defined(MAN)
+MAN=	${PROG}.1
+.endif	# !defined(MAN)
+.endif	# defined(PROG)
 
-.endif
+realall: ${PROG} ${SCRIPTS}
 
-.if	!defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
-	!defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \
-	!defined(MAN7) && !defined(MAN8)
-MAN1=	${PROG}.0
-.endif
+cleanprog: cleanobjs cleanextra
+	rm -f a.out [Ee]rrs mklog core *.core ${PROG}
+
+cleanobjs:
+.if defined(OBJS) && !empty(OBJS)
+	rm -f ${OBJS} ${LOBJS}
 .endif
 
-.if !defined(NOMAN)
-MANALL=	${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8}
+cleanextra:
+.if defined(CLEANFILES) && !empty(CLEANFILES)
+	rm -f ${CLEANFILES}
 .endif
 
-_PROGSUBDIR: .USE
-.if defined(SUBDIR) && !empty(SUBDIR)
-	@for entry in ${SUBDIR}; do \
-		(echo "===> $$entry"; \
-		if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \
-			cd ${.CURDIR}/$${entry}.${MACHINE}; \
-		else \
-			cd ${.CURDIR}/$${entry}; \
-		fi; \
-		${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/}); \
-	done
+.if defined(SRCS) && !target(afterdepend)
+afterdepend: .depend
+	@(TMP=/tmp/_depend$$$$; \
+	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.ln:/' \
+	      < .depend > $$TMP; \
+	    mv $$TMP .depend)
 .endif
 
-.MAIN: all
-all: ${PROG} ${MANALL} _PROGSUBDIR
+.if defined(PROG) && !target(proginstall)
+PROGNAME?=${PROG}
 
-.if !target(clean)
-clean: _PROGSUBDIR
-	rm -f a.out [Ee]rrs mklog core ${PROG} ${OBJS} ${CLEANFILES}
+proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME}
+.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
+.if !defined(UPDATE)
+.PHONY: ${DESTDIR}${BINDIR}/${PROGNAME}
 .endif
 
-.if !target(cleandir)
-cleandir: _PROGSUBDIR
-	rm -f a.out [Ee]rrs mklog core ${PROG} ${OBJS} ${CLEANFILES}
-	rm -f .depend ${MANALL}
-.endif
+__proginstall: .USE
+	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+		${STRIPFLAG} ${.ALLSRC} ${.TARGET}
 
-# some of the rules involve .h sources, so remove them from mkdep line
-.if !target(depend)
-depend: .depend _PROGSUBDIR
-.depend: ${SRCS}
-.if defined(PROG)
-	mkdep ${MKDEP} ${CFLAGS:M-[ID]*} ${.ALLSRC:M*.c}
+.if !defined(BUILD) && !make(all) && !make(${PROG})
+${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
 .endif
+${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} __proginstall
 .endif
 
-.if !target(install)
-.if !target(beforeinstall)
-beforeinstall:
-	@if [ ! -d "${DESTDIR}${BINDIR}" ]; then \
-                /bin/rm -f ${DESTDIR}${BINDIR} ; \
-                mkdir -p ${DESTDIR}${BINDIR} ; \
-                chown root.wheel ${DESTDIR}${BINDIR} ; \
-                chmod 755 ${DESTDIR}${BINDIR} ; \
-        else \
-                true ; \
-        fi
-.endif
-.if !target(afterinstall)
-afterinstall:
+.if !target(proginstall)
+proginstall::
 .endif
 
-realinstall: _PROGSUBDIR
-.if defined(PROG)
-	install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${PROG} ${DESTDIR}${BINDIR}
-.endif
-.if defined(HIDEGAME)
-	(cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}; \
-	    chown games.bin ${PROG})
-.endif
-.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
-
-install: maninstall
-maninstall: afterinstall
-afterinstall: realinstall
-realinstall: beforeinstall
-.endif
+.if defined(SCRIPTS) && !target(scriptsinstall)
+SCRIPTSDIR?=${BINDIR}
+SCRIPTSOWN?=${BINOWN}
+SCRIPTSGRP?=${BINGRP}
+SCRIPTSMODE?=${BINMODE}
 
-.if !target(lint)
-lint: ${SRCS} _PROGSUBDIR
-.if defined(PROG)
-	@${LINT} ${LINTFLAGS} ${CFLAGS} ${.ALLSRC} | more 2>&1
-.endif
+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(obj)
-.if defined(NOOBJ)
-obj: _PROGSUBDIR
-.else
-obj: _PROGSUBDIR
-	@cd ${.CURDIR}; rm -f obj > /dev/null 2>&1 || true; \
-	here=`pwd`; subdir=`echo $$here | sed 's,^/usr/src/,,'`; \
-	if test $$here != $$subdir ; then \
-		dest=/usr/obj/$$subdir ; \
-		echo "$$here -> $$dest"; ln -s $$dest obj; \
-		if test -d /usr/obj -a ! -d $$dest; then \
-			mkdir -p $$dest; \
-		else \
-			true; \
-		fi; \
-	else \
-		true ; \
-		dest=$$here/obj ; \
-		echo "making $$here/obj" ; \
-		if test ! -d obj ; then \
-			mkdir $$here/obj; \
-		fi ; \
-	fi;
+__scriptinstall: .USE
+	${INSTALL_FILE} \
+	    -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 !target(tags)
-tags: ${SRCS} _PROGSUBDIR
-.if defined(PROG)
-	-cd ${.CURDIR}; ctags -f /dev/stdout ${.ALLSRC} | \
-	    sed "s;\${.CURDIR}/;;" > tags
+.if !target(scriptsinstall)
+scriptsinstall::
 .endif
+
+lint: ${LOBJS}
+.if defined(LOBJS) && !empty(LOBJS)
+	${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD}
 .endif
 
-.if !defined(NOMAN)
+##### Pull in related .mk logic
 .include <bsd.man.mk>
-.endif
+.include <bsd.nls.mk>
+.include <bsd.files.mk>
+.include <bsd.inc.mk>
+.include <bsd.links.mk>
+.include <bsd.dep.mk>
+.include <bsd.sys.mk>
+
+${TARGETS}:	# ensure existence