14058 w: only build 64-bit version

Reviewed by: Andy Fiddaman <andy@omnios.org>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>

5 files changed, 24 insertions, 231 deletions

diff --git a/usr/src/cmd/w/Makefile b/usr/src/cmd/w/Makefile
index c04fc1c437..61769af023 100644
--- a/usr/src/cmd/w/Makefile
+++ b/usr/src/cmd/w/Makefile
@@ -19,45 +19,44 @@
 #
 # CDDL HEADER END
 #
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # cmd/w/Makefile
 
-PROG= w 
+PROG=	w
 
-include ../Makefile.cmd
+OBJS=	w.o
 
-ROOTLINK= $(ROOTBIN)/uptime
+SRCS=	$(OBJS:%.o=%.c)
 
-SED= sed
-DCFILE= $(PROG).dc
+include ../Makefile.cmd
+include ../Makefile.cmd.64
+include ../Makefile.ctf
 
-$(64ONLY)SUBDIRS= $(MACH)
-$(BUILD64)SUBDIRS += $(MACH64)
+ROOTLINK=	$(ROOTBIN)/uptime
 
-all	:=	TARGET = all
-install	:=	TARGET = install
-clean	:=	TARGET = clean
-clobber	:=	TARGET = clobber
-lint	:=	TARGET = lint
+FILEMODE=	4555
+
+SED=	sed
+DCFILE=	$(PROG).dc
 
 .KEEP_STATE:
 
-all: $(SUBDIRS) 
+all: $(PROG)
+
+install: all $(ROOTLINK)
 
-clean clobber lint:	$(SUBDIRS)
+$(PROG): $(OBJS)
+	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
+	$(POST_PROCESS)
 
-install:	$(SUBDIRS)
-	-$(RM) $(ROOTPROG) $(ROOTLINK)
-	-$(LN) $(ISAEXEC) $(ROOTPROG)
-	-$(LN) $(ISAEXEC) $(ROOTLINK)
+$(ROOTLINK):	$(ROOTPROG)
+	-$(RM) $@
+	-$(LN) $(ROOTPROG) $@
 
-$(SUBDIRS):	FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
+clean:
+	$(RM) $(OBJS)
 
 $(DCFILE):
 	$(RM) messages.po
@@ -65,6 +64,4 @@ $(DCFILE):
 	$(SED) -e '/^domain/d' messages.po > $@
 	$(RM) messages.po
 
-FRC:
-
 include ../Makefile.targ
diff --git a/usr/src/cmd/w/amd64/Makefile b/usr/src/cmd/w/amd64/Makefile
deleted file mode 100644
index 539860f566..0000000000
--- a/usr/src/cmd/w/amd64/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-PROG=	w
-
-OBJS=	w.o
-
-SRCS=	$(OBJS:%.o=../%.c)
-
-include ../../Makefile.cmd
-include ../../Makefile.cmd.64
-
-CFLAGS64	+= $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-parentheses
-
-ROOTLINK= $(ROOTBIN64)/uptime
-
-FILEMODE= 4555
-
-.KEEP_STATE:
-
-%.o:	../%.c
-	$(COMPILE.c) $<
-
-all: $(PROG)
-
-$(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-install: all $(ROOTLINK)
-
-$(ROOTLINK):	$(ROOTPROG64)
-	$(RM) $@
-	$(LN) $(ROOTPROG64) $@
-
-clean:
-	$(RM) $(OBJS)
-
-lint:
-	$(LINT.c) $(SRCS) $(LDLIBS)
-
-include ../../Makefile.targ
diff --git a/usr/src/cmd/w/i386/Makefile b/usr/src/cmd/w/i386/Makefile
deleted file mode 100644
index 55a9b448c2..0000000000
--- a/usr/src/cmd/w/i386/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# cmd/w/i386/Makefile
-#
-
-PROG=	w
-
-OBJS=	w.o
-
-SRCS=	$(OBJS:%.o=../%.c)
-
-include ../../Makefile.cmd
-
-CFLAGS	+= $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-parentheses
-
-lint	:= LINTFLAGS = -x
-
-ROOTLINK= $(ROOTBIN32)/uptime
-
-FILEMODE= 4555
-
-.KEEP_STATE:
-
-%.o:	../%.c
-	$(COMPILE.c) $<
-
-all: $(PROG)
-
-$(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-install: all $(ROOTLINK)
-
-$(ROOTLINK):	$(ROOTPROG32)
-	$(RM) $@
-	$(LN) $(ROOTPROG32) $@
-
-clean:
-	$(RM) $(OBJS)
-
-lint:
-	$(LINT.c) $(SRCS) $(LDLIBS)
-
-include ../../Makefile.targ
diff --git a/usr/src/cmd/w/sparcv9/Makefile b/usr/src/cmd/w/sparcv9/Makefile
deleted file mode 100644
index 0a72a73af1..0000000000
--- a/usr/src/cmd/w/sparcv9/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# cmd/w/sparcv9/Makefile
-#
-
-PROG=	w
-
-OBJS=	w.o
-
-SRCS=	$(OBJS:%.o=../%.c)
-
-include ../../Makefile.cmd
-include ../../Makefile.cmd.64
-
-CFLAGS64	+= $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-parentheses
-
-lint	:= LINTFLAGS64 = -x -m64
-
-ROOTLINK= $(ROOTBIN64)/uptime
-
-FILEMODE= 4555
-
-.KEEP_STATE:
-
-%.o:	../%.c
-	$(COMPILE.c) $<
-
-all: $(PROG)
-
-$(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-install: all $(ROOTLINK)
-
-$(ROOTLINK):	$(ROOTPROG64)
-	$(RM) $@
-	$(LN) $(ROOTPROG64) $@
-
-clean:
-	$(RM) $(OBJS)
-
-lint:
-	$(LINT.c) $(SRCS) $(LDLIBS)
-
-include ../../Makefile.targ
diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf
index dd8f8cfe49..b06b15424d 100644
--- a/usr/src/pkg/manifests/SUNWcs.mf
+++ b/usr/src/pkg/manifests/SUNWcs.mf
@@ -672,7 +672,6 @@ $(i386_ONLY)file path=usr/bin/$(ARCH32)/prstat mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/ps mode=0555
 file path=usr/bin/$(ARCH32)/savecore mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/setuname mode=0555
-$(i386_ONLY)file path=usr/bin/$(ARCH32)/uptime mode=4555
 file path=usr/bin/$(ARCH64)/amt mode=0555
 file path=usr/bin/$(ARCH64)/crle mode=0555
 file path=usr/bin/$(ARCH64)/decrypt mode=0555
@@ -686,7 +685,6 @@ file path=usr/bin/$(ARCH64)/prstat mode=0555
 file path=usr/bin/$(ARCH64)/ps mode=0555
 file path=usr/bin/$(ARCH64)/savecore mode=0555
 file path=usr/bin/$(ARCH64)/setuname mode=0555
-file path=usr/bin/$(ARCH64)/uptime mode=4555
 $(i386_ONLY)file path=usr/bin/addbadsec mode=0555
 file path=usr/bin/amt mode=0555
 file path=usr/bin/arch mode=0555
@@ -849,6 +847,7 @@ file path=usr/bin/userattr mode=0555
 file path=usr/bin/uuidgen mode=0555
 file path=usr/bin/vmstat mode=0555
 file path=usr/bin/vtfontcvt mode=0555
+file path=usr/bin/w mode=4555
 file path=usr/bin/which mode=0555
 file path=usr/bin/who mode=0555
 file path=usr/bin/wracct mode=0555
@@ -1409,10 +1408,8 @@ hardlink path=sbin/rc5 target=../sbin/rc0
 hardlink path=sbin/rc6 target=../sbin/rc0
 hardlink path=usr/bin/$(ARCH32)/encrypt target=decrypt
 hardlink path=usr/bin/$(ARCH32)/mac target=digest
-$(i386_ONLY)hardlink path=usr/bin/$(ARCH32)/w target=uptime
 hardlink path=usr/bin/$(ARCH64)/encrypt target=decrypt
 hardlink path=usr/bin/$(ARCH64)/mac target=digest
-hardlink path=usr/bin/$(ARCH64)/w target=uptime
 hardlink path=usr/bin/decrypt target=../../usr/lib/isaexec
 hardlink path=usr/bin/digest target=../../usr/lib/isaexec
 hardlink path=usr/bin/dispgid target=../../usr/bin/ckgid
@@ -1439,9 +1436,8 @@ hardlink path=usr/bin/red target=../../usr/bin/ed
 hardlink path=usr/bin/savecore target=../../usr/lib/isaexec
 hardlink path=usr/bin/setuname target=../../usr/lib/isaexec
 hardlink path=usr/bin/touch target=../../usr/bin/settime
-hardlink path=usr/bin/uptime target=../../usr/lib/isaexec
+hardlink path=usr/bin/uptime target=w
 hardlink path=usr/bin/vedit target=../has/bin/edit
-hardlink path=usr/bin/w target=../../usr/lib/isaexec
 hardlink path=usr/has/bin/ex target=edit
 hardlink path=usr/has/bin/pfsh target=../../bin/pfexec
 hardlink path=usr/has/bin/vedit target=edit