Index: src/pkgdefs/SUNWcsu/prototype_com =================================================================== --- src/pkgdefs/SUNWcsu/prototype_com (revision 1094) +++ src/pkgdefs/SUNWcsu/prototype_com (working copy) @@ -248,7 +248,7 @@ f none usr/bin/sed 555 root bin f none usr/bin/setfacl 555 root bin f none usr/bin/setpgrp 555 root sys -f none usr/bin/settime 555 root bin +l none usr/bin/settime=../../usr/bin/touch l none usr/bin/setuname=../../usr/lib/isaexec s none usr/bin/sh=../../sbin/sh f none usr/bin/shcomp 555 root bin @@ -281,7 +281,7 @@ f none usr/bin/tic 555 root bin f none usr/bin/time 555 root bin f none usr/bin/tip 4511 uucp bin -l none usr/bin/touch=../../usr/bin/settime +l none usr/bin/touch=../../usr/lib/isaexec f none usr/bin/tplot 555 root bin f none usr/bin/tput 555 root bin f none usr/bin/tr 555 root bin Index: src/pkgdefs/SUNWcsu/prototype_sparc =================================================================== --- src/pkgdefs/SUNWcsu/prototype_sparc (revision 1094) +++ src/pkgdefs/SUNWcsu/prototype_sparc (working copy) @@ -49,6 +49,7 @@ d none usr/bin/sparcv7 755 root bin f none usr/bin/sparcv7/ksh93 555 root bin l none usr/bin/sparcv7/rksh93=ksh93 +f none usr/bin/sparcv7/touch 555 root bin f none usr/bin/sparcv7/savecore 555 root bin d none usr/bin/sparcv9 755 root bin f none usr/bin/sparcv9/amt 555 root bin @@ -64,6 +65,7 @@ l none usr/bin/sparcv9/rksh93=ksh93 f none usr/bin/sparcv9/savecore 555 root bin f none usr/bin/sparcv9/setuname 555 root bin +f none usr/bin/sparcv9/touch 555 root bin f none usr/bin/sparcv9/uptime 4555 root bin l none usr/bin/sparcv9/w=uptime d none usr/kernel/drv/sparcv9 755 root sys Index: src/pkgdefs/SUNWcsu/prototype_i386 =================================================================== --- src/pkgdefs/SUNWcsu/prototype_i386 (revision 1094) +++ src/pkgdefs/SUNWcsu/prototype_i386 (working copy) @@ -59,6 +59,7 @@ l none usr/bin/i86/rksh93=ksh93 f none usr/bin/i86/savecore 555 root bin f none usr/bin/i86/setuname 555 root bin +f none usr/bin/i86/touch 555 root bin f none usr/bin/i86/uptime 4555 root bin l none usr/bin/i86/w=uptime f none usr/kernel/drv/dump 755 root sys @@ -116,6 +117,7 @@ l none usr/bin/amd64/rksh93=ksh93 f none usr/bin/amd64/savecore 555 root bin f none usr/bin/amd64/setuname 555 root bin +f none usr/bin/amd64/touch 555 root bin f none usr/bin/amd64/uptime 4555 root bin l none usr/bin/amd64/w=uptime d none usr/kernel/drv/amd64 755 root sys Index: src/cmd/touch/sparcv9/Makefile =================================================================== --- src/cmd/touch/sparcv9/Makefile (revision 0) +++ src/cmd/touch/sparcv9/Makefile (revision 0) @@ -0,0 +1,31 @@ +# +# 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 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# + +include ../Makefile.com +include ../../Makefile.cmd.64 + +install: all $(ROOTPROG64) Index: src/cmd/touch/sparc/Makefile =================================================================== --- src/cmd/touch/sparc/Makefile (revision 0) +++ src/cmd/touch/sparc/Makefile (revision 0) @@ -0,0 +1,30 @@ +# +# 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 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# + +include ../Makefile.com + +install: all $(ROOTPROG32) Index: src/cmd/touch/i386/Makefile =================================================================== --- src/cmd/touch/i386/Makefile (revision 0) +++ src/cmd/touch/i386/Makefile (revision 0) @@ -0,0 +1,30 @@ +# +# 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 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# + +include ../Makefile.com + +install: all $(ROOTPROG32) Index: src/cmd/touch/Makefile.com =================================================================== --- src/cmd/touch/Makefile.com (revision 0) +++ src/cmd/touch/Makefile.com (revision 0) @@ -0,0 +1,58 @@ +# +# 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 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# + +SHELL=/usr/bin/ksh93 + +PROG= touch +OBJS= $(PROG).o +SRCS= $(OBJS:%.o=../%.c) + +include ../../Makefile.cmd + +CFLAGS += $(CCVERBOSE) -xstrconst +CFLAGS64 += $(CCVERBOSE) -xstrconst +CPPFLAGS += -D_FILE_OFFSET_BITS=64 +C99MODE= $(C99_ENABLE) -D_XOPEN_SOURCE=600 -D__EXTENSIONS__=1 +LINTFLAGS64 += -errchk=longptr64 + +.KEEP_STATE: + +all: $(PROG) + +lint: lint_SRCS + +CLEANFILES += \ + $(PROG) + +clean: + $(RM) $(CLEANFILES) + +include ../../Makefile.targ + +%: ../%.c + $(LINK.c) -o $@ $< $(LDLIBS) + $(POST_PROCESS) Index: src/cmd/touch/amd64/Makefile =================================================================== --- src/cmd/touch/amd64/Makefile (revision 0) +++ src/cmd/touch/amd64/Makefile (revision 0) @@ -0,0 +1,31 @@ +# +# 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 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# + +include ../Makefile.com +include ../../Makefile.cmd.64 + +install: all $(ROOTPROG64) Index: src/cmd/touch/Makefile =================================================================== --- src/cmd/touch/Makefile (revision 1094) +++ src/cmd/touch/Makefile (working copy) @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# 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. @@ -20,30 +19,46 @@ # CDDL HEADER END # # -#ident "@(#)Makefile 1.13 05/06/08 SMI" -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# ident "%Z%%M% %I% %E% SMI" +# -PROG= touch +SHELL=/usr/bin/ksh93 -include ../Makefile.cmd +PROG= touch -CFLAGS += $(CCVERBOSE) XGETFLAGS += -a -x touch.xcl -CPPFLAGS += -D_FILE_OFFSET_BITS=64 +include ../Makefile.cmd + +SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) + +all := TARGET = all +install := TARGET = install +clean := TARGET = clean +clobber := TARGET = clobber +lint := TARGET = lint + .KEEP_STATE: -all: $(PROG) +all: $(SUBDIRS) -install: all $(ROOTPROG) - -$(RM) $(ROOTBIN)/settime - $(LN) -f $(ROOTPROG) $(ROOTBIN)/settime +clean clobber lint: $(SUBDIRS) -clean: +install: $(SUBDIRS) + builtin ln ; \ + builtin rm ; \ + rm -f "$(ROOTBIN)/settime" ; \ + ln -f "$(ROOTPROG)" "$(ROOTBIN)/settime" ; \ + rm -f "$(ROOTPROG)" ; \ + ln -f "$(ISAEXEC)" "$(ROOTPROG)" -lint: lint_PROG +$(SUBDIRS): FRC + @cd $@; pwd; $(MAKE) $(TARGET) +FRC: + include ../Makefile.targ