summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf/Makefile.amd64
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/amd64/conf/Makefile.amd64')
-rw-r--r--sys/arch/amd64/conf/Makefile.amd6415
1 files changed, 9 insertions, 6 deletions
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 1744453e6e2..4f958ee1f24 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.amd64,v 1.24 2010/04/26 21:46:36 deraadt Exp $
+# $OpenBSD: Makefile.amd64,v 1.25 2010/04/26 22:11:37 deraadt Exp $
# This makefile is constructed from a machine description:
# config machineid
@@ -112,9 +112,11 @@ LINKFLAGS+= -S -x
%LOAD
-assym.h: $S/kern/genassym.sh ${_machdir}/amd64/genassym.cf Makefile
- sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \
- ${PARAM} < ${_machdir}/amd64/genassym.cf > assym.h.tmp && \
+assym.h: $S/kern/genassym.sh Makefile \
+ ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf
+ cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \
+ sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \
+ sort -u > assym.h.tmp && \
mv -f assym.h.tmp assym.h
param.c: $S/conf/param.c
@@ -163,8 +165,9 @@ depend:: .depend
${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
- sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
- ${CPPFLAGS} ${PARAM} < ${_machdir}/amd64/genassym.cf
+ cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \
+ sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \
+ sort -u > assym.dep
@sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \
< assym.dep >> .depend
@rm -f assym.dep