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.269.2.4
retrieving revision 1.270
diff -u -p -r1.269.2.4 -r1.270
--- src/share/mk/bsd.prog.mk	2013/01/23 00:05:36	1.269.2.4
+++ src/share/mk/bsd.prog.mk	2011/11/05 22:56:31	1.270
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.269.2.4 2013/01/23 00:05:36 yamt Exp $
+#	$NetBSD: bsd.prog.mk,v 1.270 2011/11/05 22:56:31 christos Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -49,9 +49,6 @@ LDFLAGS+=	${PIE_LDFLAGS}
 .endif
 
 CFLAGS+=	${COPTS}
-.if defined(MKDEBUG) && (${MKDEBUG} != "no")
-CFLAGS+=	-g
-.endif
 OBJCFLAGS+=	${OBJCOPTS}
 MKDEP_SUFFIXES?=	.o .ln
 
@@ -110,7 +107,6 @@ LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
 	dns \
 	edit \
 	event \
-	expat \
 	fetch \
 	fl \
 	form \
@@ -250,6 +246,7 @@ PAM_STATIC_DPADD=
 	Xxf86misc \
 	Xxf86vm \
 	dps \
+	expat \
 	fntstubs \
 	fontcache \
 	fontconfig \
@@ -313,34 +310,24 @@ _CCLINK=	${CXX} ${_CCLINKFLAGS}
 
 .if defined(RUMPPRG)
 PROG=			${RUMPPRG}
-. ifndef CRUNCHEDPROG
-.  if (${MKRUMP} != "no")
+.ifndef CRUNCHEDPROG
 PROGS=			${RUMPPRG} rump.${RUMPPRG}
-.  else
-PROGS=			${RUMPPRG}
-.  endif
-.  if defined(SRCS)
-.   if (${MKRUMP} != "no")
+. if defined(SRCS)
 SRCS.rump.${PROG}:=	${SRCS} ${PROG}_rumpops.c ${RUMPSRCS}
-.   endif
 SRCS+=			${PROG}_hostops.c
-.  else
+. else
 SRCS=			${PROG}.c ${PROG}_hostops.c
-.   if (${MKRUMP} != "no")
 SRCS.rump.${PROG}=	${PROG}.c ${PROG}_rumpops.c ${RUMPSRCS}
-.   endif
-.  endif
-.   if (${MKRUMP} != "no")
+. endif
 DPSRCS+=		${PROG}_rumpops.c ${RUMPSRCS}
 LDADD.rump.${PROG}+=	-lrumpclient
 DPADD.rump.${PROG}+=	${LIBRUMPCLIENT}
 MAN.rump.${PROG}=	# defined but feeling empty
 _RUMPINSTALL.rump.${PROG}=# defined
-.   endif
-. else # CRUNCHEDPROG
+.else # CRUNCHEDPROG
 PROGS=			${PROG}
 CPPFLAGS+=		-DCRUNCHOPS
-. endif
+.endif
 .endif
 
 .if defined(PROG)
@@ -375,17 +362,12 @@ PROGS=		${PROG}
 # Per-program definitions and targets.
 #
 
-_CCLINK.CDEFAULT= ${CC} ${_CCLINKFLAGS}
 # Definitions specific to C programs.
 .for _P in ${PROGS}
 SRCS.${_P}?=	${_P}.c
 _CCLINK.${_P}=	${CC} ${_CCLINKFLAGS}
-_CFLAGS.${_P}=	${CFLAGS} ${CPUFLAGS}
-_CPPFLAGS.${_P}=	${CPPFLAGS}
-_COPTS.${_P}=	${COPTS}
 .endfor
 
-_CCLINK.CXXDEFAULT= ${CXX} ${_CCLINKFLAGS}
 # Definitions specific to C++ programs.
 .for _P in ${PROGS_CXX}
 SRCS.${_P}?=	${_P}.cc
@@ -408,14 +390,13 @@ PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
 
 ##### PROG specific flags.
 
-_DPADD.${_P}=		${DPADD}    ${DPADD.${_P}}
 _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
+SRCS+=		${SRCS.${_P}} # For bsd.dep.mk
 .endif
 
 _YPSRCS.${_P}=	${SRCS.${_P}:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS.${_P}:M*.y:.y=.h}}
@@ -431,58 +412,9 @@ LOBJS.${_P}+=	${LSRCS:.c=.ln} ${SRCS.${_
 .if defined(OBJS.${_P}) && !empty(OBJS.${_P})			# {
 .NOPATH: ${OBJS.${_P}} ${_P} ${_YPSRCS.${_P}}
 
-.if (defined(USE_COMBINE) && ${USE_COMBINE} != "no" && !commands(${_P}) \
-   && (${_CCLINK.${_P}} == ${_CCLINK.CDEFAULT} \
-       || ${_CCLINK.${_P}} == ${_CCLINK.CXXDEFAULT}) \
-   && !defined(NOCOMBINE.${_P}) && !defined(NOCOMBINE))
-.for f in ${SRCS.${_P}:N*.h:N*.sh:N*.fth:C/\.[yl]$/.c/g}
-#_XFLAGS.$f := ${CPPFLAGS.$f:D1} ${CPUFLAGS.$f:D2} \
-#     ${COPTS.$f:D3} ${OBJCOPTS.$f:D4} ${CXXFLAGS.$f:D5}
-.if (${CPPFLAGS.$f:D1} == "1" || ${CPUFLAGS.$f:D2} == "2" \
-     || ${COPTS.$f:D3} == "3" || ${OBJCOPTS.$f:D4} == "4" \
-     || ${CXXFLAGS.$f:D5} == "5") \
-    || ("${f:M*.[cyl]}" == "" || commands(${f:R:S/$/.o/}))
-XOBJS.${_P}+=	${f:R:S/$/.o/}
-.else
-XSRCS.${_P}+=	${f}
-NODPSRCS+=	${f}
-.endif
-.endfor
-
-${_P}: .gdbinit ${LIBCRT0} ${XOBJS.${_P}} ${SRCS.${_P}} ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
-	${_MKTARGET_LINK}
-.if defined(DESTDIR)
-	${_CCLINK.${_P}} -Wl,-nostdlib \
-	    ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} \
-	    -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
-	    -MD --combine ${_CPPFLAGS.${_P}} ${_CFLAGS.${_P}} ${_COPTS.${_P}} \
-	    ${XSRCS.${_P}:@.SRC.@${.ALLSRC:M*.c:M*${.SRC.}}@:O:u} ${XOBJS.${_P}} \
-	    ${_LDADD.${_P}} -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib
-.else
-	${_CCLINK.${_P}} ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} \
-	    -MD --combine ${_CPPFLAGS.${_P}} ${_COPTS.${_P}}
-	    ${XSRCS.${_P}:@.SRC.@${.ALLSRC:M*.c:M*${.SRC.}}@:O:u} ${XOBJS.${_P}} \
-	    ${_LDADD.${_P}}
-.endif	# defined(DESTDIR)
-.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
-
-CLEANFILES+=	${_P}.d
-.if exists(${_P}.d)
-.include "${_P}.d"		# include -MD depend for program.
-.endif
-.else	# USE_COMBINE
-
 ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
 
-${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
+${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
 .if !commands(${_P})
 	${_MKTARGET_LINK}
 	${_CCLINK.${_P}} \
@@ -499,9 +431,8 @@ ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
 	${OBJCOPY} -R .ident ${.TARGET}
 .endif
 .endif	# !commands(${_P})
-.endif	# USE_COMBINE
 
-${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
+${_P}.ro: ${OBJS.${_P}} ${DPADD}
 	${_MKTARGET_LINK}
 	${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}