Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

System utilities, boot programs and kernel modules are machine 

(port) specific not CPU, so use MACHINE not MACHINE_ARCH.
This commit is contained in:
nakayama 2009-12-13 05:01:32 +00:00
parent f97268b43d
commit 1c54a66d99
14 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/disklabel/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.65 2009/12/05 16:29:11 pooka Exp $
# $NetBSD: Makefile,v 1.66 2009/12/13 05:01:32 nakayama Exp $
# @(#)Makefile 8.2 (Berkeley) 3/17/94
PROG= disklabel
@ -10,7 +10,7 @@ LDADD+= -lutil
.endif
# these have additional requirements on the alignment of a partition
.if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64") \
.if (${MACHINE} == "sparc") || (${MACHINE} == "sparc64") \
|| (${MACHINE} == "sun3")
CPPFLAGS+= -DSTRICT_CYLINDER_ALIGNMENT
.endif

4
sbin/edlabel/Makefile
View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.17 2009/02/16 13:38:21 is Exp $
# $NetBSD: Makefile,v 1.18 2009/12/13 05:01:32 nakayama Exp $
# edlabel (Edit Disk LABEL)
NOMAN= # defined
.if ${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k" || \
${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
PROG= edlabel
LDADD+=-lutil
DPADD+=${LIBUTIL}

4
sys/arch/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.39 2009/12/05 16:29:12 pooka Exp $
# $NetBSD: Makefile,v 1.40 2009/12/13 05:01:33 nakayama Exp $
# For now, we install the machine and arch includes, and symlink 'machine'
# to the location of the machine includes (usually).
@ -22,7 +22,7 @@ ARCHSUBDIR= powerpc
SUBDIR+= ${ARCHSUBDIR}
.endif
.endif
.if ${MACHINE_ARCH} == sparc
.if ${MACHINE} == sparc
SUBDIR+= sparc64
.endif
.if (${MACHINE} == hpcmips || ${MACHINE} == hpcsh)

4
sys/arch/sparc/stand/Makefile
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.21 2009/02/14 13:52:51 abs Exp $
# $NetBSD: Makefile,v 1.22 2009/12/13 05:01:33 nakayama Exp $
.if ${MACHINE_ARCH} == sparc
.if ${MACHINE} == sparc
SUBDIR= boot bootxx bootblk ofwboot binstall
.endif

4
sys/arch/sparc/stand/boot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.35 2009/02/14 13:52:51 abs Exp $
# $NetBSD: Makefile,v 1.36 2009/12/13 05:01:33 nakayama Exp $
STRIPFLAG=
PROGSOURCE= boot.c net.c netif_sun.c conf.c openfirm.c bootinfo.c \
@ -16,7 +16,7 @@ SAMISCMAKEFLAGS= SA_USE_CREAD=yes
.include "../Makefile.buildboot"
.if ${MACHINE_ARCH} == sparc64
.if ${MACHINE} == sparc64
CFLAGS+= -m32
LDFLAGS+= -m elf32_sparc
AFLAGS+= -Wa,-32

4
sys/arch/sparc64/stand/Makefile
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.8 2009/02/14 13:56:41 abs Exp $
# $NetBSD: Makefile,v 1.9 2009/12/13 05:01:34 nakayama Exp $
.if ${MACHINE_ARCH} == sparc64
.if ${MACHINE} == sparc64
SUBDIR= ../../sparc/stand/ofwboot
SUBDIR+=../../sparc/stand/bootblk
SUBDIR+=../../sparc/stand/binstall

6
sys/modules/compat_sunos/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2009/02/14 13:56:41 abs Exp $
# $NetBSD: Makefile,v 1.4 2009/12/13 05:01:34 nakayama Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@ -12,12 +12,12 @@ CPPFLAGS+= -DEXEC_AOUT
SRCS+= sunos_exec.c sunos_ioctl.c sunos_mod.c sunos_sysent.c
SRCS+= sunos_exec_aout.c sunos_misc.c sunos_syscalls.c
.if ${MACHINE_ARCH} == "sparc64"
.if ${MACHINE} == "sparc64"
.PATH: ${S}/arch/sparc64/sparc64
SRCS+= sunos_machdep.c
.endif
.if ${MACHINE_ARCH} == "sparc"
.if ${MACHINE} == "sparc"
.PATH: ${S}/arch/sparc/sparc
SRCS+= sunos_machdep.c
.endif

6
sys/modules/compat_sunos32/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2009/02/14 13:56:41 abs Exp $
# $NetBSD: Makefile,v 1.4 2009/12/13 05:01:34 nakayama Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@ -12,12 +12,12 @@ CPPFLAGS+= -DCOMPAT_SUNOS32 -DEXEC_AOUT
SRCS+= sunos32_exec.c sunos32_ioctl.c sunos32_mod.c sunos32_sysent.c
SRCS+= sunos32_exec_aout.c sunos32_misc.c sunos32_syscalls.c
.if ${MACHINE_ARCH} == "sparc64"
.if ${MACHINE} == "sparc64"
.PATH: ${S}/arch/sparc64/sparc64
SRCS+= sunos32_machdep.c
.endif
.if ${MACHINE_ARCH} == "sparc"
.if ${MACHINE} == "sparc"
.PATH: ${S}/arch/sparc/sparc
SRCS+= sunos32_machdep.c
.endif

4
usr.sbin/apm/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.16 2009/02/14 13:56:41 abs Exp $
# $NetBSD: Makefile,v 1.17 2009/12/13 05:01:33 nakayama Exp $
.include <bsd.own.mk>
@ -7,7 +7,7 @@
${MACHINE} == "hpcmips" || \
${MACHINE} == "hpcsh" || \
${MACHINE} == "macppc" || \
${MACHINE_ARCH} == "sparc" || \
${MACHINE} == "sparc" || \
${MACHINE} == "zaurus")
PROG= apm
SRCS= apm.c apmsubr.c

4
usr.sbin/apmd/Makefile
View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.14 2009/04/22 15:23:02 lukem Exp $
# $NetBSD: Makefile,v 1.15 2009/12/13 05:01:33 nakayama Exp $
.if (${MACHINE_ARCH} == "i386" || \
${MACHINE} == "hpcmips" || \
${MACHINE} == "hpcsh" || \
${MACHINE} == "macppc" || \
${MACHINE_ARCH} == "sparc" || \
${MACHINE} == "sparc" || \
${MACHINE} == "zaurus")
PROG= apmd
SRCS= apmd.c apmsubr.c

8
usr.sbin/eeprom/Makefile
View File

@ -1,8 +1,8 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
# $NetBSD: Makefile,v 1.15 2009/02/14 13:56:41 abs Exp $
# $NetBSD: Makefile,v 1.16 2009/12/13 05:01:33 nakayama Exp $
.if ${MACHINE} == "sun3" || ${MACHINE} == "sun3x" \
|| ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" \
|| ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" \
|| ${MACHINE} == "macppc" || ${MACHINE} == "prep"
PROG= eeprom
@ -10,11 +10,11 @@ SRCS= main.c
LDADD+=-lutil
DPADD+=${LIBUTIL}
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
SRCS+= ophandlers.c
.endif
.if ${MACHINE} == "sun3" || ${MACHINE} == "sun3x" || ${MACHINE_ARCH} == "sparc"
.if ${MACHINE} == "sun3" || ${MACHINE} == "sun3x" || ${MACHINE} == "sparc"
SRCS+= eehandlers.c
.endif

6
usr.sbin/ofctl/Makefile
View File

@ -1,8 +1,8 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
# $NetBSD: Makefile,v 1.5 2009/02/14 13:56:42 abs Exp $
# $NetBSD: Makefile,v 1.6 2009/12/13 05:01:33 nakayama Exp $
.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE} == "macppc" \
|| ${MACHINE} == "shark" || ${MACHINE_ARCH} == "sparc"
.if ${MACHINE} == "sparc64" || ${MACHINE} == "macppc" \
|| ${MACHINE} == "shark" || ${MACHINE} == "sparc"
PROG= ofctl

4
usr.sbin/screenblank/Makefile
View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.11 2009/04/22 15:23:08 lukem Exp $
# $NetBSD: Makefile,v 1.12 2009/12/13 05:01:33 nakayama Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.if ${MACHINE} == "pmax" || ${MACHINE} == "sun3" || ${MACHINE} == "sun3x" \
|| ${MACHINE_ARCH} == "sparc" || ${MACHINE} == "amiga"
|| ${MACHINE} == "sparc" || ${MACHINE} == "amiga"
CPPFLAGS+=-DHAVE_FBIO
.endif

4
usr.sbin/tadpolectl/Makefile
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.4 2009/02/14 13:56:42 abs Exp $
# $NetBSD: Makefile,v 1.5 2009/12/13 05:01:33 nakayama Exp $
.if ${MACHINE_ARCH} == "sparc"
.if ${MACHINE} == "sparc"
PROG= tadpolectl
SRCS= tadpolectl.c
.endif