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.193
retrieving revision 1.200
diff -u -p -r1.193 -r1.200
--- src/share/mk/bsd.prog.mk	2003/11/11 11:43:45	1.193
+++ src/share/mk/bsd.prog.mk	2004/06/10 00:29:59	1.200
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.193 2003/11/11 11:43:45 dsl Exp $
+#	$NetBSD: bsd.prog.mk,v 1.200 2004/06/10 00:29:59 lukem Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -12,7 +12,6 @@ PROG=	${PROG_CXX}
 .endif
 
 ##### Basic targets
-.PHONY:		cleanextra cleanobjs cleanprog proginstall scriptsinstall
 realinstall:	proginstall scriptsinstall
 clean:		cleanprog
 
@@ -60,7 +59,7 @@ __bsd_prog_mk_system_libs?= \
 	BZ2 C C_PIC CDK COM_ERR COMPAT CRYPT CRYPTO CRYPTO_IDEA CRYPTO_MDC2 \
 	CRYPTO_RC5 \
 	CURSES DBM DES EDIT EVENT FORM GCC GNUMALLOC GSSAPI HDB INTL IPSEC \
-	KADM KADM5CLNT KADM5SRV KAFS KDB KRB KRB5 KSTREAM KVM L M MENU \
+	KADM KADM5CLNT KADM5SRV KAFS KDB KRB KRB5 KSTREAM KVM L M MAGIC MENU \
 	OBJC OSSAUDIO PCAP PCI PMC POSIX PTHREAD PTHREAD_DBG RESOLV RMT \
 	ROKEN RPCSVC RT SKEY SL SS SSL TERMCAP USBHID UTIL WRAP Y Z
 
@@ -119,10 +118,10 @@ SRCS?=		${PROG}.cc
 SRCS?=		${PROG}.c
 .endif
 
-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}}
+_YPSRCS=	${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}
+
+DPSRCS+=	${_YPSRCS}
+CLEANFILES+=	${_YPSRCS}
 
 .if !empty(SRCS:N*.h:N*.sh:N*.fth)
 OBJS+=		${SRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g}
@@ -130,16 +129,13 @@ LOBJS+=		${LSRCS:.c=.ln} ${SRCS:M*.c:.c=
 .endif
 
 .if defined(OBJS) && !empty(OBJS)
-.NOPATH: ${OBJS} ${PROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}
+.NOPATH: ${OBJS} ${PROG} ${_YPSRCS}
 
 _PROGLDOPTS=
 .if ${SHLINKDIR} != "/usr/libexec"	# XXX: change or remove if ld.so moves
 .if ${OBJECT_FMT} == "ELF"
 _PROGLDOPTS+=	-Wl,-dynamic-linker=${_SHLINKER}
 .endif
-.if ${OBJECT_FMT} == "a.out"
-LIBCRT0=	${DESTDIR}/lib/crt0.o
-.endif
 .endif
 .if ${SHLIBDIR} != "/usr/lib"
 _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
@@ -176,9 +172,13 @@ ${OBJS} ${LOBJS}: ${DPSRCS}
 
 ${PROG}: .gdbinit ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
 .if !commands(${PROG})
-	${_MKMSG_LINK} ${PROG}
+	${_MKTARGET_LINK}
 .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}
+	${_CCLINK} -Wl,-nostdlib \
+	    ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} \
+	    -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/  \
+	    ${OBJS} ${LDADD} \
+	    -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib
 .else
 	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD}
 .endif	# defined(DESTDIR)
@@ -196,15 +196,15 @@ MAN=	${PROG}.1
 
 realall: ${PROG} ${SCRIPTS}
 
-cleanprog: cleanobjs cleanextra
+cleanprog: .PHONY cleanobjs cleanextra
 	rm -f a.out [Ee]rrs mklog core *.core .gdbinit ${PROG}
 
-cleanobjs:
+cleanobjs: .PHONY
 .if defined(OBJS) && !empty(OBJS)
 	rm -f ${OBJS} ${LOBJS}
 .endif
 
-cleanextra:
+cleanextra: .PHONY
 .if defined(CLEANFILES) && !empty(CLEANFILES)
 	rm -f ${CLEANFILES}
 .endif
@@ -236,6 +236,7 @@ ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
 .if !target(proginstall)
 proginstall::
 .endif
+.PHONY:		proginstall
 
 .if defined(SCRIPTS) && !target(scriptsinstall)
 SCRIPTSDIR?=${BINDIR}
@@ -272,10 +273,11 @@ ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDI
 .if !target(scriptsinstall)
 scriptsinstall::
 .endif
+.PHONY:		scriptsinstall
 
 lint: ${LOBJS}
 .if defined(LOBJS) && !empty(LOBJS)
-	${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD}
+	${LINT} ${LINTFLAGS} ${LDFLAGS:C/-L[  ]*/-L/Wg:M-L*} ${LOBJS} ${LDADD}
 .endif
 
 ##### Pull in related .mk logic