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.72
retrieving revision 1.206
diff -u -p -r1.72 -r1.206
--- src/share/mk/bsd.prog.mk	1997/05/06 21:29:44	1.72
+++ src/share/mk/bsd.prog.mk	2005/03/04 20:41:08	1.206
@@ -1,60 +1,105 @@
-#	$NetBSD: bsd.prog.mk,v 1.72 1997/05/06 21:29:44 mycroft Exp $
+#	$NetBSD: bsd.prog.mk,v 1.206 2005/03/04 20:41:08 he Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
-.if exists(${.CURDIR}/../Makefile.inc)
-.include "${.CURDIR}/../Makefile.inc"
-.endif
-
-.MAIN:		all
-.PHONY:		cleanprog afterdepend beforeinstall proginstall afterinstall
-
-.include <bsd.own.mk>
-
-.SUFFIXES: .out .o .c .cc .C .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0
+.ifndef HOSTPROG
 
+.include <bsd.init.mk>
+.include <bsd.shlib.mk>
+.include <bsd.gcc.mk>
+
+.if defined(PROG_CXX)
+PROG=	${PROG_CXX}
+.endif
+
+##### Basic targets
+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_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
 CFLAGS+=	${COPTS}
+MKDEP_SUFFIXES?=	.o .ln
 
-# ELF platforms depend on crtbegin.o and crtend.o
-.if (${MACHINE_ARCH} == "alpha")   || \
-    (${MACHINE_ARCH} == "powerpc")
-LIBCRTBEGIN?=	${DESTDIR}/usr/lib/crtbegin.o
-LIBCRTEND?=	${DESTDIR}/usr/lib/crtend.o
+# 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 ${_GCC_CRTBEGIN}
+.MADE: ${LIBCRTBEGIN}
+.endif
+.ifndef LIBCRTEND
+LIBCRTEND=	${_GCC_CRTEND} ${DESTDIR}/usr/lib/crtn.o
+.MADE: ${LIBCRTEND}
+.endif
+_SHLINKER=	${SHLINKDIR}/ld.elf_so
 .else
 LIBCRTBEGIN?=
 LIBCRTEND?=
+_SHLINKER=	${SHLINKDIR}/ld.so
+.endif
+
+.ifndef LIBCRT0
+LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
+.MADE: ${LIBCRT0}
+.endif
+
+##### Installed system library definitions
+#
+#	E.g.
+#		LIBC?=${DESTDIR}/usr/lib/libc.a
+#		LIBX11?=${DESTDIR}/usr/X11R6/lib/libX11.a
+#	etc..
+
+.for _lib in \
+	asn1 bsdmalloc bz2 c c_pic cdk com_err compat crypt \
+	crypto crypto_idea crypto_mdc2 crypto_rc5 \
+	curses dbm des edit event \
+	form fl g2c gcc gnumalloc gssapi hdb intl ipsec \
+	kadm kadm5clnt kadm5srv kafs kdb krb krb5 kstream kvm l \
+	m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \
+	radius resolv rmt roken rpcsvc rt skey sl ss ssh ssl termcap \
+	usbhid util wrap y z
+.ifndef LIB${_lib:tu}
+LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_lib}.a
+.MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
+.endif
+.endfor
+
+# PAM applications, if linked statically, need more libraries
+.if (${MKPIC} == "no")
+PAM_STATIC_LDADD= -lcrypt -lrpcsvc -lutil
+PAM_STATIC_DPADD= ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
+.else
+PAM_STATIC_LDADD=
+PAM_STATIC_DPADD=
+.endif
+
+.ifndef LIBSTDCXX
+LIBSTDCXX=	${DESTDIR}/usr/lib/libstdc++.a
+.MADE:		${LIBSTDCXX}
+.endif
+
+.for _lib in \
+	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
+.ifndef LIB${_lib:tu}
+LIB${_lib:tu}=	${DESTDIR}/usr/X11R6/lib/lib${_lib}.a
+.MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
 .endif
+.endfor
 
-LIBCRT0?=	${DESTDIR}/usr/lib/crt0.o
-LIBC?=		${DESTDIR}/usr/lib/libc.a
-LIBC_PIC?=	${DESTDIR}/usr/lib/libc_pic.a
-LIBCOMPAT?=	${DESTDIR}/usr/lib/libcompat.a
-LIBCRYPT?=	${DESTDIR}/usr/lib/libcrypt.a
-LIBCURSES?=	${DESTDIR}/usr/lib/libcurses.a
-LIBDBM?=	${DESTDIR}/usr/lib/libdbm.a
-LIBDES?=	${DESTDIR}/usr/lib/libdes.a
-LIBEDIT?=	${DESTDIR}/usr/lib/libedit.a
-LIBGCC?=	${DESTDIR}/usr/lib/libgcc.a
-LIBGNUMALLOC?=	${DESTDIR}/usr/lib/libgnumalloc.a
-LIBKDB?=	${DESTDIR}/usr/lib/libkdb.a
-LIBKRB?=	${DESTDIR}/usr/lib/libkrb.a
-LIBKVM?=	${DESTDIR}/usr/lib/libkvm.a
-LIBL?=		${DESTDIR}/usr/lib/libl.a
-LIBM?=		${DESTDIR}/usr/lib/libm.a
-LIBMP?=		${DESTDIR}/usr/lib/libmp.a
-LIBNTP?=	${DESTDIR}/usr/lib/libntp.a
-LIBPC?=		${DESTDIR}/usr/lib/libpc.a
-LIBPCAP?=	${DESTDIR}/usr/lib/libpcap.a
-LIBPLOT?=	${DESTDIR}/usr/lib/libplot.a
-LIBRESOLV?=	${DESTDIR}/usr/lib/libresolv.a
-LIBRPCSVC?=	${DESTDIR}/usr/lib/librpcsvc.a
-LIBSKEY?=	${DESTDIR}/usr/lib/libskey.a
-LIBTERMCAP?=	${DESTDIR}/usr/lib/libtermcap.a
-LIBTELNET?=	${DESTDIR}/usr/lib/libtelnet.a
-LIBUTIL?=	${DESTDIR}/usr/lib/libutil.a
-LIBWRAP?=	${DESTDIR}/usr/lib/libwrap.a
-LIBY?=		${DESTDIR}/usr/lib/liby.a
-LIBZ?=		${DESTDIR}/usr/lib/libz.a
 
+##### Build and install rules
 .if defined(SHAREDSTRINGS)
 CLEANFILES+=strings
 .c.o:
@@ -62,157 +107,195 @@ 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
+.endif
 
-.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
+.if defined(PROG)
+.if defined(PROG_CXX)
+SRCS?=		${PROG}.cc
+.else
+SRCS?=		${PROG}.c
 .endif
 
+.if defined(RESCUEDIR)
+CPPFLAGS+=	-DRESCUEDIR=\"${RESCUEDIR}\"
+.endif
 
-.if defined(PROG)
-SRCS?=	${PROG}.c
-.if !empty(SRCS:N*.h:N*.sh)
-OBJS+=	${SRCS:N*.h:N*.sh:R:S/$/.o/g}
-LOBJS+=	${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
+_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}
+LOBJS+=		${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
 .endif
 
 .if defined(OBJS) && !empty(OBJS)
-.if defined(DESTDIR)
+.NOPATH: ${OBJS} ${PROG} ${_YPSRCS}
 
-${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
-	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -lgcc -lc -lgcc ${LIBCRTEND}
+_PROGLDOPTS=
+.if ${SHLINKDIR} != "/usr/libexec"	# XXX: change or remove if ld.so moves
+.if ${OBJECT_FMT} == "ELF"
+_PROGLDOPTS+=	-Wl,-dynamic-linker=${_SHLINKER}
+.endif
+.endif
+.if ${SHLIBDIR} != "/usr/lib"
+_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
+		-R${SHLIBDIR} \
+		-L${DESTDIR}${SHLIBDIR}
+.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
 
+.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
 
-${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
-	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD}
+${OBJS} ${LOBJS}: ${DPSRCS}
 
+${PROG}: .gdbinit ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
+.if !commands(${PROG})
+	${_MKTARGET_LINK}
+.if defined(DESTDIR)
+	${_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)
+.endif	# !commands(${PROG})
+
+${PROG}.ro: ${OBJS} ${DPADD}
+	${LD} -r -dc -o ${.TARGET} ${OBJS}
+
 .endif	# defined(OBJS) && !empty(OBJS)
 
-.if	!defined(MAN)
+.if !defined(MAN)
 MAN=	${PROG}.1
 .endif	# !defined(MAN)
 .endif	# defined(PROG)
 
-all: ${PROG} _SUBDIRUSE
-
-.if !target(clean)
-cleanprog:
-	rm -f a.out [Ee]rrs mklog core *.core \
-	    ${PROG} ${OBJS} ${LOBJS} ${CLEANFILES}
+realall: ${PROG} ${SCRIPTS}
 
-clean: _SUBDIRUSE cleanprog
-cleandir: _SUBDIRUSE cleanprog
-.else
-cleandir: _SUBDIRUSE clean
-.endif
+cleanprog: .PHONY cleanobjs cleanextra
+	rm -f a.out [Ee]rrs mklog core *.core .gdbinit ${PROG}
 
-.if defined(SRCS)
-afterdepend: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.ln:/' \
-	      < .depend > $$TMP; \
-	    mv $$TMP .depend)
+cleanobjs: .PHONY
+.if defined(OBJS) && !empty(OBJS)
+	rm -f ${OBJS} ${LOBJS}
 .endif
 
-.if !target(install)
-.if !target(beforeinstall)
-beforeinstall:
-.endif
-.if !target(afterinstall)
-afterinstall:
+cleanextra: .PHONY
+.if defined(CLEANFILES) && !empty(CLEANFILES)
+	rm -f ${CLEANFILES}
 .endif
 
-.if !target(realinstall)
+.if defined(PROG) && !target(proginstall)
+PROGNAME?=${PROG}
 
-.if defined(PROG)
-PROGNAME?= ${PROG}
 proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME}
-.if !defined(UPDATE)
-.PHONY: ${DESTDIR}${BINDIR}/${PROGNAME}
+.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
+
+__proginstall: .USE
+	${_MKTARGET_INSTALL}
+	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+		${STRIPFLAG} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
+
+.if ${MKUPDATE} == "no"
+${DESTDIR}${BINDIR}/${PROGNAME}! ${PROG} __proginstall
+.if !defined(BUILD) && !make(all) && !make(${PROG})
+${DESTDIR}${BINDIR}/${PROGNAME}! .MADE
 .endif
-.if !defined(BUILD)
+.else
+${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} __proginstall
+.if !defined(BUILD) && !make(all) && !make(${PROG})
 ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
 .endif
+.endif
+.endif
 
-.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
-${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG}
-	${INSTALL} ${COPY} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} \
-	    -m ${BINMODE} ${.ALLSRC} ${.TARGET}
+.if !target(proginstall)
+proginstall::
 .endif
+.PHONY:		proginstall
 
-.if defined(SCRIPTS)
+.if defined(SCRIPTS) && !target(scriptsinstall)
 SCRIPTSDIR?=${BINDIR}
 SCRIPTSOWN?=${BINOWN}
 SCRIPTSGRP?=${BINGRP}
 SCRIPTSMODE?=${BINMODE}
-.for S in ${SCRIPTS}
-SCRIPTSDIR_${S}?=${SCRIPTSDIR}
-SCRIPTSOWN_${S}?=${SCRIPTSOWN}
-SCRIPTSGRP_${S}?=${SCRIPTSGRP}
-SCRIPTSMODE_${S}?=${SCRIPTSMODE}
-.if defined(SCRIPTSNAME)
-SCRIPTSNAME_${S} ?= ${SCRIPTSNAME}
-.else
-SCRIPTSNAME_${S} ?= ${S:T:R}
-.endif
-SCRIPTSDIR_${S} ?= ${SCRIPTSDIR}
-proginstall:: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}
-.if !defined(UPDATE)
-.PHONY: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}
-.endif
-.if !defined(BUILD)
-${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}: .MADE
-.endif
-
-.PRECIOUS: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}
-${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}: ${S}
-	${INSTALL} ${COPY} -o ${SCRIPTSOWN_${S}} -g ${SCRIPTSGRP_${S}} \
-		-m ${SCRIPTSMODE_${S}} ${.ALLSRC} ${.TARGET}
-.endfor
-.endif
 
-.if target(proginstall)
-realinstall: proginstall filesinstall
+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}}}@}
+
+__scriptinstall: .USE
+	${_MKTARGET_INSTALL}
+	${INSTALL_FILE} \
+	    -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \
+	    -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \
+	    -m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \
+	    ${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
+.endif
 .else
-realinstall: filesinstall
+${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
 
-install: ${MANINSTALL} _SUBDIRUSE linksinstall
-
-${MANINSTALL}: afterinstall
-afterinstall: realinstall
-realinstall: beforeinstall
+.if !target(scriptsinstall)
+scriptsinstall::
 .endif
+.PHONY:		scriptsinstall
 
-.if !target(lint)
 lint: ${LOBJS}
 .if defined(LOBJS) && !empty(LOBJS)
-	@${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD}
-.endif
+	${LINT} ${LINTFLAGS} ${LDFLAGS:C/-L[  ]*/-L/Wg:M-L*} ${LOBJS} ${LDADD}
 .endif
 
-.if !defined(NOMAN)
+##### Pull in related .mk logic
 .include <bsd.man.mk>
-.endif
-
-.if !defined(NONLS)
 .include <bsd.nls.mk>
-.endif
-
-.include <bsd.obj.mk>
-.include <bsd.links.mk>
 .include <bsd.files.mk>
 .include <bsd.inc.mk>
-.include <bsd.dep.mk>
-.include <bsd.subdir.mk>
+.include <bsd.links.mk>
 .include <bsd.sys.mk>
+.include <bsd.dep.mk>
+
+${TARGETS}:	# ensure existence
+
+.endif	# HOSTPROG