diff options
| author | John Sonnenschein <John.Sonnenschein@Sun.COM> | 2008-09-08 16:56:19 -0700 |
|---|---|---|
| committer | John Sonnenschein <John.Sonnenschein@Sun.COM> | 2008-09-08 16:56:19 -0700 |
| commit | ed31198c686205a26320612d2a5dd7b26ae63a15 (patch) | |
| tree | 7733533dfa14b0bb6c4b1b8539d9a3d40202caf3 /usr/src | |
| parent | 7ddc9b1afd18f260b9fb78ec7732facd91769131 (diff) | |
| download | illumos-joyent-ed31198c686205a26320612d2a5dd7b26ae63a15.tar.gz | |
Contributed by Palle Lyckegaard <palle@lyckegaard.dk>
4930079 many Makefiles redefine "CP", causing problems for incrementals
Diffstat (limited to 'usr/src')
36 files changed, 68 insertions, 148 deletions
diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd index e2775eea27..96620e53b8 100644 --- a/usr/src/cmd/Makefile.cmd +++ b/usr/src/cmd/Makefile.cmd @@ -30,7 +30,6 @@ include $(SRC)/Makefile.master LN= ln -CP= cp SH= sh ECHO= echo MKDIR= mkdir diff --git a/usr/src/cmd/rpcsvc/Makefile b/usr/src/cmd/rpcsvc/Makefile index 02d143ac91..9fa6887c48 100644 --- a/usr/src/cmd/rpcsvc/Makefile +++ b/usr/src/cmd/rpcsvc/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # # cmd/rpcsvc/Makefile @@ -70,7 +69,6 @@ $(SPROG) := LDLIBS += -lrpcsvc $(TPROG) := LDLIBS += -lrpcsvc spray := LDLIBS += -lrpcsvc -CP= cp SUBDIRS= rpc.bootparamd nis/utils nis/bin nis/cachemgr nis/rpc.nisd \ nis/rpc.nispasswdd diff --git a/usr/src/lib/cfgadm_plugins/ac/Makefile b/usr/src/lib/cfgadm_plugins/ac/Makefile index 09d804f547..95e242d6c6 100644 --- a/usr/src/lib/cfgadm_plugins/ac/Makefile +++ b/usr/src/lib/cfgadm_plugins/ac/Makefile @@ -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. @@ -19,12 +18,11 @@ # # CDDL HEADER END # + # -# Copyright 2005 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" -# # lib/cfgadm_plugins/ac/Makefile include $(SRC)/Makefile.master @@ -48,7 +46,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile b/usr/src/lib/cfgadm_plugins/ib/Makefile index 822ed3efc5..542c3fb066 100644 --- a/usr/src/lib/cfgadm_plugins/ib/Makefile +++ b/usr/src/lib/cfgadm_plugins/ib/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../../Makefile.lib @@ -46,7 +45,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile b/usr/src/lib/cfgadm_plugins/pci/Makefile index 9a190d45f8..b16a8f9450 100644 --- a/usr/src/lib/cfgadm_plugins/pci/Makefile +++ b/usr/src/lib/cfgadm_plugins/pci/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../../../Makefile.master @@ -46,7 +45,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile b/usr/src/lib/cfgadm_plugins/sata/Makefile index 1187341292..5f9f32c9e8 100644 --- a/usr/src/lib/cfgadm_plugins/sata/Makefile +++ b/usr/src/lib/cfgadm_plugins/sata/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../../Makefile.lib @@ -46,7 +45,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile b/usr/src/lib/cfgadm_plugins/sbd/Makefile index 8d06b96e6a..2862630511 100644 --- a/usr/src/lib/cfgadm_plugins/sbd/Makefile +++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile @@ -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. @@ -19,11 +18,10 @@ # # CDDL HEADER END # + # -# Copyright (c) 1994-2000 by Sun Microsystems, Inc. -# All rights reserved. -# -#ident "%Z%%M% %I% %E% SMI" +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # lib/cfgadm_plugins/sbd/Makefile @@ -48,7 +46,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile b/usr/src/lib/cfgadm_plugins/scsi/Makefile index af85aa5804..cb93c53c20 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../../Makefile.lib @@ -47,7 +46,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile index bb5af78f28..b8bd5148d6 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # # lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile # @@ -48,7 +47,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile index 9d582057e8..7be087cc2e 100644 --- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile +++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile @@ -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. @@ -19,12 +18,11 @@ # # CDDL HEADER END # + # -# Copyright 2005 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" -# # lib/cfgadm_plugins/sysctrl/Makefile include $(SRC)/Makefile.master @@ -47,7 +45,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile b/usr/src/lib/cfgadm_plugins/usb/Makefile index c112dc38e3..981437b77e 100644 --- a/usr/src/lib/cfgadm_plugins/usb/Makefile +++ b/usr/src/lib/cfgadm_plugins/usb/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../../Makefile.lib @@ -46,7 +45,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile index 6a746338b2..8cbefdd330 100644 --- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile +++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile @@ -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. @@ -19,10 +18,9 @@ # # CDDL HEADER END # + # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # lib/gss_mechs/mech_dh/backend/Makefile @@ -42,7 +40,6 @@ POFILES = generic.po POFILE = mech_dh.po SED= sed -CP= cp GREP= grep all := TARGET= all diff --git a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile index 2506dc1ef6..15006b3deb 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile +++ b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile @@ -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. @@ -19,10 +18,9 @@ # # CDDL HEADER END # + # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # lib/gss_mechs/mech_dh/dh1024/Makefile @@ -34,7 +32,6 @@ SUBDIRS = $(MACH) $(BUILD64) $(MACH64) include ../../../Makefile.lib SED= sed -CP= cp GREP= grep all := TARGET= all diff --git a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile index d8cbc1ee74..adef19508b 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile +++ b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile @@ -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. @@ -19,10 +18,9 @@ # # CDDL HEADER END # + # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # lib/gss_mechs/mech_dh/dh192/Makefile @@ -34,7 +32,6 @@ SUBDIRS = $(MACH) $(BUILD64) $(MACH64) include ../../../Makefile.lib SED= sed -CP= cp GREP= grep all := TARGET= all diff --git a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile index 518b71278d..95bad6b558 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile +++ b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile @@ -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. @@ -19,10 +18,9 @@ # # CDDL HEADER END # + # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # lib/gss_mechs/mech_dh/dh640/Makefile @@ -34,7 +32,6 @@ SUBDIRS = $(MACH) $(BUILD64) $(MACH64) include ../../../Makefile.lib SED= sed -CP= cp GREP= grep all := TARGET= all diff --git a/usr/src/lib/libbsdmalloc/Makefile b/usr/src/lib/libbsdmalloc/Makefile index d608e0d064..7438442c4f 100644 --- a/usr/src/lib/libbsdmalloc/Makefile +++ b/usr/src/lib/libbsdmalloc/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../Makefile.lib @@ -47,7 +46,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libexacct/Makefile b/usr/src/lib/libexacct/Makefile index 146c6ddcf2..f09d2183a7 100644 --- a/usr/src/lib/libexacct/Makefile +++ b/usr/src/lib/libexacct/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2007 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" # include ../Makefile.lib @@ -48,7 +47,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libkstat/Makefile b/usr/src/lib/libkstat/Makefile index ac5f368ea9..c47983f30a 100644 --- a/usr/src/lib/libkstat/Makefile +++ b/usr/src/lib/libkstat/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../../Makefile.master @@ -48,7 +47,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/liblm/Makefile b/usr/src/lib/liblm/Makefile index e9b89465dd..5271fa9189 100644 --- a/usr/src/lib/liblm/Makefile +++ b/usr/src/lib/liblm/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../Makefile.lib @@ -47,7 +46,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libmail/Makefile b/usr/src/lib/libmail/Makefile index ae02621be1..cc83d1296c 100644 --- a/usr/src/lib/libmail/Makefile +++ b/usr/src/lib/libmail/Makefile @@ -18,12 +18,11 @@ # # CDDL HEADER END # + # -# Copyright 2006 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" -# include ../../Makefile.master include ../Makefile.lib @@ -46,7 +45,6 @@ POFILE= $(LIBRARY:.a=.po) POFILES= generic.po SED= sed -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libmalloc/Makefile b/usr/src/lib/libmalloc/Makefile index 7087b8cdde..6918eb42d4 100644 --- a/usr/src/lib/libmalloc/Makefile +++ b/usr/src/lib/libmalloc/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../Makefile.lib @@ -47,7 +46,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libmapmalloc/Makefile b/usr/src/lib/libmapmalloc/Makefile index 9adf3c57ee..4493f15bae 100644 --- a/usr/src/lib/libmapmalloc/Makefile +++ b/usr/src/lib/libmapmalloc/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../../Makefile.master @@ -48,7 +47,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libnls/Makefile b/usr/src/lib/libnls/Makefile index 612a27d6d5..f6f092cbee 100644 --- a/usr/src/lib/libnls/Makefile +++ b/usr/src/lib/libnls/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../../Makefile.master @@ -47,7 +46,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libproc/Makefile b/usr/src/lib/libproc/Makefile index 4d2553bc7b..1e42afebbb 100644 --- a/usr/src/lib/libproc/Makefile +++ b/usr/src/lib/libproc/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../Makefile.lib @@ -47,7 +46,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp # definitions for install_h target HDRS= libproc.h diff --git a/usr/src/lib/libprtdiag/sparc/sun4u/Makefile b/usr/src/lib/libprtdiag/sparc/sun4u/Makefile index b67715c346..a0ed81ff8d 100644 --- a/usr/src/lib/libprtdiag/sparc/sun4u/Makefile +++ b/usr/src/lib/libprtdiag/sparc/sun4u/Makefile @@ -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. @@ -19,12 +18,11 @@ # # CDDL HEADER END # + # -# Copyright 2005 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" -# # lib/libprtdiag/sparc/sun4u/Makefile # # Platform specific Makefile for libprtdiag. @@ -50,7 +48,6 @@ LDLIBS += -ldevinfo TEXT_DOMAIN= SUNW_OST_OSLIB SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libprtdiag/sparc/sun4v/Makefile b/usr/src/lib/libprtdiag/sparc/sun4v/Makefile index fea2914426..67d4763704 100644 --- a/usr/src/lib/libprtdiag/sparc/sun4v/Makefile +++ b/usr/src/lib/libprtdiag/sparc/sun4v/Makefile @@ -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. @@ -19,12 +18,11 @@ # # CDDL HEADER END # + # -# Copyright 2005 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" -# # lib/libprtdiag/sparc/sun4v/Makefile # # Platform specific Makefile for libprtdiag. @@ -49,7 +47,6 @@ LDLIBS += -lpicl -lm TEXT_DOMAIN= SUNW_OST_OSLIB SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libresolv2/Makefile b/usr/src/lib/libresolv2/Makefile index b70fae546f..6ec3465251 100644 --- a/usr/src/lib/libresolv2/Makefile +++ b/usr/src/lib/libresolv2/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../../Makefile.master @@ -63,7 +62,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libresolv2/cylink/Makefile b/usr/src/lib/libresolv2/cylink/Makefile index 0ece5bae46..6796c5c97b 100644 --- a/usr/src/lib/libresolv2/cylink/Makefile +++ b/usr/src/lib/libresolv2/cylink/Makefile @@ -18,11 +18,11 @@ # # CDDL HEADER END # + # -# Copyright 2006 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" # include ../../../Makefile.master @@ -48,7 +48,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libresolv2/dnssafe/Makefile b/usr/src/lib/libresolv2/dnssafe/Makefile index 7363b2c344..6fc0de71a4 100644 --- a/usr/src/lib/libresolv2/dnssafe/Makefile +++ b/usr/src/lib/libresolv2/dnssafe/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../../../Makefile.master @@ -48,7 +47,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libresolv2/irs/Makefile b/usr/src/lib/libresolv2/irs/Makefile index 476477d9fb..58a519e1de 100644 --- a/usr/src/lib/libresolv2/irs/Makefile +++ b/usr/src/lib/libresolv2/irs/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../../../Makefile.master @@ -48,7 +47,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libsmedia/library/Makefile b/usr/src/lib/libsmedia/library/Makefile index 1ee16b5b19..cf1194b02e 100644 --- a/usr/src/lib/libsmedia/library/Makefile +++ b/usr/src/lib/libsmedia/library/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../../Makefile.lib @@ -46,7 +45,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/lib/libtnf/Makefile b/usr/src/lib/libtnf/Makefile index 131ee8057d..8c6a1143c5 100644 --- a/usr/src/lib/libtnf/Makefile +++ b/usr/src/lib/libtnf/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # LIBRARY= libtnf.a @@ -53,7 +52,6 @@ POFILES= _error.po SED= sed GREP= grep -CP= cp LIBS= $(DYNLIB) diff --git a/usr/src/lib/libtnfctl/Makefile b/usr/src/lib/libtnfctl/Makefile index c35d5206b7..a8ebf82399 100644 --- a/usr/src/lib/libtnfctl/Makefile +++ b/usr/src/lib/libtnfctl/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 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" # include ../Makefile.lib @@ -47,7 +46,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp #definitions for install_h target HDRS= tnfctl.h diff --git a/usr/src/lib/libvolmgt/Makefile b/usr/src/lib/libvolmgt/Makefile index aa5f8fae95..d135951b02 100644 --- a/usr/src/lib/libvolmgt/Makefile +++ b/usr/src/lib/libvolmgt/Makefile @@ -1,4 +1,3 @@ -# # CDDL HEADER START # # The contents of this file are subject to the terms of the @@ -18,11 +17,11 @@ # # CDDL HEADER END # + # -# Copyright 2006 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" # include ../../Makefile.master @@ -48,7 +47,6 @@ POFILES= generic.po SED= sed GREP= grep -CP= cp .KEEP_STATE: diff --git a/usr/src/pkgdefs/SUNW0on/Makefile b/usr/src/pkgdefs/SUNW0on/Makefile index f864b0fc46..fb1dd6c46f 100644 --- a/usr/src/pkgdefs/SUNW0on/Makefile +++ b/usr/src/pkgdefs/SUNW0on/Makefile @@ -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. @@ -19,10 +18,9 @@ # # CDDL HEADER END # + # -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright 1995,2001-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # pkgdefs/SUNW0on/Makefile @@ -34,7 +32,6 @@ ROOTMSGDIR=$(ROOTDIR)/LC_MESSAGES ROOTTIMEDIR=$(ROOTDIR)/LC_TIME SED= /usr/bin/sed -CP= /usr/bin/cp OWNER= root GROUP= sys FILEMODE= 644 diff --git a/usr/src/ucbcmd/Makefile.ucbcmd b/usr/src/ucbcmd/Makefile.ucbcmd index 056549d54b..e9156f269d 100644 --- a/usr/src/ucbcmd/Makefile.ucbcmd +++ b/usr/src/ucbcmd/Makefile.ucbcmd @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # ucbcmd/Makefile.ucbcmd # @@ -35,7 +34,6 @@ include $(SRC)/Makefile.master LN= ln -CP= cp SH= sh CHMOD= chmod MKDIR= mkdir |