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 retrieving revision 1.184 retrieving revision 1.185 diff -u -p -r1.184 -r1.185 --- src/share/mk/bsd.prog.mk 2003/09/12 07:44:11 1.184 +++ src/share/mk/bsd.prog.mk 2003/09/13 02:52:05 1.185 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.184 2003/09/12 07:44:11 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 .include +.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++} @@ -97,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