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.165
retrieving revision 1.192
diff -u -p -r1.165 -r1.192
--- src/share/mk/bsd.prog.mk	2003/03/30 00:35:07	1.165
+++ src/share/mk/bsd.prog.mk	2003/10/21 10:01:22	1.192
@@ -1,35 +1,42 @@
-#	$NetBSD: bsd.prog.mk,v 1.165 2003/03/30 00:35:07 thorpej Exp $
+#	$NetBSD: bsd.prog.mk,v 1.192 2003/10/21 10:01:22 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>
+
+.if defined(PROG_CXX)
+PROG=	${PROG_CXX}
+.endif
 
 ##### Basic targets
 .PHONY:		cleanextra cleanobjs cleanprog proginstall scriptsinstall
 realinstall:	proginstall scriptsinstall
 clean:		cleanprog
 
+##### PROG specific flags.
+COPTS+=     ${COPTS.${PROG}}
+CPPFLAGS+=  ${CPPFLAGS.${PROG}}
+CXXFLAGS+=  ${CXXFLAGS.${PROG}}
+LDADD+=     ${LDADD.${PROG}}
+LDFLAGS+=   ${LDFLAGS.${PROG}}
+LDSTATIC+=  ${LDSTATIC.${PROG}}
+
 ##### 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 crti.o, crtbegin.o, crtend.o, and crtn.o
 .if ${OBJECT_FMT} == "ELF"
 .ifndef LIBCRTBEGIN
-LIBCRTBEGIN=	${DESTDIR}/usr/lib/crti.o ${DESTDIR}/usr/lib/crtbegin.o
+LIBCRTBEGIN=	${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGIN}
 .MADE: ${LIBCRTBEGIN}
 .endif
 .ifndef LIBCRTEND
-.if ${MACHINE_ARCH} == "powerpc" && defined(HAVE_GCC3)
-LIBCRTEND=	${DESTDIR}/usr/lib/crtsavres.o \
-		${DESTDIR}/usr/lib/crtend.o ${DESTDIR}/usr/lib/crtn.o
-.else
-LIBCRTEND=	${DESTDIR}/usr/lib/crtend.o ${DESTDIR}/usr/lib/crtn.o
-.endif
+LIBCRTEND=	${_GCC_CRTEND} ${DESTDIR}/usr/lib/crtn.o
 .MADE: ${LIBCRTEND}
 .endif
 _SHLINKER=	${SHLINKDIR}/ld.elf_so
@@ -51,20 +58,44 @@ LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
 __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 FORM GCC GNUMALLOC GSSAPI HDB INTL IPSEC \
+	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 TELNET USBHID UTIL WRAP Y Z
+	ROKEN RPCSVC RT SKEY SL SS SSL 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
+# Note: ${DESTDIR} will be expanded in the following rule
 .MADE: ${LIB${_n}}
 .endif
 .endfor
 .undef __bsd_prog_mk_system_libs
 
+.ifndef LIBSTDCXX
+LIBSTDCXX=	${DESTDIR}/usr/lib/libstdc++.a
+.MADE: ${LIBSTDCXX}
+.endif
+
+##### Installed X11R6 library definitions
+#     E.g. LIBX11?=${DESTDIR}/usr/X11R6/lib/libX11.a
+#     etc..
+#
+__bsd_prog_mk_x11r6_libs?= \
+	dps expat fntstubs fontcache fontconfig fontenc freetype FS \
+	GL GLU ICE lbxutil SM X11 Xau Xaw Xdmcp Xext Xfont Xft \
+	Xi Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt \
+	XTrap Xtst Xv Xxf86dga Xxf86misc Xxf86vm
+
+.for _n in ${__bsd_prog_mk_x11r6_libs}
+.ifndef LIB${_n:tu}
+LIB${_n:tu}= ${DESTDIR}/usr/X11R6/lib/lib${_n}.a
+# Note: ${DESTDIR} will be expanded in the following rule
+.MADE: ${LIB${_n:tu}}
+.endif
+.endfor
+.undef __bsd_prog_mk_x11r6_libs
+
 ##### Build and install rules
 .if defined(SHAREDSTRINGS)
 CLEANFILES+=strings
@@ -73,21 +104,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)
-PROG=	${PROG_CXX}
 .endif
 
 .if defined(PROG)
@@ -97,8 +118,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}
@@ -117,18 +140,22 @@ _PROGLDOPTS+=	-Wl,-dynamic-linker=${_SHL
 LIBCRT0=	${DESTDIR}/lib/crt0.o
 .endif
 .endif
-.if ${SHLIBDIR} != ${LIBDIR}
+.if ${SHLIBDIR} != "/usr/lib"
 _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
-		-Wl,-rpath,${SHLIBDIR}:/usr/lib \
+		-R${SHLIBDIR} \
 		-L${DESTDIR}${SHLIBDIR}
-.elif ${SHLIBINSTALLDIR} != ${LIBDIR}
+.elif ${SHLIBINSTALLDIR} != "/usr/lib"
 _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
@@ -144,21 +171,21 @@ _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})
-	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib ${_PROGLDOPTS} ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${DESTDIR}/usr/lib ${_SUPCXX} -lgcc -lc -lgcc ${LIBCRTEND}
-.endif
-
+	${_MKMSG_LINK} ${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
-
-${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})
+
+${PROG}.ro: ${OBJS} ${DPADD}
+	${LD} -r -dc -o ${.TARGET} ${OBJS}
+
 .endif	# defined(OBJS) && !empty(OBJS)
 
 .if !defined(MAN)
@@ -183,7 +210,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)
@@ -196,10 +223,11 @@ proginstall:: ${DESTDIR}${BINDIR}/${PROG
 .PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
 
 __proginstall: .USE
+	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${STRIPFLAG} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 
-.if !defined(UPDATE)
+.if ${MKUPDATE} == "no"
 ${DESTDIR}${BINDIR}/${PROGNAME}! ${PROG} __proginstall
 .if !defined(BUILD) && !make(all) && !make(${PROG})
 ${DESTDIR}${BINDIR}/${PROGNAME}! .MADE
@@ -226,6 +254,7 @@ scriptsinstall:: ${SCRIPTS:@S@${DESTDIR}
 .PRECIOUS: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
 
 __scriptinstall: .USE
+	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} \
 	    -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \
 	    -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \
@@ -233,7 +262,7 @@ __scriptinstall: .USE
 	    ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 
 .for S in ${SCRIPTS:O:u}
-.if !defined(UPDATE)
+.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
@@ -262,7 +291,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