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.143
retrieving revision 1.152
diff -u -p -r1.143 -r1.152
--- src/share/mk/bsd.prog.mk	2001/11/28 04:38:29	1.143
+++ src/share/mk/bsd.prog.mk	2002/02/04 17:25:44	1.152
@@ -1,10 +1,10 @@
-#	$NetBSD: bsd.prog.mk,v 1.143 2001/11/28 04:38:29 tv Exp $
+#	$NetBSD: bsd.prog.mk,v 1.152 2002/02/04 17:25:44 christos Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .include <bsd.init.mk>
 
 ##### Basic targets
-.PHONY:		cleanprog proginstall scriptsinstall
+.PHONY:		cleanextra cleanobjs cleanprog proginstall scriptsinstall
 realinstall:	proginstall scriptsinstall
 clean:		cleanprog
 
@@ -16,67 +16,125 @@ 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
-LIBUSB?=	${DESTDIR}/usr/lib/libusb.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)
@@ -99,9 +157,16 @@ CLEANFILES+=strings
 	@rm -f x.C
 .endif
 
+.if defined(PROG_CXX)
+PROG=	${PROG_CXX}
+.endif
 
 .if defined(PROG)
+.if defined(PROG_CXX)
+SRCS?=		${PROG}.cc
+.else
 SRCS?=		${PROG}.c
+.endif
 
 DPSRCS+=	${SRCS:M*.[ly]:C/\..$/.c/}
 CLEANFILES+=	${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}}
@@ -114,18 +179,35 @@ LOBJS+=		${LSRCS:.c=.ln} ${SRCS:M*.c:.c=
 .if defined(OBJS) && !empty(OBJS)
 .NOPATH: ${OBJS} ${PROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}
 
+_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
+
 .if defined(DESTDIR)
 
 ${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}
+	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib ${_PROGLDOPTS} ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${DESTDIR}/usr/lib ${_SUPCXX} -lgcc -lc -lgcc ${LIBCRTEND}
 .endif
 
 .else
 
 ${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
 .if !commands(${PROG})
-	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD}
+	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD}
 .endif
 
 .endif	# defined(DESTDIR)