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.173
retrieving revision 1.182
diff -u -p -r1.173 -r1.182
--- src/share/mk/bsd.prog.mk	2003/07/20 17:01:58	1.173
+++ src/share/mk/bsd.prog.mk	2003/08/01 17:04:01	1.182
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.173 2003/07/20 17:01:58 lukem Exp $
+#	$NetBSD: bsd.prog.mk,v 1.182 2003/08/01 17:04:01 lukem Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -14,7 +14,7 @@ clean:		cleanprog
 
 ##### Default values
 CPPFLAGS+=	${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
-CXXFLAGS+=	${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include/g++}
+CXXFLAGS+=	${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
 CFLAGS+=	${COPTS}
 .if ${MACHINE_ARCH} == "sparc64"
 CFLAGS+=	-mcmodel=medlow
@@ -89,8 +89,10 @@ SRCS?=		${PROG}.cc
 SRCS?=		${PROG}.c
 .endif
 
-DPSRCS+=	${SRCS:M*.[ly]:C/\..$/.c/}
-CLEANFILES+=	${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}}
+DPSRCS+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
+DPSRCS+=	${YHEADER:D${SRCS:M*.y:.y=.h}}
+CLEANFILES+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
+CLEANFILES+=	${YHEADER:D${SRCS:M*.y:.y=.h}}
 
 .if !empty(SRCS:N*.h:N*.sh:N*.fth)
 OBJS+=		${SRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g}
@@ -111,7 +113,7 @@ LIBCRT0=	${DESTDIR}/lib/crt0.o
 .endif
 .if ${SHLIBDIR} != ${LIBDIR}
 _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
-		-R${SHLIBDIR} -R/usr/lib \
+		-R${SHLIBDIR} \
 		-L${DESTDIR}${SHLIBDIR}
 .elif ${SHLIBINSTALLDIR} != ${LIBDIR}
 _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \
@@ -120,7 +122,11 @@ _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}
 
 .if defined(PROG_CXX)
 _CCLINK=	${CXX}
+.if ${USE_LIBSTDCXX} == "no"
+_SUPCXX=	-lsupc++ -lm
+.else
 _SUPCXX=	-lstdc++ -lm
+.endif
 .else
 _CCLINK=	${CC}
 .endif
@@ -136,21 +142,17 @@ _CCLINK=	${CC}
 	echo "source ${__gdbinit}" >> .gdbinit
 .endfor
 
-.if defined(DESTDIR)
+${OBJS} ${LOBJS}: ${DPSRCS}
 
-${PROG}: .gdbinit ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
+${PROG}: .gdbinit ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
 .if !commands(${PROG})
+.if defined(DESTDIR)
 	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib ${_PROGLDOPTS} ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib ${_SUPCXX} -lgcc -lc -lgcc ${LIBCRTEND}
-.endif
-
 .else
-
-${PROG}: .gdbinit ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
-.if !commands(${PROG})
 	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD}
-.endif
-
 .endif	# defined(DESTDIR)
+.endif	# !commands(${PROG})
+
 .endif	# defined(OBJS) && !empty(OBJS)
 
 .if !defined(MAN)
@@ -254,8 +256,8 @@ lint: ${LOBJS}
 .include <bsd.files.mk>
 .include <bsd.inc.mk>
 .include <bsd.links.mk>
-.include <bsd.dep.mk>
 .include <bsd.sys.mk>
+.include <bsd.dep.mk>
 
 ${TARGETS}:	# ensure existence