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.178
retrieving revision 1.249
diff -u -p -r1.178 -r1.249
--- src/share/mk/bsd.prog.mk	2003/07/28 23:54:25	1.178
+++ src/share/mk/bsd.prog.mk	2010/07/06 05:59:56	1.249
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.178 2003/07/28 23:54:25 lukem Exp $
+#	$NetBSD: bsd.prog.mk,v 1.249 2010/07/06 05:59:56 mrg Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -7,21 +7,69 @@
 .include <bsd.shlib.mk>
 .include <bsd.gcc.mk>
 
+#
+# Definitions and targets shared among all programs built by a single
+# Makefile.
+#
+
 ##### Basic targets
-.PHONY:		cleanextra cleanobjs cleanprog proginstall scriptsinstall
 realinstall:	proginstall scriptsinstall
 clean:		cleanprog
 
+.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
+
+cleanobjs: .PHONY
+
+cleanprog: .PHONY cleanobjs cleanextra
+	rm -f a.out [Ee]rrs mklog core *.core .gdbinit
+
+.if defined(SHAREDSTRINGS)
+CLEANFILES+=strings
+.c.o:
+	${CC} -E ${CPPFLAGS} ${CFLAGS} ${.IMPSRC} | xstr -c -
+	@${CC} ${CPPFLAGS} ${CFLAGS} -c x.c -o ${.TARGET}
+	@rm -f x.c
+
+.cc.o .cpp.o .cxx.o .C.o:
+	${CXX} -E ${CPPFLAGS} ${CXXFLAGS} ${.IMPSRC} | xstr -c -
+	@mv -f x.c x.cc
+	@${CXX} ${CPPFLAGS} ${CXXFLAGS} -c x.cc -o ${.TARGET}
+	@rm -f x.cc
+.endif
+
+.if defined(MKPIE) && (${MKPIE} != "no")
+CFLAGS+=	${PIE_CFLAGS}
+AFLAGS+=	${PIE_AFLAGS}
+LDFLAGS+=	${PIE_LDFLAGS}
+.endif
+
 ##### Default values
+.if empty(CPPFLAGS:M-nostdinc)
 CPPFLAGS+=	${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
+.endif
+.if empty(CXXFLAGS:M-nostdinc++)
 CXXFLAGS+=	${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
+.endif
 CFLAGS+=	${COPTS}
-.if ${MACHINE_ARCH} == "sparc64"
-CFLAGS+=	-mcmodel=medlow
+OBJCFLAGS+=	${OBJCOPTS}
+MKDEP_SUFFIXES?=	.o .ln
+
+# CTF preserve debug symbols
+.if defined(MKDTRACE) && (${MKDTRACE} != "no") && (${CFLAGS:M-g} != "")
+CTFFLAGS+= -g
+CTFMFLAGS+= -g
 .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 ${_GCC_CRTBEGIN}
 .MADE: ${LIBCRTBEGIN}
@@ -31,11 +79,6 @@ LIBCRTEND=	${_GCC_CRTEND} ${DESTDIR}/usr
 .MADE: ${LIBCRTEND}
 .endif
 _SHLINKER=	${SHLINKDIR}/ld.elf_so
-.else
-LIBCRTBEGIN?=
-LIBCRTEND?=
-_SHLINKER=	${SHLINKDIR}/ld.so
-.endif
 
 .ifndef LIBCRT0
 LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
@@ -43,176 +86,319 @@ LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
 .endif
 
 ##### 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}}
+#	E.g.
+#		LIBC?=${DESTDIR}/usr/lib/libc.a
+#		LIBX11?=${DESTDIR}/usr/X11R7/lib/libX11.a
+#	etc..
+
+.for _lib in \
+	archive asn1 bluetooth bsdmalloc bz2 c c_pic cdk com_err compat \
+	crypt crypto crypto_idea crypto_mdc2 crypto_rc5 \
+	curses dbm des edit event \
+	fetch form fl g2c gcc gnumalloc gssapi hdb heimntlm hx509 intl ipsec \
+	kadm5clnt kadm5srv kafs krb5 kvm l lber ldap ldap_r \
+	m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \
+	puffs radius resolv rmt roken rpcsvc rt rump rumpuser skey sl ss \
+	ssh ssl termcap usbhid util wrap y z bind9 dns lwres isccfg isccc isc \
+	\
+	rumpfs_cd9660fs rumpfs_efs rumpfs_ext2fs rumpfs_ffs rumpfs_hfs \
+	rumpfs_lfs rumpfs_msdosfs rumpfs_nfs rumpfs_ntfs rumpfs_syspuffs \
+	rumpfs_tmpfs rumpfs_udf rumpfs_ufs
+.ifndef LIB${_lib:tu}
+LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_lib}.a
+.MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
 .endif
 .endfor
-.undef __bsd_prog_mk_system_libs
-
-##### Build and install rules
-.if defined(SHAREDSTRINGS)
-CLEANFILES+=strings
-.c.o:
-	${CC} -E ${CFLAGS} ${.IMPSRC} | xstr -c -
-	@${CC} ${CFLAGS} -c x.c -o ${.TARGET}
-	@rm -f x.c
 
-.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
+# PAM applications, if linked statically, need more libraries
+.if (${MKPIC} == "no")
+.if (${MKCRYPTO} != "no")
+PAM_STATIC_LDADD+= -lssh
+PAM_STATIC_DPADD+= ${LIBSSH}
+.endif
+.if (${MKKERBEROS} != "no")
+PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypto
+PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} \
+	${LIBCOM_ERR} ${LIBCRYPTO}
+.endif
+.if (${MKSKEY} != "no")
+PAM_STATIC_LDADD+= -lskey
+PAM_STATIC_DPADD+= ${LIBSKEY}
 .endif
-
-.if defined(PROG_CXX)
-PROG=	${PROG_CXX}
+PAM_STATIC_LDADD+= -lradius -lcrypt -lrpcsvc -lutil
+PAM_STATIC_DPADD+= ${LIBRADIUS} ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
+.else
+PAM_STATIC_LDADD=
+PAM_STATIC_DPADD=
 .endif
 
-.if defined(PROG)
-.if defined(PROG_CXX)
-SRCS?=		${PROG}.cc
-.else
-SRCS?=		${PROG}.c
+# These need + -> X transformations
+.ifndef LIBSTDCXX
+LIBSTDCXX=	${DESTDIR}/usr/lib/libstdc++.a
+.MADE:		${LIBSTDCXX}
 .endif
 
-DPSRCS+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
-CLEANFILES+=	${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}}
+.ifndef LIBSUPCXX
+LIBSUPCXX=	${DESTDIR}/usr/lib/libsupc++.a
+.MADE:		${LIBSUPCXX}
+.endif
 
-.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}
+.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}${X11USRLIBDIR}/lib${_lib}.a
+.MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
 .endif
+.endfor
 
-.if defined(OBJS) && !empty(OBJS)
-.NOPATH: ${OBJS} ${PROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}
+.if defined(RESCUEDIR)
+CPPFLAGS+=	-DRESCUEDIR=\"${RESCUEDIR}\"
+.endif
 
 _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 \
-		-R${SHLIBDIR} -R/usr/lib \
+.if ${SHLIBDIR} != "/usr/lib"
+_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR} \
+		-R${SHLIBDIR} \
 		-L${DESTDIR}${SHLIBDIR}
-.elif ${SHLIBINSTALLDIR} != ${LIBDIR}
-_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \
+.elif ${SHLIBINSTALLDIR} != "/usr/lib"
+_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
 		-L${DESTDIR}${SHLIBINSTALLDIR}
 .endif
+_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}/usr/lib \
+		-L${DESTDIR}/usr/lib
 
-.if defined(PROG_CXX)
-_CCLINK=	${CXX}
-.if ${USE_LIBSTDCXX} == "no"
-_SUPCXX=	-lsupc++ -lm
-.else
-_SUPCXX=	-lstdc++ -lm
+__proginstall: .USE
+	${_MKTARGET_INSTALL}
+	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+		${STRIPFLAG} ${.ALLSRC} ${.TARGET}
+
+__progdebuginstall: .USE
+	${_MKTARGET_INSTALL}
+	${INSTALL_FILE} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \
+		${.ALLSRC} ${.TARGET}
+
+
+
+#
+# Backwards compatibility with Makefiles that assume that bsd.prog.mk
+# can only build a single binary.
+#
+
+_APPEND_MANS=yes
+_APPEND_SRCS=yes
+
+_CCLINKFLAGS=
+.if defined(DESTDIR)
+_CCLINKFLAGS+=	-B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/
 .endif
-.else
-_CCLINK=	${CC}
+
+.if defined(PROG_CXX)
+PROG=		${PROG_CXX}
+_CCLINK=	${CXX} ${_CCLINKFLAGS}
 .endif
 
-.gdbinit:
-	rm -f .gdbinit
-.if defined(DESTDIR) && !empty(DESTDIR)
-	echo "set solib-absolute-prefix ${DESTDIR}" > .gdbinit
-.else
-	touch .gdbinit
+.if defined(PROG)
+_CCLINK?=	${CC} ${_CCLINKFLAGS}
+.  if defined(MAN)
+MAN.${PROG}=	${MAN}
+_APPEND_MANS=	no
+.  endif
+.  if !defined(OBJS)
+OBJS=		${OBJS.${PROG}}
+.  endif
+.  if defined(PROGNAME)
+PROGNAME.${PROG}=	${PROGNAME}
+.  endif
+.  if defined(SRCS)
+SRCS.${PROG}=	${SRCS}
+_APPEND_SRCS=	no
+.  endif
+.endif
+
+# Turn the single-program PROG and PROG_CXX variables into their multi-word
+# counterparts, PROGS and PROGS_CXX.
+.if defined(PROG_CXX) && !defined(PROGS_CXX)
+PROGS_CXX=	${PROG_CXX}
+.elif defined(PROG) && !defined(PROGS)
+PROGS=		${PROG}
 .endif
-.for __gdbinit in ${GDBINIT}
-	echo "source ${__gdbinit}" >> .gdbinit
+
+
+
+#
+# Per-program definitions and targets.
+#
+
+# Definitions specific to C programs.
+.for _P in ${PROGS}
+SRCS.${_P}?=	${_P}.c
+_CCLINK.${_P}=	${CC} ${_CCLINKFLAGS}
 .endfor
 
-.if defined(DESTDIR)
+# Definitions specific to C++ programs.
+.for _P in ${PROGS_CXX}
+SRCS.${_P}?=	${_P}.cc
+_CCLINK.${_P}=	${CXX} ${_CCLINKFLAGS}
+.endfor
 
-${PROG}: .gdbinit ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
-.if !commands(${PROG})
-	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib ${_PROGLDOPTS} ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib ${_SUPCXX} -lgcc -lc -lgcc ${LIBCRTEND}
+# Language-independent definitions.
+.for _P in ${PROGS} ${PROGS_CXX}					# {
+
+BINDIR.${_P}?=		${BINDIR}
+PROGNAME.${_P}?=	${_P}
+
+.if ${MKDEBUG} != "no" && !commands(${_P})
+_PROGDEBUG.${_P}:=	${PROGNAME.${_P}}.debug
 .endif
 
-.else
+.if defined(PAXCTL_FLAGS)
+PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
+.endif
 
-${PROG}: .gdbinit ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
-.if !commands(${PROG})
-	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD}
+##### PROG specific flags.
+
+_LDADD.${_P}=		${LDADD}    ${LDADD.${_P}}
+_LDFLAGS.${_P}=		${LDFLAGS}  ${LDFLAGS.${_P}}
+_LDSTATIC.${_P}=	${LDSTATIC} ${LDSTATIC.${_P}}
+
+##### Build and install rules
+.if !empty(_APPEND_SRCS:M[Yy][Ee][Ss])
+SRCS+=		${SRCS.${_P}} # For bsd.dep.mk
 .endif
 
-.endif	# defined(DESTDIR)
-.endif	# defined(OBJS) && !empty(OBJS)
+_YPSRCS.${_P}=	${SRCS.${_P}:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS.${_P}:M*.y:.y=.h}}
 
-.if !defined(MAN)
-MAN=	${PROG}.1
-.endif	# !defined(MAN)
-.endif	# defined(PROG)
+DPSRCS+=		${_YPSRCS.${_P}}
+CLEANFILES+=		${_YPSRCS.${_P}}
 
-realall: ${PROG} ${SCRIPTS}
+.if !empty(SRCS.${_P}:N*.h:N*.sh:N*.fth)
+OBJS.${_P}+=	${SRCS.${_P}:N*.h:N*.sh:N*.fth:R:S/$/.o/g}
+LOBJS.${_P}+=	${LSRCS:.c=.ln} ${SRCS.${_P}:M*.c:.c=.ln}
+.endif
 
-cleanprog: cleanobjs cleanextra
-	rm -f a.out [Ee]rrs mklog core *.core .gdbinit ${PROG}
+.if defined(OBJS.${_P}) && !empty(OBJS.${_P})			# {
+.NOPATH: ${OBJS.${_P}} ${_P} ${_YPSRCS.${_P}}
 
-cleanobjs:
-.if defined(OBJS) && !empty(OBJS)
-	rm -f ${OBJS} ${LOBJS}
+${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
+
+${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
+.if !commands(${_P})
+	${_MKTARGET_LINK}
+	${_CCLINK.${_P}} \
+	    ${DESTDIR:D-Wl,-nostdlib} \
+	    ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} \
+	    ${OBJS.${_P}} ${_LDADD.${_P}} \
+	    ${DESTDIR:D-L${_GCC_LIBGCCDIR}} \
+	    ${_PROGLDOPTS}
+.if defined(CTFMERGE)
+	${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
+.endif
+.if defined(PAXCTL_FLAGS.${_P})
+	${PAXCTL} ${PAXCTL_FLAGS.${_P}} ${.TARGET}
 .endif
+.if ${MKSTRIPIDENT} != "no"
+	${OBJCOPY} -R .ident ${.TARGET}
+.endif
+.endif	# !commands(${_P})
 
-cleanextra:
-.if defined(CLEANFILES) && !empty(CLEANFILES)
-	rm -f ${CLEANFILES}
+${_P}.ro: ${OBJS.${_P}} ${DPADD}
+	${_MKTARGET_LINK}
+	${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
+
+.if defined(_PROGDEBUG.${_P})
+${_PROGDEBUG.${_P}}: ${_P}
+	${_MKTARGET_CREATE}
+	${OBJCOPY} --only-keep-debug ${_P} ${_PROGDEBUG.${_P}}
+	${OBJCOPY} --strip-debug -R .gnu_debuglink --add-gnu-debuglink=${_PROGDEBUG.${_P}} ${_P} \
+	    || rm -f ${_PROGDEBUG.${_P}}
 .endif
 
-.if defined(SRCS) && !target(afterdepend)
-afterdepend: .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)
+.endif	# defined(OBJS.${_P}) && !empty(OBJS.${_P})			# }
+
+.if !defined(MAN.${_P})
+MAN.${_P}=	${_P}.1
+.endif	# !defined(MAN.${_P})
+.if !empty(_APPEND_MANS:M[Yy][Ee][Ss])
+MAN+=		${MAN.${_P}}
 .endif
 
-.if defined(PROG) && !target(proginstall)
-PROGNAME?=${PROG}
+realall: ${_P} ${_PROGDEBUG.${_P}}
 
-proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME}
-.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
+cleanprog: cleanprog-${_P}
+cleanprog-${_P}:
+	rm -f ${_P} ${_PROGDEBUG.${_P}}
 
-__proginstall: .USE
-	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${STRIPFLAG} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
+.if defined(OBJS.${_P}) && !empty(OBJS.${_P})
+cleanobjs: cleanobjs-${_P}
+cleanobjs-${_P}:
+	rm -f ${OBJS.${_P}} ${LOBJS.${_P}}
+.endif
+
+_PROG_INSTALL+=	proginstall-${_P}
+
+.if !target(proginstall-${_P})						# {
+proginstall-${_P}::	${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}} \
+		${_PROGDEBUG.${_P}:D${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}}
+.PRECIOUS:	${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}} \
+		${_PROGDEBUG.${_P}:D${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}}
 
 .if ${MKUPDATE} == "no"
-${DESTDIR}${BINDIR}/${PROGNAME}! ${PROG} __proginstall
-.if !defined(BUILD) && !make(all) && !make(${PROG})
-${DESTDIR}${BINDIR}/${PROGNAME}! .MADE
-.endif
-.else
-${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} __proginstall
-.if !defined(BUILD) && !make(all) && !make(${PROG})
-${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
-.endif
-.endif
+${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}! ${_P} __proginstall
+.if !defined(BUILD) && !make(all) && !make(${_P})
+${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}! .MADE
+.endif
+.if defined(_PROGDEBUG.${_P})
+${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}! ${_PROGDEBUG.${_P}} __progdebuginstall
+.if !defined(BUILD) && !make(all) && !make(${_P})
+${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}! .MADE
+.endif
+.endif	#  define(_PROGDEBUG.${_P})
+.else	# MKUPDATE != no
+${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}: ${_P} __proginstall
+.if !defined(BUILD) && !make(all) && !make(${_P})
+${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}: .MADE
+.endif
+.if defined(_PROGDEBUG.${_P})
+${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}: ${_PROGDEBUG.${_P}} __progdebuginstall
+.if !defined(BUILD) && !make(all) && !make(${_P})
+${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}: .MADE
+.endif
+.endif	#  defined(_PROGDEBUG.${_P})
+.endif	# MKUPDATE != no
+
+.endif	# !target(proginstall-${_P})					# }
+
+lint: lint-${_P}
+lint-${_P}: ${LOBJS.${_P}}
+.if defined(LOBJS.${_P}) && !empty(LOBJS.${_P})
+	${LINT} ${LINTFLAGS} ${_LDFLAGS.${_P}:C/-L[  ]*/-L/Wg:M-L*} ${LOBJS.${_P}} ${_LDADD.${_P}}
+.endif
+
+.endfor # _P in ${PROGS} ${PROGS_CXX}					# }
+
+.if defined(OBJS) && !empty(OBJS) && \
+    (empty(PROGS) && empty(PROGS_CXX))
+cleanobjs: cleanobjs-plain
+cleanobjs-plain:
+	rm -f ${OBJS} ${LOBJS}
 .endif
 
 .if !target(proginstall)
-proginstall::
+proginstall:: ${_PROG_INSTALL}
 .endif
+.PHONY:		proginstall
 
-.if defined(SCRIPTS) && !target(scriptsinstall)
+
+
+realall: ${SCRIPTS}
+.if defined(SCRIPTS) && !target(scriptsinstall)				# {
 SCRIPTSDIR?=${BINDIR}
 SCRIPTSOWN?=${BINOWN}
 SCRIPTSGRP?=${BINGRP}
@@ -222,11 +408,12 @@ 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}} \
 	    -m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \
-	    ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
+	    ${.ALLSRC} ${.TARGET}
 
 .for S in ${SCRIPTS:O:u}
 .if ${MKUPDATE} == "no"
@@ -241,25 +428,29 @@ ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDI
 .endif
 .endif
 .endfor
-.endif
+.endif									# }
 
 .if !target(scriptsinstall)
 scriptsinstall::
 .endif
-
-lint: ${LOBJS}
-.if defined(LOBJS) && !empty(LOBJS)
-	${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD}
-.endif
+.PHONY:		scriptsinstall
 
 ##### Pull in related .mk logic
+LINKSOWN?= ${BINOWN}
+LINKSGRP?= ${BINGRP}
+LINKSMODE?= ${BINMODE}
 .include <bsd.man.mk>
 .include <bsd.nls.mk>
 .include <bsd.files.mk>
 .include <bsd.inc.mk>
 .include <bsd.links.mk>
-.include <bsd.dep.mk>
 .include <bsd.sys.mk>
+.include <bsd.dep.mk>
+
+cleanextra: .PHONY
+.if defined(CLEANFILES) && !empty(CLEANFILES)
+	rm -f ${CLEANFILES}
+.endif
 
 ${TARGETS}:	# ensure existence