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.3
retrieving revision 1.187
diff -u -p -r1.3 -r1.187
--- src/share/mk/bsd.prog.mk	1993/03/23 07:26:55	1.3
+++ src/share/mk/bsd.prog.mk	2003/09/14 22:36:55	1.187
@@ -1,187 +1,294 @@
-#	@(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
+#	$NetBSD: bsd.prog.mk,v 1.187 2003/09/14 22:36:55 lukem Exp $
+#	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
-.if exists(${.CURDIR}/../Makefile.inc)
-.include "${.CURDIR}/../Makefile.inc"
-.endif
-
-.SUFFIXES: .out .o .c .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0
+.ifndef HOSTPROG
 
-.8.0 .7.0 .6.0 .5.0 .4.0 .3.0 .2.0 .1.0:
-	nroff -mandoc ${.IMPSRC} > ${.TARGET}
-
-CFLAGS+=${COPTS}
-
-STRIP?=	-s
-
-BINGRP?=	bin
-BINOWN?=	bin
-BINMODE?=	555
-
-LIBC?=		/usr/lib/libc.a
-LIBCOMPAT?=	/usr/lib/libcompat.a
-LIBCURSES?=	/usr/lib/libcurses.a
-LIBDBM?=	/usr/lib/libdbm.a
-LIBDES?=	/usr/lib/libdes.a
-LIBL?=		/usr/lib/libl.a
-LIBKDB?=	/usr/lib/libkdb.a
-LIBKRB?=	/usr/lib/libkrb.a
-LIBM?=		/usr/lib/libm.a
-LIBMP?=		/usr/lib/libmp.a
-LIBPC?=		/usr/lib/libpc.a
-LIBPLOT?=	/usr/lib/libplot.a
-LIBRESOLV?=	/usr/lib/libresolv.a
-LIBRPC?=	/usr/lib/sunrpc.a
-LIBTERM?=	/usr/lib/libterm.a
-LIBUTIL?=	/usr/lib/libutil.a
+.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_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 ${_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
+#     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
+# Note: ${DESTDIR} will be expanded in the following rule
+.MADE: ${LIB${_n}}
+.endif
+.endfor
+.undef __bsd_prog_mk_system_libs
+
+##### 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
 .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
 .endif
 
 .if defined(PROG)
-.if defined(SRCS)
-
-OBJS+=  ${SRCS:R:S/$/.o/g}
-
-${PROG}: ${OBJS} ${LIBC} ${DPADD}
-	${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
-
-.else defined(PROG)
+.if defined(PROG_CXX)
+SRCS?=		${PROG}.cc
+.else
+SRCS?=		${PROG}.c
+.endif
 
-SRCS= ${PROG}.c
+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}}
 
-${PROG}: ${SRCS} ${LIBC} ${DPADD}
-	${CC} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} ${LDADD}
+.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
 
-MKDEP=	-p
+.if defined(OBJS) && !empty(OBJS)
+.NOPATH: ${OBJS} ${PROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}
 
+_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 \
+		-R${SHLIBDIR} \
+		-L${DESTDIR}${SHLIBDIR}
+.elif ${SHLIBINSTALLDIR} != "/usr/lib"
+_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \
+		-L${DESTDIR}${SHLIBINSTALLDIR}
 .endif
 
-.if	!defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
-	!defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \
-	!defined(MAN7) && !defined(MAN8) && !defined(NOMAN)
-MAN1=	${PROG}.0
+.if defined(PROG_CXX)
+_CCLINK=	${CXX}
+.if ${USE_LIBSTDCXX} == "no"
+_SUPCXX=	-lsupc++ -lm
+.else
+_SUPCXX=	-lstdc++ -lm
 .endif
+.else
+_CCLINK=	${CC}
 .endif
-MANALL=	${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8}
 
-_PROGSUBDIR: .USE
-.if defined(SUBDIR) && !empty(SUBDIR)
-	@for entry in ${SUBDIR}; do \
-		(echo "===> $$entry"; \
-		if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \
-			cd ${.CURDIR}/$${entry}.${MACHINE}; \
-		else \
-			cd ${.CURDIR}/$${entry}; \
-		fi; \
-		${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/}); \
-	done
+.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
+
+${OBJS} ${LOBJS}: ${DPSRCS}
+
+${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	# defined(DESTDIR)
+.endif	# !commands(${PROG})
 
-.MAIN: all
-all: ${PROG} ${MANALL} _PROGSUBDIR
+${PROG}.ro: ${OBJS} ${DPADD}
+	${LD} -r -dc -o ${.TARGET} ${OBJS}
 
-.if !target(clean)
-clean: _PROGSUBDIR
-	rm -f a.out [Ee]rrs mklog core ${PROG} ${OBJS} ${CLEANFILES}
-.endif
+.endif	# defined(OBJS) && !empty(OBJS)
+
+.if !defined(MAN)
+MAN=	${PROG}.1
+.endif	# !defined(MAN)
+.endif	# defined(PROG)
+
+realall: ${PROG} ${SCRIPTS}
 
-.if !target(cleandir)
-cleandir: _PROGSUBDIR
-	rm -f a.out [Ee]rrs mklog core ${PROG} ${OBJS} ${CLEANFILES}
-	rm -f .depend ${MANALL}
+cleanprog: cleanobjs cleanextra
+	rm -f a.out [Ee]rrs mklog core *.core .gdbinit ${PROG}
+
+cleanobjs:
+.if defined(OBJS) && !empty(OBJS)
+	rm -f ${OBJS} ${LOBJS}
 .endif
 
-# some of the rules involve .h sources, so remove them from mkdep line
-.if !target(depend)
-depend: .depend _PROGSUBDIR
-.depend: ${SRCS}
-.if defined(PROG)
-	mkdep ${MKDEP} ${CFLAGS:M-[ID]*} ${.ALLSRC:M*.c}
+cleanextra:
+.if defined(CLEANFILES) && !empty(CLEANFILES)
+	rm -f ${CLEANFILES}
 .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
 
-.if !target(install)
-.if !target(beforeinstall)
-beforeinstall:
+.if defined(PROG) && !target(proginstall)
+PROGNAME?=${PROG}
+
+proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME}
+.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
+
+__proginstall: .USE
+	${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 !target(afterinstall)
-afterinstall:
+.else
+${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} __proginstall
+.if !defined(BUILD) && !make(all) && !make(${PROG})
+${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
 .endif
-
-realinstall: _PROGSUBDIR
-.if defined(PROG)
-	install ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${PROG} ${DESTDIR}${BINDIR}
 .endif
-.if defined(HIDEGAME)
-	(cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}; \
-	    chown games.bin ${PROG})
-.endif
-.if defined(LINKS) && !empty(LINKS)
-	@set ${LINKS}; \
-	while test $$# -ge 2; do \
-		l=${DESTDIR}$$1; \
-		shift; \
-		t=${DESTDIR}$$1; \
-		shift; \
-		echo $$t -\> $$l; \
-		rm -f $$t; \
-		ln $$l $$t; \
-	done; true
-.endif
-
-install: maninstall
-maninstall: afterinstall
-afterinstall: realinstall
-realinstall: beforeinstall
 .endif
 
-.if !target(lint)
-lint: ${SRCS} _PROGSUBDIR
-.if defined(PROG)
-	@${LINT} ${LINTFLAGS} ${CFLAGS} ${.ALLSRC} | more 2>&1
-.endif
+.if !target(proginstall)
+proginstall::
 .endif
 
-.if !target(obj)
-.if defined(NOOBJ)
-obj: _PROGSUBDIR
-.else
-obj: _PROGSUBDIR
-	@cd ${.CURDIR}; rm -f obj > /dev/null 2>&1 || true; \
-	here=`pwd`; subdir=`echo $$here | sed 's,^/usr/src/,,'`; \
-	if test $$here != $$subdir ; then \
-		dest=/usr/obj/$$subdir ; \
-		echo "$$here -> $$dest"; ln -s $$dest obj; \
-		if test -d /usr/obj -a ! -d $$dest; then \
-			mkdir -p $$dest; \
-		else \
-			true; \
-		fi; \
-	else \
-		true ; \
-		dest=$$here/obj ; \
-		echo "making $$here/obj" ; \
-		if test ! -d obj ; then \
-			mkdir $$here/obj; \
-		fi ; \
-	fi;
+.if defined(SCRIPTS) && !target(scriptsinstall)
+SCRIPTSDIR?=${BINDIR}
+SCRIPTSOWN?=${BINOWN}
+SCRIPTSGRP?=${BINGRP}
+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}}}@}
+
+__scriptinstall: .USE
+	${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
+${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
 
-.if !target(tags)
-tags: ${SRCS} _PROGSUBDIR
-.if defined(PROG)
-	-cd ${.CURDIR}; ctags -f /dev/stdout ${.ALLSRC} | \
-	    sed "s;\${.CURDIR}/;;" > tags
+.if !target(scriptsinstall)
+scriptsinstall::
 .endif
+
+lint: ${LOBJS}
+.if defined(LOBJS) && !empty(LOBJS)
+	${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD}
 .endif
 
-.if !defined(NOMAN)
+##### Pull in related .mk logic
 .include <bsd.man.mk>
-.endif
+.include <bsd.nls.mk>
+.include <bsd.files.mk>
+.include <bsd.inc.mk>
+.include <bsd.links.mk>
+.include <bsd.sys.mk>
+.include <bsd.dep.mk>
+
+${TARGETS}:	# ensure existence
+
+.endif	# HOSTPROG