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.176
retrieving revision 1.185
diff -u -p -r1.176 -r1.185
--- src/share/mk/bsd.prog.mk	2003/07/28 07:03:44	1.176
+++ src/share/mk/bsd.prog.mk	2003/09/13 02:52:05	1.185
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.176 2003/07/28 07:03:44 lukem Exp $
+#	$NetBSD: bsd.prog.mk,v 1.185 2003/09/13 02:52:05 erh Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -7,11 +7,21 @@
 .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}}
+
 ##### Default values
 CPPFLAGS+=	${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
 CXXFLAGS+=	${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
@@ -57,12 +67,31 @@ __bsd_prog_mk_system_libs?= \
 .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
 
+##### 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
@@ -78,10 +107,6 @@ CLEANFILES+=strings
 	@rm -f x.cc
 .endif
 
-.if defined(PROG_CXX)
-PROG=	${PROG_CXX}
-.endif
-
 .if defined(PROG)
 .if defined(PROG_CXX)
 SRCS?=		${PROG}.cc
@@ -89,8 +114,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}
@@ -111,7 +138,7 @@ LIBCRT0=	${DESTDIR}/lib/crt0.o
 .endif
 .if ${SHLIBDIR} != ${LIBDIR}
 _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
-		-R${SHLIBDIR} -R/usr/lib \
+		-R${SHLIBDIR} \
 		-L${DESTDIR}${SHLIBDIR}
 .elif ${SHLIBINSTALLDIR} != ${LIBDIR}
 _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \
@@ -120,7 +147,7 @@ _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}
 
 .if defined(PROG_CXX)
 _CCLINK=	${CXX}
-.if ${MKCXXSUPCXX} != "no"
+.if ${USE_LIBSTDCXX} == "no"
 _SUPCXX=	-lsupc++ -lm
 .else
 _SUPCXX=	-lstdc++ -lm
@@ -140,21 +167,20 @@ _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})
+.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}
-.endif
-
 .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)
@@ -258,8 +284,8 @@ 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