diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-26 22:11:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-26 22:11:39 +0000 |
| commit | cf73c4ff4bd72c5b565aa20b4d28e922b49c282a (patch) | |
| tree | 47f31973b2218f31aa239bf603f7e139c6f6e20f /sys/arch/aviion | |
| parent | a76c37785eb21eb31565d5c29545230eb5eafee4 (diff) | |
next step towards unification: make all the genassym chunks handle both
arch and machine dependent files (and add the missing files)
ok miod drahn
Diffstat (limited to 'sys/arch/aviion')
| -rw-r--r-- | sys/arch/aviion/aviion/genassym.cf | 1 | ||||
| -rw-r--r-- | sys/arch/aviion/conf/Makefile.aviion | 15 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/arch/aviion/aviion/genassym.cf b/sys/arch/aviion/aviion/genassym.cf new file mode 100644 index 00000000000..679dcad021f --- /dev/null +++ b/sys/arch/aviion/aviion/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.1 2010/04/26 22:11:38 deraadt Exp $ diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion index f27b4a05b1f..db9dfb27caa 100644 --- a/sys/arch/aviion/conf/Makefile.aviion +++ b/sys/arch/aviion/conf/Makefile.aviion @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.aviion,v 1.12 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.aviion,v 1.13 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -111,9 +111,11 @@ LINKFLAGS+= -x %LOAD -assym.h: $S/kern/genassym.sh ${_archdir}/m88k/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${_archdir}/m88k/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 @@ -162,8 +164,9 @@ depend:: .depend .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_archdir}/m88k/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 |