diff options
| author | nakayama <nakayama@NetBSD.org> | 2009-12-13 05:01:32 +0000 |
|---|---|---|
| committer | nakayama <nakayama@NetBSD.org> | 2009-12-13 05:01:32 +0000 |
| commit | 1c54a66d9956e2ed3dd2f5058fb3c2113d5fb129 (patch) | |
| tree | 1fbd9b1a36351adcbf9fe2801abbab2fb4f68632 | |
| parent | f97268b43d9b78617e8a4ea2c979d54f337ccbf8 (diff) | |
System utilities, boot programs and kernel modules are machine
(port) specific not CPU, so use MACHINE not MACHINE_ARCH.
| -rw-r--r-- | sbin/disklabel/Makefile | 4 | ||||
| -rw-r--r-- | sbin/edlabel/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/boot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/stand/Makefile | 4 | ||||
| -rw-r--r-- | sys/modules/compat_sunos/Makefile | 6 | ||||
| -rw-r--r-- | sys/modules/compat_sunos32/Makefile | 6 | ||||
| -rw-r--r-- | usr.sbin/apm/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/apmd/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/eeprom/Makefile | 8 | ||||
| -rw-r--r-- | usr.sbin/ofctl/Makefile | 6 | ||||
| -rw-r--r-- | usr.sbin/screenblank/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/tadpolectl/Makefile | 4 |
14 files changed, 33 insertions, 33 deletions
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile index 601480d5efb..fccbed91fe8 100644 --- a/sbin/disklabel/Makefile +++ b/sbin/disklabel/Makefile @@ -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 diff --git a/sbin/edlabel/Makefile b/sbin/edlabel/Makefile index 7ca0796ef4c..791091a2f09 100644 --- a/sbin/edlabel/Makefile +++ b/sbin/edlabel/Makefile @@ -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} diff --git a/sys/arch/Makefile b/sys/arch/Makefile index 4dc2ecea17c..08d617c30d0 100644 --- a/sys/arch/Makefile +++ b/sys/arch/Makefile @@ -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) diff --git a/sys/arch/sparc/stand/Makefile b/sys/arch/sparc/stand/Makefile index 8be4b0a334f..e3579e854d9 100644 --- a/sys/arch/sparc/stand/Makefile +++ b/sys/arch/sparc/stand/Makefile @@ -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 diff --git a/sys/arch/sparc/stand/boot/Makefile b/sys/arch/sparc/stand/boot/Makefile index efdab09655b..313356f66e5 100644 --- a/sys/arch/sparc/stand/boot/Makefile +++ b/sys/arch/sparc/stand/boot/Makefile @@ -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 diff --git a/sys/arch/sparc64/stand/Makefile b/sys/arch/sparc64/stand/Makefile index ee31edfc980..7758a2b1067 100644 --- a/sys/arch/sparc64/stand/Makefile +++ b/sys/arch/sparc64/stand/Makefile @@ -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 diff --git a/sys/modules/compat_sunos/Makefile b/sys/modules/compat_sunos/Makefile index 23356350507..cd7e8c53f63 100644 --- a/sys/modules/compat_sunos/Makefile +++ b/sys/modules/compat_sunos/Makefile @@ -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 diff --git a/sys/modules/compat_sunos32/Makefile b/sys/modules/compat_sunos32/Makefile index 3dd04ac633d..49140393849 100644 --- a/sys/modules/compat_sunos32/Makefile +++ b/sys/modules/compat_sunos32/Makefile @@ -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 diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile index 16a60bde277..c2eb4df8d35 100644 --- a/usr.sbin/apm/Makefile +++ b/usr.sbin/apm/Makefile @@ -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 diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile index 0cf351846f6..fe467da3198 100644 --- a/usr.sbin/apmd/Makefile +++ b/usr.sbin/apmd/Makefile @@ -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 diff --git a/usr.sbin/eeprom/Makefile b/usr.sbin/eeprom/Makefile index 7329486f0da..0ab90e32b53 100644 --- a/usr.sbin/eeprom/Makefile +++ b/usr.sbin/eeprom/Makefile @@ -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 diff --git a/usr.sbin/ofctl/Makefile b/usr.sbin/ofctl/Makefile index b53379ee40c..654bee2e894 100644 --- a/usr.sbin/ofctl/Makefile +++ b/usr.sbin/ofctl/Makefile @@ -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 diff --git a/usr.sbin/screenblank/Makefile b/usr.sbin/screenblank/Makefile index 03d88bc2485..481f7411997 100644 --- a/usr.sbin/screenblank/Makefile +++ b/usr.sbin/screenblank/Makefile @@ -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 diff --git a/usr.sbin/tadpolectl/Makefile b/usr.sbin/tadpolectl/Makefile index 001b34da89a..28a2a388882 100644 --- a/usr.sbin/tadpolectl/Makefile +++ b/usr.sbin/tadpolectl/Makefile @@ -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 |
