diff options
author | peter <peter@FreeBSD.org> | 2000-01-07 05:12:12 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-01-07 05:12:12 +0000 |
commit | b06ae99df1a54361b9f152804f4c929c3fde8f66 (patch) | |
tree | 9ddd4dbf02ed41be39bc8cad8cbeb7f2be2555b8 /sys/i386/conf | |
parent | 43392f74a4328274c4d37b24b1d4481288e9dab7 (diff) | |
download | FreeBSD-src-b06ae99df1a54361b9f152804f4c929c3fde8f66.zip FreeBSD-src-b06ae99df1a54361b9f152804f4c929c3fde8f66.tar.gz |
Bring the Alpha and x86 Makefiles closer together.
Diffstat (limited to 'sys/i386/conf')
-rw-r--r-- | sys/i386/conf/Makefile.i386 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index 53e6308..4f63bd5 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -31,7 +31,7 @@ S= ./@ S= ../.. .endif .endif -I386= ${S}/i386 +M= ${MACHINE} SIZE?= size @@ -81,13 +81,13 @@ NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} $< NORMAL_S= ${CC} -c ${ASM_CFLAGS} $< PROFILE_C= ${CC} -c ${CFLAGS} $< -GEN_CFILES= ${I386}/i386/genassym.c +GEN_CFILES= $S/$M/$M/genassym.c # setdef0.c and setdef1.c are intentionally # omitted from SYSTEM_CFILES. They include setdefs.h, a header which # is generated from all of ${OBJS}. We don't want to have to compile # everything just to do a make depend. SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c -SYSTEM_SFILES= ${I386}/i386/locore.s +SYSTEM_SFILES= $S/$M/$M/locore.s SYSTEM_DEP= Makefile ${SYSTEM_OBJS} .if ${KERNFORMAT} == aout || ${KERNFORMAT} == aoutkld @@ -99,11 +99,11 @@ SYSTEM_LD_TAIL= @${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET} .if ${KERNFORMAT} == elf SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ setdef1.o hack.So -SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/i386/conf/kernel.script \ +SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/$M/conf/kernel.script \ -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET} -SYSTEM_DEP+= $S/i386/conf/kernel.script +SYSTEM_DEP+= $S/$M/conf/kernel.script .endif %BEFORE_DEPEND @@ -129,7 +129,7 @@ ${KERNEL}: ${FULLKERNEL} objcopy --strip-debug ${FULLKERNEL} ${KERNEL} .else cp ${FULLKERNEL} ${KERNEL} - strip -aout -d ${KERNEL} + strip ${FMT} -d ${KERNEL} .endif .endif @@ -151,11 +151,11 @@ clean: #lint: /tmp param.c # @lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \ -# ${I386}/i386/Locore.c ${CFILES} ioconf.c param.c | \ +# $S/$M/$M/Locore.c ${CFILES} ioconf.c param.c | \ # grep -v 'struct/union .* never defined' | \ # grep -v 'possible pointer alignment problem' -locore.o: ${I386}/i386/locore.s assym.s +locore.o: $S/$M/$M/locore.s assym.s ${NORMAL_S} .if ${KERNFORMAT} == elf @@ -185,8 +185,8 @@ setdef0.c setdef1.c setdefs.h: ${OBJS} assym.s: genassym ./genassym >assym.s -genassym.o: ${I386}/i386/genassym.c - ${CC} -c ${GEN_CFLAGS} ${I386}/i386/genassym.c +genassym.o: $S/$M/$M/genassym.c + ${CC} -c ${GEN_CFLAGS} $S/$M/$M/genassym.c genassym: genassym.o ${CC} ${GEN_CFLAGS} genassym.o -o ${.TARGET} |