Module Name: src
Committed By: nakayama
Date: Sun Dec 13 05:01:34 UTC 2009
Modified Files:
src/sbin/disklabel: Makefile
src/sbin/edlabel: Makefile
src/sys/arch: Makefile
src/sys/arch/sparc/stand: Makefile
src/sys/arch/sparc/stand/boot: Makefile
src/sys/arch/sparc64/stand: Makefile
src/sys/modules/compat_sunos: Makefile
src/sys/modules/compat_sunos32: Makefile
src/usr.sbin/apm: Makefile
src/usr.sbin/apmd: Makefile
src/usr.sbin/eeprom: Makefile
src/usr.sbin/ofctl: Makefile
src/usr.sbin/screenblank: Makefile
src/usr.sbin/tadpolectl: Makefile
Log Message:
System utilities, boot programs and kernel modules are machine
(port) specific not CPU, so use MACHINE not MACHINE_ARCH.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sbin/disklabel/Makefile
cvs rdiff -u -r1.17 -r1.18 src/sbin/edlabel/Makefile
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/Makefile
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/stand/Makefile
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/sparc/stand/boot/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc64/stand/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/compat_sunos/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/compat_sunos32/Makefile
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/apm/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/apmd/Makefile
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/eeprom/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/ofctl/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/screenblank/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/tadpolectl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/disklabel/Makefile
diff -u src/sbin/disklabel/Makefile:1.65 src/sbin/disklabel/Makefile:1.66
--- src/sbin/disklabel/Makefile:1.65 Sat Dec 5 16:29:11 2009
+++ src/sbin/disklabel/Makefile Sun Dec 13 05:01:32 2009
@@ -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 @@
.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
Index: src/sbin/edlabel/Makefile
diff -u src/sbin/edlabel/Makefile:1.17 src/sbin/edlabel/Makefile:1.18
--- src/sbin/edlabel/Makefile:1.17 Mon Feb 16 13:38:21 2009
+++ src/sbin/edlabel/Makefile Sun Dec 13 05:01:32 2009
@@ -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}
Index: src/sys/arch/Makefile
diff -u src/sys/arch/Makefile:1.39 src/sys/arch/Makefile:1.40
--- src/sys/arch/Makefile:1.39 Sat Dec 5 16:29:12 2009
+++ src/sys/arch/Makefile Sun Dec 13 05:01:33 2009
@@ -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 @@
SUBDIR+= ${ARCHSUBDIR}
.endif
.endif
-.if ${MACHINE_ARCH} == sparc
+.if ${MACHINE} == sparc
SUBDIR+= sparc64
.endif
.if (${MACHINE} == hpcmips || ${MACHINE} == hpcsh)
Index: src/sys/arch/sparc/stand/Makefile
diff -u src/sys/arch/sparc/stand/Makefile:1.21 src/sys/arch/sparc/stand/Makefile:1.22
--- src/sys/arch/sparc/stand/Makefile:1.21 Sat Feb 14 13:52:51 2009
+++ src/sys/arch/sparc/stand/Makefile Sun Dec 13 05:01:33 2009
@@ -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
Index: src/sys/arch/sparc/stand/boot/Makefile
diff -u src/sys/arch/sparc/stand/boot/Makefile:1.35 src/sys/arch/sparc/stand/boot/Makefile:1.36
--- src/sys/arch/sparc/stand/boot/Makefile:1.35 Sat Feb 14 13:52:51 2009
+++ src/sys/arch/sparc/stand/boot/Makefile Sun Dec 13 05:01:33 2009
@@ -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 @@
.include "../Makefile.buildboot"
-.if ${MACHINE_ARCH} == sparc64
+.if ${MACHINE} == sparc64
CFLAGS+= -m32
LDFLAGS+= -m elf32_sparc
AFLAGS+= -Wa,-32
Index: src/sys/arch/sparc64/stand/Makefile
diff -u src/sys/arch/sparc64/stand/Makefile:1.8 src/sys/arch/sparc64/stand/Makefile:1.9
--- src/sys/arch/sparc64/stand/Makefile:1.8 Sat Feb 14 13:56:41 2009
+++ src/sys/arch/sparc64/stand/Makefile Sun Dec 13 05:01:34 2009
@@ -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
Index: src/sys/modules/compat_sunos/Makefile
diff -u src/sys/modules/compat_sunos/Makefile:1.3 src/sys/modules/compat_sunos/Makefile:1.4
--- src/sys/modules/compat_sunos/Makefile:1.3 Sat Feb 14 13:56:41 2009
+++ src/sys/modules/compat_sunos/Makefile Sun Dec 13 05:01:34 2009
@@ -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 @@
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
Index: src/sys/modules/compat_sunos32/Makefile
diff -u src/sys/modules/compat_sunos32/Makefile:1.3 src/sys/modules/compat_sunos32/Makefile:1.4
--- src/sys/modules/compat_sunos32/Makefile:1.3 Sat Feb 14 13:56:41 2009
+++ src/sys/modules/compat_sunos32/Makefile Sun Dec 13 05:01:34 2009
@@ -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 @@
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
Index: src/usr.sbin/apm/Makefile
diff -u src/usr.sbin/apm/Makefile:1.16 src/usr.sbin/apm/Makefile:1.17
--- src/usr.sbin/apm/Makefile:1.16 Sat Feb 14 13:56:41 2009
+++ src/usr.sbin/apm/Makefile Sun Dec 13 05:01:33 2009
@@ -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
Index: src/usr.sbin/apmd/Makefile
diff -u src/usr.sbin/apmd/Makefile:1.14 src/usr.sbin/apmd/Makefile:1.15
--- src/usr.sbin/apmd/Makefile:1.14 Wed Apr 22 15:23:02 2009
+++ src/usr.sbin/apmd/Makefile Sun Dec 13 05:01:33 2009
@@ -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
Index: src/usr.sbin/eeprom/Makefile
diff -u src/usr.sbin/eeprom/Makefile:1.15 src/usr.sbin/eeprom/Makefile:1.16
--- src/usr.sbin/eeprom/Makefile:1.15 Sat Feb 14 13:56:41 2009
+++ src/usr.sbin/eeprom/Makefile Sun Dec 13 05:01:33 2009
@@ -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 @@
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
Index: src/usr.sbin/ofctl/Makefile
diff -u src/usr.sbin/ofctl/Makefile:1.5 src/usr.sbin/ofctl/Makefile:1.6
--- src/usr.sbin/ofctl/Makefile:1.5 Sat Feb 14 13:56:42 2009
+++ src/usr.sbin/ofctl/Makefile Sun Dec 13 05:01:33 2009
@@ -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
Index: src/usr.sbin/screenblank/Makefile
diff -u src/usr.sbin/screenblank/Makefile:1.11 src/usr.sbin/screenblank/Makefile:1.12
--- src/usr.sbin/screenblank/Makefile:1.11 Wed Apr 22 15:23:08 2009
+++ src/usr.sbin/screenblank/Makefile Sun Dec 13 05:01:33 2009
@@ -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
Index: src/usr.sbin/tadpolectl/Makefile
diff -u src/usr.sbin/tadpolectl/Makefile:1.4 src/usr.sbin/tadpolectl/Makefile:1.5
--- src/usr.sbin/tadpolectl/Makefile:1.4 Sat Feb 14 13:56:42 2009
+++ src/usr.sbin/tadpolectl/Makefile Sun Dec 13 05:01:33 2009
@@ -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
