diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-27 05:05:23 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-27 05:05:23 +0000 |
| commit | 1b69978d60a42b9aa2d17f80177786b00ba98262 (patch) | |
| tree | 9ba5bf3ff063763b40e9d34bea27e1261665e4f0 /sys/arch/amd64/conf/Makefile.amd64 | |
| parent | 95c0b1557b471ebea0eee6d72753f60d88719eb3 (diff) | |
over the years we have moved to a machine+architectures scheme that has
two directories. in reality, because of how we place files, it has four:
.../arch/A, .../arch/A/A, .../arch/M, and .../arch/M/M
formalize this A/A and M/M scheme directly in the Makefiles, which makes
them a lot more similar
drahn likes the idea a lot
Diffstat (limited to 'sys/arch/amd64/conf/Makefile.amd64')
| -rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index ddefa3e93a7..0e2b7a49ebd 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.28 2010/04/27 04:31:45 deraadt Exp $ +# $OpenBSD: Makefile.amd64,v 1.29 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -157,11 +157,11 @@ links: sed 's,.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink makelinks -AFILES= ${_machdir}/amd64/locore.S ${_machdir}/amd64/vector.S ${_machdir}/amd64/copy.S \ - ${_machdir}/amd64/spl.S +AFILES= ${_machdir}/${_mach}/locore.S ${_machdir}/${_mach}/vector.S ${_machdir}/${_mach}/copy.S \ + ${_machdir}/${_mach}/spl.S SRCS= param.c ioconf.c ${AFILES} ${CFILES} ${SFILES} depend:: .depend -.depend: ${SRCS} assym.h param.c ${APMINC} ${DB_STRUCTINFO} +.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -176,16 +176,16 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@ rm -f db_structinfo.o -locore.o: ${_machdir}/amd64/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} -vector.o: ${_machdir}/amd64/vector.S assym.h +vector.o: ${_machdir}/${_mach}/vector.S assym.h ${NORMAL_S} -copy.o: ${_machdir}/amd64/copy.S assym.h +copy.o: ${_machdir}/${_mach}/copy.S assym.h ${NORMAL_S} -spl.o: ${_machdir}/amd64/spl.S assym.h +spl.o: ${_machdir}/${_mach}/spl.S assym.h ${NORMAL_S} # The install target can be redefined by putting a |