From 8b267ec022b41f7d1aaf81909bac5f857ae68880 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Thu, 17 Jan 2008 01:13:01 +0000
Subject: [PATCH] Use BUILDSYMLINKS from <bsd.files.mk> instead of custom copy
 rules for config_time.h and athhal_options.h.

Note: we still copy param.c because I'm told that we should still support
people editing that on a per-compile basis.
---
 sys/conf/Makefile.kern.inc                  | 9 ++++-----
 sys/contrib/dev/ath/netbsd/Makefile.ath.inc | 7 ++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sys/conf/Makefile.kern.inc b/sys/conf/Makefile.kern.inc
index eb9d60a055b9..353020dbf77e 100644
--- a/sys/conf/Makefile.kern.inc
+++ b/sys/conf/Makefile.kern.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.kern.inc,v 1.104 2007/11/29 01:39:27 jnemeth Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.105 2008/01/17 01:13:01 lukem Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -253,10 +253,7 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} $S/conf/newvers.sh $S/conf/osrelease.sh
 .endif
 
 .if !target(config_time.h)
-EXTRA_CLEAN+= config_time.h
-config_time.h: Makefile
-	${_MKTARGET_CREATE}
-	cp config_time.src config_time.h
+BUILDSYMLINKS+=	config_time.src config_time.h
 .endif
 
 .if defined(MEMORY_DISK_IMAGE)
@@ -468,6 +465,8 @@ CFLAGS+=	${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}}
 CPPFLAGS+=	${CPPFLAGS.${.IMPSRC:T}}
 CWARNFLAGS+=	${CWARNFLAGS.${.IMPSRC:T}}
 
+.include <bsd.files.mk>
+
 ##
 ## the end
 ##
diff --git a/sys/contrib/dev/ath/netbsd/Makefile.ath.inc b/sys/contrib/dev/ath/netbsd/Makefile.ath.inc
index 0d6ff50be1df..f8d393b0cce0 100644
--- a/sys/contrib/dev/ath/netbsd/Makefile.ath.inc
+++ b/sys/contrib/dev/ath/netbsd/Makefile.ath.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ath.inc,v 1.14 2007/04/08 09:36:31 scw Exp $
+#	$NetBSD: Makefile.ath.inc,v 1.15 2008/01/17 01:13:01 lukem Exp $
 
 # Rules for building a HAL on various platforms.  We put them here
 # to centralize them all in one place.
@@ -69,10 +69,7 @@ ATH_UUDEC?=	@${_MKSHMSG} "uudecode ${.CURDIR:T}/${.TARGET}"; \
 athhal.o: $S/contrib/dev/ath/public/${ATH_HAL}.hal.o.uu
 	${ATH_UUDEC}
 
-athhal_options.h: $S/contrib/dev/ath/public/${ATH_HAL}.opt_ah.h
-	${_MKSHECHO} cp $> ${.TARGET}
-	rm -f ${.TARGET}
-	cp $> ${.TARGET}
+BUILDSYMLINKS+=	$S/contrib/dev/ath/public/${ATH_HAL}.opt_ah.h athhal_options.h
 
 depend if_ath_cardbus.o if_ath_pci.o athrate-sample.o ath_netbsd.o ath.o ah_osdep.o: athhal_options.h