From cf73c4ff4bd72c5b565aa20b4d28e922b49c282a Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Mon, 26 Apr 2010 22:11:39 +0000 Subject: next step towards unification: make all the genassym chunks handle both arch and machine dependent files (and add the missing files) ok miod drahn --- sys/arch/macppc/conf/Makefile.macppc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'sys/arch/macppc/conf') diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc index bf0530dc187..0ac2947965a 100644 --- a/sys/arch/macppc/conf/Makefile.macppc +++ b/sys/arch/macppc/conf/Makefile.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.macppc,v 1.35 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.macppc,v 1.36 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -110,9 +110,11 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/macppc/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - < ${_machdir}/macppc/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 @@ -161,8 +163,9 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/macppc/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 -- cgit v1.2.3