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.152
retrieving revision 1.182
diff -u -p -r1.152 -r1.182
--- src/share/mk/bsd.prog.mk	2002/02/04 17:25:44	1.152
+++ src/share/mk/bsd.prog.mk	2003/08/01 17:04:01	1.182
@@ -1,7 +1,11 @@
-#	$NetBSD: bsd.prog.mk,v 1.152 2002/02/04 17:25:44 christos 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
+
 .include <bsd.init.mk>
+.include <bsd.shlib.mk>
+.include <bsd.gcc.mk>
 
 ##### Basic targets
 .PHONY:		cleanextra cleanobjs cleanprog proginstall scriptsinstall
@@ -10,15 +14,22 @@ 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
+.endif
 
-# ELF platforms depend on crtbegin.o and crtend.o
+# ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
 .if ${OBJECT_FMT} == "ELF"
-LIBCRTBEGIN?=	${DESTDIR}/usr/lib/crtbegin.o
+.ifndef LIBCRTBEGIN
+LIBCRTBEGIN=	${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGIN}
 .MADE: ${LIBCRTBEGIN}
-LIBCRTEND?=	${DESTDIR}/usr/lib/crtend.o
+.endif
+.ifndef LIBCRTEND
+LIBCRTEND=	${_GCC_CRTEND} ${DESTDIR}/usr/lib/crtn.o
 .MADE: ${LIBCRTEND}
+.endif
 _SHLINKER=	${SHLINKDIR}/ld.elf_so
 .else
 LIBCRTBEGIN?=
@@ -26,115 +37,31 @@ LIBCRTEND?=
 _SHLINKER=	${SHLINKDIR}/ld.so
 .endif
 
-LIBCRT0?=	${DESTDIR}/usr/lib/crt0.o
+.ifndef LIBCRT0
+LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
 .MADE: ${LIBCRT0}
+.endif
 
-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}
+##### Installed system library definitions
+#     E.g. LIBC?=${DESTDIR}/usr/lib/libc.a
+#     etc..
+#
+__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 \
+	OBJC OSSAUDIO PCAP PCI PMC POSIX PTHREAD PTHREAD_DBG RESOLV RMT \
+	ROKEN RPCSVC RT SKEY SS SSL SL TERMCAP USBHID UTIL WRAP Y Z
+
+.for _n in ${__bsd_prog_mk_system_libs}
+.ifndef LIB${_n}
+LIB${_n}= ${DESTDIR}/usr/lib/lib${_n:tl}.a
+# XXX - note that ${DESTDIR} will be expanded in the following rule
+.MADE: ${LIB${_n}}
+.endif
+.endfor
+.undef __bsd_prog_mk_system_libs
 
 ##### Build and install rules
 .if defined(SHAREDSTRINGS)
@@ -144,17 +71,11 @@ CLEANFILES+=strings
 	@${CC} ${CFLAGS} -c x.c -o ${.TARGET}
 	@rm -f x.c
 
-.cc.o:
+.cc.o .cpp.o .cxx.o .C.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)
@@ -168,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}
@@ -181,36 +104,55 @@ LOBJS+=		${LSRCS:.c=.ln} ${SRCS:M*.c:.c=
 
 _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} != ${LIBDIR}
 _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
-		-Wl,-rpath,${SHLIBDIR}:/usr/lib \
+		-R${SHLIBDIR} \
 		-L${DESTDIR}${SHLIBDIR}
+.elif ${SHLIBINSTALLDIR} != ${LIBDIR}
+_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \
+		-L${DESTDIR}${SHLIBINSTALLDIR}
 .endif
 
 .if defined(PROG_CXX)
 _CCLINK=	${CXX}
+.if ${USE_LIBSTDCXX} == "no"
+_SUPCXX=	-lsupc++ -lm
+.else
 _SUPCXX=	-lstdc++ -lm
+.endif
 .else
 _CCLINK=	${CC}
 .endif
 
-.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}
+.gdbinit:
+	rm -f .gdbinit
+.if defined(DESTDIR) && !empty(DESTDIR)
+	echo "set solib-absolute-prefix ${DESTDIR}" > .gdbinit
+.else
+	touch .gdbinit
 .endif
+.for __gdbinit in ${GDBINIT}
+	echo "source ${__gdbinit}" >> .gdbinit
+.endfor
 
-.else
+${OBJS} ${LOBJS}: ${DPSRCS}
 
-${PROG}: ${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}
+.else
 	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD}
-.endif
-
 .endif	# defined(DESTDIR)
+.endif	# !commands(${PROG})
+
 .endif	# defined(OBJS) && !empty(OBJS)
 
 .if !defined(MAN)
@@ -221,7 +163,7 @@ MAN=	${PROG}.1
 realall: ${PROG} ${SCRIPTS}
 
 cleanprog: cleanobjs cleanextra
-	rm -f a.out [Ee]rrs mklog core *.core ${PROG}
+	rm -f a.out [Ee]rrs mklog core *.core .gdbinit ${PROG}
 
 cleanobjs:
 .if defined(OBJS) && !empty(OBJS)
@@ -235,7 +177,7 @@ cleanextra:
 
 .if defined(SRCS) && !target(afterdepend)
 afterdepend: .depend
-	@(TMP=/tmp/_depend$$$$; \
+	@(TMP=/tmp/_depend$$$$; trap 'rm -f $$TMP ; exit 1' 1 2 3 13 15; \
 	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.ln:/' \
 	      < .depend > $$TMP; \
 	    mv $$TMP .depend)
@@ -246,18 +188,22 @@ PROGNAME?=${PROG}
 
 proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME}
 .PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
-.if !defined(UPDATE)
-.PHONY: ${DESTDIR}${BINDIR}/${PROGNAME}
-.endif
 
 __proginstall: .USE
 	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${STRIPFLAG} ${.ALLSRC} ${.TARGET}
+		${STRIPFLAG} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 
+.if ${MKUPDATE} == "no"
+${DESTDIR}${BINDIR}/${PROGNAME}! ${PROG} __proginstall
 .if !defined(BUILD) && !make(all) && !make(${PROG})
-${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
+${DESTDIR}${BINDIR}/${PROGNAME}! .MADE
 .endif
+.else
 ${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} __proginstall
+.if !defined(BUILD) && !make(all) && !make(${PROG})
+${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
+.endif
+.endif
 .endif
 
 .if !target(proginstall)
@@ -272,22 +218,26 @@ 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
 
 __scriptinstall: .USE
 	${INSTALL_FILE} \
 	    -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \
 	    -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \
 	    -m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \
-	    ${.ALLSRC} ${.TARGET}
+	    ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 
 .for S in ${SCRIPTS:O:u}
+.if ${MKUPDATE} == "no"
+${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}! ${S} __scriptinstall
 .if !defined(BUILD) && !make(all) && !make(${S})
-${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: .MADE
+${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}! .MADE
 .endif
+.else
 ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: ${S} __scriptinstall
+.if !defined(BUILD) && !make(all) && !make(${S})
+${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: .MADE
+.endif
+.endif
 .endfor
 .endif
 
@@ -306,7 +256,9 @@ 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
+
+.endif	# HOSTPROG