diff options
| author | jmcp <James.McPherson@Sun.COM> | 2009-10-07 16:55:54 -0700 |
|---|---|---|
| committer | jmcp <James.McPherson@Sun.COM> | 2009-10-07 16:55:54 -0700 |
| commit | 48bc00d6814e04ff3edb32cafe7d1bc580baff68 (patch) | |
| tree | cef0fbaa0527cedbe2de4371f65da641f81ba8cf /usr/src/uts | |
| parent | 26f848ca9bce766fd7e67d1a3b418c37698e319b (diff) | |
| download | illumos-joyent-48bc00d6814e04ff3edb32cafe7d1bc580baff68.tar.gz | |
6880460 some root-build bits were missed by 6864230
6414832 SUNWonbld gk account should be removed
6536468 date in Nevada motd should be changed
6855668 webrev mangles dates in non-Romanised locales
6866716 estimation of max-jobs for /.make.machines is incorrect
6589104 make POUND_SIGN less of a drag
6750554 build rule for mcs gives shell+date a real workout
6885068 no need for raciness
Portions contributed by Rich Lowe
Diffstat (limited to 'usr/src/uts')
58 files changed, 486 insertions, 544 deletions
diff --git a/usr/src/uts/Makefile.targ b/usr/src/uts/Makefile.targ index 11d748e662..21ef9c8c5d 100644 --- a/usr/src/uts/Makefile.targ +++ b/usr/src/uts/Makefile.targ @@ -135,13 +135,13 @@ $(LINTS_DIR)/vers.ln: $(SRC)/uts/common/os/vers.c # Installation targets and rules: # $(ROOT_MOD_DIR) $(USR_MOD_DIR): - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MOD_DIRS_32): $(ROOT_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_MOD_DIRS_32): $(USR_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_MOD_DIR) FRC $(INS.file) @@ -257,13 +257,13 @@ include $(SRC)/Makefile.psm.targ # Target for 64b modules # $(ROOT_KERN_DIR_64): - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_KERN_DIR_64)/%: $(OBJS_DIR)/% $(ROOT_KERN_DIR_64) FRC $(INS.file) %/$(SUBDIR64): % - -$(INS.dir.root.sys) + -$(INS.dir) # # Targets for '.conf' file installation. diff --git a/usr/src/uts/i86pc/i86hvm/Makefile.targ b/usr/src/uts/i86pc/i86hvm/Makefile.targ index 41ab1bff62..228fc17624 100644 --- a/usr/src/uts/i86pc/i86hvm/Makefile.targ +++ b/usr/src/uts/i86pc/i86hvm/Makefile.targ @@ -18,10 +18,9 @@ # # CDDL HEADER END # + # -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # Common targets for i86hvm platform-implementation specific modules. @@ -33,22 +32,22 @@ # Rules for implementation subdirectories. # $(ROOT_HVM_DIR): - $(INS.dir.root.sys) + $(INS.dir) $(ROOT_HVM_MOD_DIR): $(ROOT_HVM_DIR) - $(INS.dir.root.sys) + $(INS.dir) $(ROOT_HVM_DRV_DIR_32): $(ROOT_HVM_MOD_DIR) - $(INS.dir.root.sys) + $(INS.dir) $(ROOT_HVM_DRV_DIR_64): $(ROOT_HVM_DRV_DIR_32) - $(INS.dir.root.sys) + $(INS.dir) $(ROOT_HVM_MISC_DIR_32): $(ROOT_HVM_MOD_DIR) - $(INS.dir.root.sys) + $(INS.dir) $(ROOT_HVM_MISC_DIR_64): $(ROOT_HVM_MISC_DIR_32) - $(INS.dir.root.sys) + $(INS.dir) $(ROOT_HVM_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_HVM_MOD_DIR) FRC $(INS.file) @@ -60,7 +59,7 @@ $(ROOT_HVM_MISC_DIR)/%: $(OBJS_DIR)/% $(ROOT_HVM_MISC_DIR) FRC $(INS.file) $(USR_HVM_DIR): - $(INS.dir.root.sys) + $(INS.dir) # # Include common targets. diff --git a/usr/src/uts/i86pc/sys/Makefile b/usr/src/uts/i86pc/sys/Makefile index 70234741e1..11ebb58187 100644 --- a/usr/src/uts/i86pc/sys/Makefile +++ b/usr/src/uts/i86pc/sys/Makefile @@ -84,7 +84,7 @@ install_h: $(ROOTDIRS) .WAIT $(ROOTHDRS) $(ROOTLINK) check: $(CHECKHDRS) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) $(ROOTLINK): $(ROOTDIRS) -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ diff --git a/usr/src/uts/i86pc/vm/Makefile b/usr/src/uts/i86pc/vm/Makefile index d52eeb1eb9..4f94ae3f11 100644 --- a/usr/src/uts/i86pc/vm/Makefile +++ b/usr/src/uts/i86pc/vm/Makefile @@ -63,7 +63,7 @@ $(USR_PSM_IVM_DIR)/%: ../vm/% $(USR_PSM_IVM_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) # -r because this used to be a directory and is now a link. $(ROOTLINK): $(ROOTDIRS) diff --git a/usr/src/uts/i86xpv/sys/Makefile b/usr/src/uts/i86xpv/sys/Makefile index 0216ac5f36..8a91f8566e 100644 --- a/usr/src/uts/i86xpv/sys/Makefile +++ b/usr/src/uts/i86xpv/sys/Makefile @@ -60,7 +60,7 @@ install_h: $(ROOTDIRS) .WAIT $(ROOTHDRS) $(ROOTLINK) check: $(CHECKHDRS) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) $(ROOTLINK): $(ROOTDIRS) -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ diff --git a/usr/src/uts/i86xpv/vm/Makefile b/usr/src/uts/i86xpv/vm/Makefile index 53decc0d91..b0ca150cea 100644 --- a/usr/src/uts/i86xpv/vm/Makefile +++ b/usr/src/uts/i86xpv/vm/Makefile @@ -66,7 +66,7 @@ $(USR_PSM_IVM_DIR)/%: ../vm/% $(USR_PSM_IVM_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) # -r because this used to be a directory and is now a link. $(ROOTLINK): $(ROOTDIRS) diff --git a/usr/src/uts/sun4u/Makefile b/usr/src/uts/sun4u/Makefile index a89d008653..fc9e11c42c 100644 --- a/usr/src/uts/sun4u/Makefile +++ b/usr/src/uts/sun4u/Makefile @@ -225,7 +225,7 @@ install_h check: install_platforms $(IMPLEMENTATIONS) \ # here in kernel land. # $(ROOT_PLAT_DIRS): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) # # create directories in /usr/platform/ for the implementations that are @@ -236,7 +236,7 @@ $(ROOT_PLAT_DIRS): $(ROOT_PLAT_DIR) # that are linked to it. # $(USR_PLAT_DIR)/$(IMPLEMENTED_PLATFORM): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) # # create the links in /usr/platform/ foreach $(LINKED_PLATFORMS) @@ -271,7 +271,7 @@ $(USR_DESKTOP_SBIN_DIR): $(USR_DESKTOP_DIR) $(INS.slink5) $(USR_DESKTOP_LIB_DIR): $(USR_DESKTOP_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) # # Full kernel lint target. diff --git a/usr/src/uts/sun4u/aes/Makefile b/usr/src/uts/sun4u/aes/Makefile index 628c1ab5a7..b68b6331c2 100644 --- a/usr/src/uts/sun4u/aes/Makefile +++ b/usr/src/uts/sun4u/aes/Makefile @@ -21,10 +21,10 @@ # # uts/sun4u/aes/Makefile # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # This makefile drives the production of the aes kernel module. # @@ -114,13 +114,13 @@ install: $(INSTALL_DEPS) include $(UTSBASE)/sun4u/Makefile.targ $(ROOT_US3_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_US3_MOD_DIR): $(ROOT_US3_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_US3_CRYPTO_DIR): $(ROOT_US3_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_US3_CRYPTO_DIR)/%: $(OBJS_DIR)/% $(ROOT_US3_CRYPTO_DIR) -$(INS.file) diff --git a/usr/src/uts/sun4u/blade/Makefile.targ.shared b/usr/src/uts/sun4u/blade/Makefile.targ.shared index 0673d2a776..a99bf60bcd 100644 --- a/usr/src/uts/sun4u/blade/Makefile.targ.shared +++ b/usr/src/uts/sun4u/blade/Makefile.targ.shared @@ -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,9 +19,9 @@ # CDDL HEADER END # # -#pragma ident "%Z%%M% %I% %E% SMI" + # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # Common targets for sun4u jbos-blade implementation specific modules. @@ -34,22 +33,22 @@ # Rules for implementation subdirectories. # $(ROOT_BLADE_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BLADE_MOD_DIR): $(ROOT_BLADE_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BLADE_DRV_DIR_32): $(ROOT_BLADE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BLADE_DRV_DIR_64): $(ROOT_BLADE_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BLADE_MISC_DIR_32): $(ROOT_BLADE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BLADE_MISC_DIR_64): $(ROOT_BLADE_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BLADE_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_BLADE_MOD_DIR) FRC $(INS.file) @@ -61,19 +60,19 @@ $(ROOT_BLADE_DRV_DIR)/%: $(OBJS_DIR)/% $(ROOT_BLADE_DRV_DIR) FRC $(INS.file) $(USR_BLADE_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_BLADE_INC_DIR): $(USR_BLADE_DIR) -$(INS.slink4) $(USR_BLADE_ISYS_DIR): $(USR_BLADE_INC_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_BLADE_SBIN_DIR): $(USR_BLADE_DIR) $(INS.slink5) $(USR_BLADE_LIB_DIR): $(USR_BLADE_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) # # Include common targets. # diff --git a/usr/src/uts/sun4u/boston/Makefile.targ b/usr/src/uts/sun4u/boston/Makefile.targ index fd46b057c7..be70d44a23 100644 --- a/usr/src/uts/sun4u/boston/Makefile.targ +++ b/usr/src/uts/sun4u/boston/Makefile.targ @@ -33,37 +33,37 @@ IMPLEMENTED_PLATFORM = SUNW,Sun-Fire-V445 # Rules for implementation subdirectories. # $(ROOT_BOSTON_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BOSTON_MOD_DIR): $(ROOT_BOSTON_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BOSTON_MISC_DIR_32): $(ROOT_BOSTON_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BOSTON_MISC_DIR_64): $(ROOT_BOSTON_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BOSTON_DRV_DIR_32): $(ROOT_BOSTON_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BOSTON_DRV_DIR_64): $(ROOT_BOSTON_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BOSTON_CRYPTO_DIR_32): $(ROOT_BOSTON_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BOSTON_CRYPTO_DIR_64): $(ROOT_BOSTON_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_BOSTON_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_BOSTON_INC_DIR): $(USR_BOSTON_DIR) -$(INS.slink4) $(USR_BOSTON_SBIN_DIR): $(USR_BOSTON_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(USR_BOSTON_SBIN_PRTDIAG): $(USR_BOSTON_SBIN_DIR) $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@ @@ -75,10 +75,10 @@ $(USR_BOSTON_SBIN_FRUADM): $(USR_BOSTON_SBIN_DIR) $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@ $(USR_BOSTON_LIB_DIR): $(USR_BOSTON_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_BOSTON_ISYS_DIR): $(USR_BOSTON_INC_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(ROOT_BOSTON_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_BOSTON_MOD_DIR) $(INS.file) diff --git a/usr/src/uts/sun4u/cherrystone/Makefile.targ b/usr/src/uts/sun4u/cherrystone/Makefile.targ index 7d563dc41c..70cc923ecf 100644 --- a/usr/src/uts/sun4u/cherrystone/Makefile.targ +++ b/usr/src/uts/sun4u/cherrystone/Makefile.targ @@ -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. @@ -21,10 +20,10 @@ # # # uts/sun4u/cherrystone/Makefile.targ -# Copyright 2001-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u Cherrystone implementation specific modules. # @@ -37,31 +36,31 @@ LINKED_PLATFORMS = SUNW,Sun-Fire-V490 # Platform targets # $(ROOT_CHERRYSTONE_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHERRYSTONE_MOD_DIR): $(ROOT_CHERRYSTONE_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHERRYSTONE_DRV_DIR_32): $(ROOT_CHERRYSTONE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHERRYSTONE_DRV_DIR_64): $(ROOT_CHERRYSTONE_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHERRYSTONE_MISC_DIR_32): $(ROOT_CHERRYSTONE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHERRYSTONE_MISC_DIR_64): $(ROOT_CHERRYSTONE_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHERRYSTONE_CRYPTO_DIR_32): $(ROOT_CHERRYSTONE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHERRYSTONE_CRYPTO_DIR_64): $(ROOT_CHERRYSTONE_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_CHERRYSTONE_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_CHERRYSTONE_INC_DIR): $(USR_CHERRYSTONE_DIR) -$(INS.slink4) @@ -70,10 +69,10 @@ $(USR_CHERRYSTONE_SBIN_DIR): $(USR_CHERRYSTONE_DIR) -$(INS.slink5) $(USR_CHERRYSTONE_LIB_DIR): $(USR_CHERRYSTONE_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_CHERRYSTONE_ISYS_DIR): $(USR_CHERRYSTONE_INC_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_CHERRYSTONE_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_CHERRYSTONE_MOD_DIR) FRC $(INS.file) @@ -88,7 +87,7 @@ $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%): $(ROOT_PLAT_DIR) $(INS.slink3) $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib): $(USR_PLAT_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/include): $(USR_PLAT_DIR) $(INS.slink4) diff --git a/usr/src/uts/sun4u/cherrystone/sys/Makefile b/usr/src/uts/sun4u/cherrystone/sys/Makefile index aff87216d7..b5ce1a10a5 100644 --- a/usr/src/uts/sun4u/cherrystone/sys/Makefile +++ b/usr/src/uts/sun4u/cherrystone/sys/Makefile @@ -60,7 +60,7 @@ $(USR_CHERRYSTONE_ISYS_DIR)/%: % $(USR_CHERRYSTONE_ISYS_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) FRC: diff --git a/usr/src/uts/sun4u/chicago/Makefile.targ b/usr/src/uts/sun4u/chicago/Makefile.targ index b0d0d715eb..ca0ee189a7 100644 --- a/usr/src/uts/sun4u/chicago/Makefile.targ +++ b/usr/src/uts/sun4u/chicago/Makefile.targ @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u implementation specific modules. # @@ -35,31 +34,31 @@ IMPLEMENTED_PLATFORM = SUNW,A70 # Rules for implementation subdirectories. # $(ROOT_CHICAGO_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHICAGO_MOD_DIR): $(ROOT_CHICAGO_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHICAGO_MISC_DIR_32): $(ROOT_CHICAGO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHICAGO_MISC_DIR_64): $(ROOT_CHICAGO_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHICAGO_DRV_DIR_32): $(ROOT_CHICAGO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHICAGO_DRV_DIR_64): $(ROOT_CHICAGO_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHICAGO_CRYPTO_DIR_32): $(ROOT_CHICAGO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_CHICAGO_CRYPTO_DIR_64): $(ROOT_CHICAGO_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_CHICAGO_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_CHICAGO_INC_DIR): $(USR_CHICAGO_DIR) -$(INS.slink4) @@ -68,10 +67,10 @@ $(USR_CHICAGO_SBIN_DIR): $(USR_CHICAGO_DIR) -$(INS.slink5) $(USR_CHICAGO_LIB_DIR): $(USR_CHICAGO_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_CHICAGO_ISYS_DIR): $(USR_CHICAGO_INC_DIR) - -$(INS.dir.bin.bin) + -$(INS.dir) $(ROOT_CHICAGO_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_CHICAGO_MOD_DIR) $(INS.file) diff --git a/usr/src/uts/sun4u/chicago/fpc/Makefile b/usr/src/uts/sun4u/chicago/fpc/Makefile index 688db73330..0173e7af37 100644 --- a/usr/src/uts/sun4u/chicago/fpc/Makefile +++ b/usr/src/uts/sun4u/chicago/fpc/Makefile @@ -20,10 +20,10 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # uts/sun4u/chicago/fpc/Makefile # @@ -125,28 +125,28 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(ROOT_BOSTON_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BOSTON_MOD_DIR): $(ROOT_BOSTON_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BOSTON_DRV_DIR_32): $(ROOT_BOSTON_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BOSTON_DRV_DIR_64): $(ROOT_BOSTON_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SEATTLE_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SEATTLE_MOD_DIR): $(ROOT_SEATTLE_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SEATTLE_DRV_DIR_32): $(ROOT_SEATTLE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SEATTLE_DRV_DIR_64): $(ROOT_SEATTLE_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(BOSTON_ROOTMODULE): $(ROOTMODULE) $(ROOT_BOSTON_DRV_DIR_64) $(RM) $@; $(SYMLINK) $(ROOTMODULE_SOFTLINK) $@ diff --git a/usr/src/uts/sun4u/daktari/Makefile.targ b/usr/src/uts/sun4u/daktari/Makefile.targ index e74ebb079b..3e5906a950 100644 --- a/usr/src/uts/sun4u/daktari/Makefile.targ +++ b/usr/src/uts/sun4u/daktari/Makefile.targ @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2000-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u Daktari implementation specific modules. # @@ -36,31 +35,31 @@ LINKED_PLATFORMS = SUNW,Sun-Fire-V890 # Platform targets # $(ROOT_DAKTARI_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DAKTARI_MOD_DIR): $(ROOT_DAKTARI_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DAKTARI_DRV_DIR_32): $(ROOT_DAKTARI_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DAKTARI_DRV_DIR_64): $(ROOT_DAKTARI_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DAKTARI_MISC_DIR_32): $(ROOT_DAKTARI_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DAKTARI_MISC_DIR_64): $(ROOT_DAKTARI_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DAKTARI_CRYPTO_DIR_32): $(ROOT_DAKTARI_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DAKTARI_CRYPTO_DIR_64): $(ROOT_DAKTARI_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_DAKTARI_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_DAKTARI_INC_DIR): $(USR_DAKTARI_DIR) -$(INS.slink4) @@ -69,10 +68,10 @@ $(USR_DAKTARI_SBIN_DIR): $(USR_DAKTARI_DIR) -$(INS.slink5) $(USR_DAKTARI_LIB_DIR): $(USR_DAKTARI_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_DAKTARI_ISYS_DIR): $(USR_DAKTARI_INC_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_DAKTARI_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_DAKTARI_MOD_DIR) FRC $(INS.file) @@ -87,7 +86,7 @@ $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%): $(ROOT_PLAT_DIR) $(INS.slink3) $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib): $(USR_PLAT_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/include): $(USR_PLAT_DIR) $(INS.slink4) diff --git a/usr/src/uts/sun4u/daktari/sys/Makefile b/usr/src/uts/sun4u/daktari/sys/Makefile index 7a19c05a03..e1e64b47ba 100644 --- a/usr/src/uts/sun4u/daktari/sys/Makefile +++ b/usr/src/uts/sun4u/daktari/sys/Makefile @@ -60,7 +60,7 @@ $(USR_DAKTARI_ISYS_DIR)/%: % $(USR_DAKTARI_ISYS_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) FRC: diff --git a/usr/src/uts/sun4u/darwin/Makefile.targ b/usr/src/uts/sun4u/darwin/Makefile.targ index 9974ed8506..1d46c998ef 100644 --- a/usr/src/uts/sun4u/darwin/Makefile.targ +++ b/usr/src/uts/sun4u/darwin/Makefile.targ @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u Darwin implementation specific modules. # @@ -36,16 +35,16 @@ IMPLEMENTED_PLATFORM = SUNW,Ultra-2 # Rules for implementation subdirectories. # $(ROOT_DARWIN_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DARWIN_MOD_DIR): $(ROOT_DARWIN_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DARWIN_MISC_DIR_32): $(ROOT_DARWIN_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DARWIN_MISC_DIR_64): $(ROOT_DARWIN_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_DARWIN_DIR): $(USR_PLAT_DIR) -$(INS.slink3) diff --git a/usr/src/uts/sun4u/douglas/Makefile.targ.shared b/usr/src/uts/sun4u/douglas/Makefile.targ.shared index aa43b0f532..cdb7a4f9f7 100644 --- a/usr/src/uts/sun4u/douglas/Makefile.targ.shared +++ b/usr/src/uts/sun4u/douglas/Makefile.targ.shared @@ -19,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u Douglas implementation specific modules. # @@ -35,25 +35,25 @@ IMPLEMENTED_PLATFORM = TAD,SPARCLE # Rules for implementation subdirectories. # $(ROOT_DOUGLAS_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DOUGLAS_MOD_DIR): $(ROOT_DOUGLAS_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DOUGLAS_MISC_DIR_32): $(ROOT_DOUGLAS_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DOUGLAS_MISC_DIR_64): $(ROOT_DOUGLAS_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DOUGLAS_DRV_DIR_32): $(ROOT_DOUGLAS_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_DOUGLAS_DRV_DIR_64): $(ROOT_DOUGLAS_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_DOUGLAS_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_DOUGLAS_INC_DIR): $(USR_DOUGLAS_DIR) -$(INS.slink4) @@ -62,11 +62,7 @@ $(USR_DOUGLAS_SBIN_DIR): $(USR_DOUGLAS_DIR) -$(INS.slink5) $(USR_DOUGLAS_LIB_DIR): $(USR_DOUGLAS_DIR) - -$(INS.dir.root.bin) - -$(USR_DOUGLAS_ISYS_DIR): $(USR_DOUGLAS_INC_DIR) - -$(INS.dir.bin.bin) - + -$(INS.dir) $(ROOT_DOUGLAS_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_DOUGLAS_MOD_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/enchilada/Makefile.targ b/usr/src/uts/sun4u/enchilada/Makefile.targ index a7c704d6df..89b6cbc428 100644 --- a/usr/src/uts/sun4u/enchilada/Makefile.targ +++ b/usr/src/uts/sun4u/enchilada/Makefile.targ @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u implementation specific modules. # @@ -36,31 +35,31 @@ IMPLEMENTED_PLATFORM = SUNW,Sun-Blade-2500 # Rules for implementation subdirectories. # $(ROOT_ENCHILADA_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ENCHILADA_MOD_DIR): $(ROOT_ENCHILADA_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ENCHILADA_MISC_DIR_32): $(ROOT_ENCHILADA_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ENCHILADA_MISC_DIR_64): $(ROOT_ENCHILADA_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ENCHILADA_DRV_DIR_32): $(ROOT_ENCHILADA_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ENCHILADA_DRV_DIR_64): $(ROOT_ENCHILADA_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ENCHILADA_CRYPTO_DIR_32): $(ROOT_ENCHILADA_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ENCHILADA_CRYPTO_DIR_64): $(ROOT_ENCHILADA_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_ENCHILADA_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_ENCHILADA_INC_DIR): $(USR_ENCHILADA_DIR) -$(INS.slink4) @@ -69,10 +68,7 @@ $(USR_ENCHILADA_SBIN_DIR): $(USR_ENCHILADA_DIR) -$(INS.slink5) $(USR_ENCHILADA_LIB_DIR): $(USR_ENCHILADA_DIR) - -$(INS.dir.root.bin) - -$(USR_ENCHILADA_ISYS_DIR): $(USR_ENCHILADA_INC_DIR) - -$(INS.dir.bin.bin) + -$(INS.dir) $(ROOT_ENCHILADA_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_ENCHILADA_MOD_DIR) $(INS.file) diff --git a/usr/src/uts/sun4u/excalibur/Makefile.targ b/usr/src/uts/sun4u/excalibur/Makefile.targ index a498e90cd0..9c1e556c4e 100644 --- a/usr/src/uts/sun4u/excalibur/Makefile.targ +++ b/usr/src/uts/sun4u/excalibur/Makefile.targ @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u Excalibur implementation specific modules. # @@ -36,31 +35,31 @@ IMPLEMENTED_PLATFORM = SUNW,Sun-Blade-1000 # Rules for implementation subdirectories. # $(ROOT_EXCALIBUR_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_EXCALIBUR_MOD_DIR): $(ROOT_EXCALIBUR_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_EXCALIBUR_MISC_DIR_32): $(ROOT_EXCALIBUR_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_EXCALIBUR_MISC_DIR_64): $(ROOT_EXCALIBUR_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_EXCALIBUR_DRV_DIR_32): $(ROOT_EXCALIBUR_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_EXCALIBUR_DRV_DIR_64): $(ROOT_EXCALIBUR_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_EXCALIBUR_CRYPTO_DIR_32): $(ROOT_EXCALIBUR_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_EXCALIBUR_CRYPTO_DIR_64): $(ROOT_EXCALIBUR_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_EXCALIBUR_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_EXCALIBUR_INC_DIR): $(USR_EXCALIBUR_DIR) -$(INS.slink4) @@ -69,10 +68,7 @@ $(USR_EXCALIBUR_SBIN_DIR): $(USR_EXCALIBUR_DIR) -$(INS.slink5) $(USR_EXCALIBUR_LIB_DIR): $(USR_EXCALIBUR_DIR) - -$(INS.dir.root.bin) - -$(USR_EXCALIBUR_ISYS_DIR): $(USR_EXCALIBUR_INC_DIR) - -$(INS.dir.bin.bin) + -$(INS.dir) $(ROOT_EXCALIBUR_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_EXCALIBUR_MOD_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/excalibur/sys/Makefile b/usr/src/uts/sun4u/excalibur/sys/Makefile index a2edc8646a..0d1bdcecda 100644 --- a/usr/src/uts/sun4u/excalibur/sys/Makefile +++ b/usr/src/uts/sun4u/excalibur/sys/Makefile @@ -56,9 +56,6 @@ check: $(CHECKHDRS) $(USR_EXCALIBUR_ISYS_DIR)/%: % $(USR_EXCALIBUR_ISYS_DIR) $(INS.file) -$(ROOTDIRS): - $(INS.dir.bin.bin) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/fjlite/Makefile.targ b/usr/src/uts/sun4u/fjlite/Makefile.targ index d67b12621b..97079ec99f 100644 --- a/usr/src/uts/sun4u/fjlite/Makefile.targ +++ b/usr/src/uts/sun4u/fjlite/Makefile.targ @@ -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,10 +19,10 @@ # CDDL HEADER END # # -#pragma ident "%Z%%M% %I% %E% SMI" + # -# Copyright 2001-2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # Common targets for sun4u fjlite implementation specific modules. # @@ -34,22 +33,22 @@ # Rules for implementation subdirectories. # $(ROOT_FJLITE_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_FJLITE_MOD_DIR): $(ROOT_FJLITE_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_FJLITE_DRV_DIR_32): $(ROOT_FJLITE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_FJLITE_DRV_DIR_64): $(ROOT_FJLITE_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_FJLITE_MISC_DIR_32): $(ROOT_FJLITE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_FJLITE_MISC_DIR_64): $(ROOT_FJLITE_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_FJLITE_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_FJLITE_MOD_DIR) FRC $(INS.file) @@ -64,10 +63,10 @@ $(USR_FJLITE_DIR): $(USR_SUN4U_PLAT_DIR) -$(INS.slink1) $(USR_FJLITE_INC_DIR): $(USR_FJLITE_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_FJLITE_ISYS_DIR): $(USR_FJLITE_INC_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) # # Include common targets. diff --git a/usr/src/uts/sun4u/grover/Makefile.targ.shared b/usr/src/uts/sun4u/grover/Makefile.targ.shared index 815ec55893..90839a3355 100644 --- a/usr/src/uts/sun4u/grover/Makefile.targ.shared +++ b/usr/src/uts/sun4u/grover/Makefile.targ.shared @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u Grover implementation specific modules. # @@ -36,25 +35,25 @@ IMPLEMENTED_PLATFORM = SUNW,Sun-Blade-100 # Rules for implementation subdirectories. # $(ROOT_GROVER_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_GROVER_MOD_DIR): $(ROOT_GROVER_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_GROVER_MISC_DIR_32): $(ROOT_GROVER_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_GROVER_MISC_DIR_64): $(ROOT_GROVER_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_GROVER_DRV_DIR_32): $(ROOT_GROVER_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_GROVER_DRV_DIR_64): $(ROOT_GROVER_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_GROVER_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_GROVER_INC_DIR): $(USR_GROVER_DIR) -$(INS.slink4) @@ -63,11 +62,7 @@ $(USR_GROVER_SBIN_DIR): $(USR_GROVER_DIR) -$(INS.slink5) $(USR_GROVER_LIB_DIR): $(USR_GROVER_DIR) - -$(INS.dir.root.bin) - -$(USR_GROVER_ISYS_DIR): $(USR_GROVER_INC_DIR) - -$(INS.dir.bin.bin) - + -$(INS.dir) $(ROOT_GROVER_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_GROVER_MOD_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/javelin/Makefile.targ.shared b/usr/src/uts/sun4u/javelin/Makefile.targ.shared index ddb36dada8..8cc5019975 100644 --- a/usr/src/uts/sun4u/javelin/Makefile.targ.shared +++ b/usr/src/uts/sun4u/javelin/Makefile.targ.shared @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u Javelin implementation specific modules. # @@ -35,25 +34,25 @@ IMPLEMENTED_PLATFORM = SUNW,Ultra-250 # Platform targets # $(ROOT_JAVELIN_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_JAVELIN_MOD_DIR): $(ROOT_JAVELIN_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_JAVELIN_DRV_DIR_32): $(ROOT_JAVELIN_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_JAVELIN_DRV_DIR_64): $(ROOT_JAVELIN_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_JAVELIN_MISC_DIR_32): $(ROOT_JAVELIN_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_JAVELIN_MISC_DIR_64): $(ROOT_JAVELIN_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_JAVELIN_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_JAVELIN_INC_DIR): $(USR_JAVELIN_DIR) -$(INS.slink4) @@ -62,10 +61,10 @@ $(USR_JAVELIN_SBIN_DIR): $(USR_JAVELIN_DIR) -$(INS.slink5) $(USR_JAVELIN_LIB_DIR): $(USR_JAVELIN_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_JAVELIN_ISYS_DIR): $(USR_JAVELIN_INC_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_JAVELIN_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_JAVELIN_MOD_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/littleneck/Makefile.targ b/usr/src/uts/sun4u/littleneck/Makefile.targ index 5e45fff07d..3f6f0efa7b 100644 --- a/usr/src/uts/sun4u/littleneck/Makefile.targ +++ b/usr/src/uts/sun4u/littleneck/Makefile.targ @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2000-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u Littleneck implementation specific modules. # @@ -35,31 +34,31 @@ IMPLEMENTED_PLATFORM = SUNW,Sun-Fire-280R # Platform targets # $(ROOT_LITTLENECK_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LITTLENECK_MOD_DIR): $(ROOT_LITTLENECK_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LITTLENECK_DRV_DIR_32): $(ROOT_LITTLENECK_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LITTLENECK_DRV_DIR_64): $(ROOT_LITTLENECK_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LITTLENECK_MISC_DIR_32): $(ROOT_LITTLENECK_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LITTLENECK_MISC_DIR_64): $(ROOT_LITTLENECK_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LITTLENECK_CRYPTO_DIR_32): $(ROOT_TACO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LITTLENECK_CRYPTO_DIR_64): $(ROOT_LITTLENECK_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_LITTLENECK_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_LITTLENECK_INC_DIR): $(USR_LITTLENECK_DIR) -$(INS.slink4) @@ -68,10 +67,10 @@ $(USR_LITTLENECK_SBIN_DIR): $(USR_LITTLENECK_DIR) -$(INS.slink5) $(USR_LITTLENECK_LIB_DIR): $(USR_LITTLENECK_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_LITTLENECK_ISYS_DIR): $(USR_LITTLENECK_INC_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_LITTLENECK_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_LITTLENECK_MOD_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/lw2plus/Makefile.targ b/usr/src/uts/sun4u/lw2plus/Makefile.targ index 691a820232..9fcaae9614 100644 --- a/usr/src/uts/sun4u/lw2plus/Makefile.targ +++ b/usr/src/uts/sun4u/lw2plus/Makefile.targ @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # # Common targets for sun4u LW2PLUS implementation specific modules. @@ -35,43 +33,43 @@ # Rules for implementation subdirectories. # $(ROOT_LW2PLUS_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW2PLUS_MOD_DIR): $(ROOT_LW2PLUS_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW2PLUS_DRV_DIR_32): $(ROOT_LW2PLUS_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW2PLUS_DRV_DIR_64): $(ROOT_LW2PLUS_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW2PLUS_MISC_DIR_32): $(ROOT_LW2PLUS_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW2PLUS_MISC_DIR_64): $(ROOT_LW2PLUS_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW2PLUS_CRYPTO_DIR_32): $(ROOT_LW2PLUS_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW2PLUS_CRYPTO_DIR_64): $(ROOT_LW2PLUS_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_LW2PLUS_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_LW2PLUS_INC_DIR): $(USR_LW2PLUS_DIR) $(INS.slink4) $(USR_LW2PLUS_ISYS_DIR): $(USR_LW2PLUS_INC_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(USR_LW2PLUS_SBIN_DIR): $(USR_LW2PLUS_DIR) $(INS.slink5) $(USR_LW2PLUS_LIB_DIR): $(USR_LW2PLUS_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_LW2PLUS_DRV_DIR)/%: $(OBJS_DIR)/% $(ROOT_LW2PLUS_DRV_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/lw8/Makefile.targ b/usr/src/uts/sun4u/lw8/Makefile.targ index a8a58a0e9f..3067004afd 100644 --- a/usr/src/uts/sun4u/lw8/Makefile.targ +++ b/usr/src/uts/sun4u/lw8/Makefile.targ @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u LW8 implementation specific modules. # @@ -34,43 +34,43 @@ # Rules for implementation subdirectories. # $(ROOT_LW8_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW8_MOD_DIR): $(ROOT_LW8_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW8_DRV_DIR_32): $(ROOT_LW8_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW8_DRV_DIR_64): $(ROOT_LW8_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW8_MISC_DIR_32): $(ROOT_LW8_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW8_MISC_DIR_64): $(ROOT_LW8_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW8_CRYPTO_DIR_32): $(ROOT_LW8_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_LW8_CRYPTO_DIR_64): $(ROOT_LW8_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_LW8_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_LW8_INC_DIR): $(USR_LW8_DIR) $(INS.slink4) $(USR_LW8_ISYS_DIR): $(USR_LW8_INC_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(USR_LW8_SBIN_DIR): $(USR_LW8_DIR) $(INS.slink5) $(USR_LW8_LIB_DIR): $(USR_LW8_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_LW8_DRV_DIR)/%: $(OBJS_DIR)/% $(ROOT_LW8_DRV_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/lw8/sys/Makefile b/usr/src/uts/sun4u/lw8/sys/Makefile index 1860e85cbe..bad3b22c91 100644 --- a/usr/src/uts/sun4u/lw8/sys/Makefile +++ b/usr/src/uts/sun4u/lw8/sys/Makefile @@ -61,7 +61,7 @@ $(USR_LW8_ISYS_DIR)/%: % $(USR_LW8_ISYS_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) FRC: diff --git a/usr/src/uts/sun4u/makaha/Makefile.targ b/usr/src/uts/sun4u/makaha/Makefile.targ index 7de18b68a7..dfdaf2bc75 100644 --- a/usr/src/uts/sun4u/makaha/Makefile.targ +++ b/usr/src/uts/sun4u/makaha/Makefile.targ @@ -19,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # # Common targets for sun4u MAKAHA implementation specific modules. @@ -31,7 +31,7 @@ # Platform targets # $(ROOT_MAKAHA_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) .KEEP_STATE: @@ -39,22 +39,22 @@ $(ROOT_MAKAHA_DIR): $(ROOT_PLAT_DIR) # Rules for implementation subdirectories. # $(ROOT_MAKAHA_MOD_DIR): $(ROOT_MAKAHA_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MAKAHA_DRV_DIR_32): $(ROOT_MAKAHA_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MAKAHA_DRV_DIR_64): $(ROOT_MAKAHA_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MAKAHA_MISC_DIR_32): $(ROOT_MAKAHA_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MAKAHA_MISC_DIR_64): $(ROOT_MAKAHA_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_MAKAHA_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_MAKAHA_INC_DIR): $(USR_MAKAHA_DIR) -$(INS.slink4) @@ -63,10 +63,10 @@ $(USR_MAKAHA_SBIN_DIR): $(USR_MAKAHA_DIR) -$(INS.slink5) $(USR_MAKAHA_LIB_DIR): $(USR_MAKAHA_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_MAKAHA_ISYS_DIR): $(USR_MAKAHA_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_MAKAHA_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_MAKAHA_MOD_DIR) $(INS.file) @@ -75,10 +75,10 @@ $(ROOT_MAKAHA_MISC_DIR)/%: $(OBJS_DIR)/% $(ROOT_MAKAHA_MISC_DIR) $(INS.file) $(ROOT_MAKAHA_DACF_DIR_32): $(ROOT_MAKAHA_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MAKAHA_DACF_DIR_64): $(ROOT_MAKAHA_DACF_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MAKAHA_DACF_DIR)/%: $(OBJS_DIR)/% $(ROOT_MAKAHA_DACF_DIR) $(INS.file) @@ -90,25 +90,25 @@ $(ROOT_MAKAHA_DRV_DIR)/%: $(OBJS_DIR)/% $(ROOT_MAKAHA_DRV_DIR) FRC # Create Sputnik platform directories # $(ROOT_SPUTNIK_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SPUTNIK_MOD_DIR): $(ROOT_SPUTNIK_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SPUTNIK_DRV_DIR_32): $(ROOT_SPUTNIK_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SPUTNIK_DRV_DIR_64): $(ROOT_SPUTNIK_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SPUTNIK_MISC_DIR_32): $(ROOT_SPUTNIK_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SPUTNIK_MISC_DIR_64): $(ROOT_SPUTNIK_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_SPUTNIK_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_SPUTNIK_INC_DIR): $(USR_SPUTNIK_DIR) -$(INS.slink4) @@ -117,10 +117,10 @@ $(USR_SPUTNIK_SBIN_DIR): $(USR_SPUTNIK_DIR) -$(INS.slink5) $(USR_SPUTNIK_LIB_DIR): $(USR_SPUTNIK_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_SPUTNIK_ISYS_DIR): $(USR_SPUTNIK_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_SPUTNIK_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_SPUTNIK_MOD_DIR) $(INS.file) @@ -132,10 +132,10 @@ $(ROOT_SPUTNIK_DRV_DIR)/%: $(OBJS_DIR)/% $(ROOT_SPUTNIK_DRV_DIR) $(INS.file) $(ROOT_SPUTNIK_DACF_DIR_32): $(ROOT_SPUTNIK_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SPUTNIK_DACF_DIR_64): $(ROOT_SPUTNIK_DACF_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SPUTNIK_DACF_DIR)/%: $(OBJS_DIR)/% $(ROOT_SPUTNIK_DACF_DIR) $(INS.file) diff --git a/usr/src/uts/sun4u/montecarlo/Makefile.targ.shared b/usr/src/uts/sun4u/montecarlo/Makefile.targ.shared index 08957e054a..0a0ea5baea 100644 --- a/usr/src/uts/sun4u/montecarlo/Makefile.targ.shared +++ b/usr/src/uts/sun4u/montecarlo/Makefile.targ.shared @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u MonteCarlo implementation specific modules. # @@ -31,7 +30,7 @@ # Platform targets # $(ROOT_MONTECARLO_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) .KEEP_STATE: @@ -39,28 +38,28 @@ $(ROOT_MONTECARLO_DIR): $(ROOT_PLAT_DIR) # Rules for implementation subdirectories. # $(ROOT_MONTECARLO_MOD_DIR): $(ROOT_MONTECARLO_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MONTECARLO_DACF_DIR_32): $(ROOT_MONTECARLO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MONTECARLO_DACF_DIR_64): $(ROOT_MONTECARLO_DACF_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MONTECARLO_DRV_DIR_32): $(ROOT_MONTECARLO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MONTECARLO_DRV_DIR_64): $(ROOT_MONTECARLO_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MONTECARLO_MISC_DIR_32): $(ROOT_MONTECARLO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MONTECARLO_MISC_DIR_64): $(ROOT_MONTECARLO_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_MONTECARLO_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_MONTECARLO_INC_DIR): $(USR_MONTECARLO_DIR) -$(INS.slink4) @@ -69,10 +68,10 @@ $(USR_MONTECARLO_SBIN_DIR): $(USR_MONTECARLO_DIR) -$(INS.slink5) $(USR_MONTECARLO_LIB_DIR): $(USR_MONTECARLO_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_MONTECARLO_ISYS_DIR): $(USR_MONTECARLO_INC_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_MONTECARLO_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_MONTECARLO_MOD_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/montecarlo/sys/Makefile b/usr/src/uts/sun4u/montecarlo/sys/Makefile index cad8b9152e..fbbb5168e7 100644 --- a/usr/src/uts/sun4u/montecarlo/sys/Makefile +++ b/usr/src/uts/sun4u/montecarlo/sys/Makefile @@ -58,7 +58,7 @@ $(USR_PSM_ISYS_DIR)/%: % $(USR_PSM_ISYS_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) FRC: diff --git a/usr/src/uts/sun4u/mpxu/Makefile.targ.shared b/usr/src/uts/sun4u/mpxu/Makefile.targ.shared index 285fb402be..060100d07f 100644 --- a/usr/src/uts/sun4u/mpxu/Makefile.targ.shared +++ b/usr/src/uts/sun4u/mpxu/Makefile.targ.shared @@ -33,40 +33,40 @@ # Rules for implementation subdirectories. # $(ROOT_MPXU_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MPXU_MOD_DIR): $(ROOT_MPXU_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MPXU_DRV_DIR_32): $(ROOT_MPXU_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MPXU_DRV_DIR_64): $(ROOT_MPXU_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MPXU_MISC_DIR_32): $(ROOT_MPXU_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MPXU_MISC_DIR_64): $(ROOT_MPXU_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MPXU_CRYPTO_DIR_32): $(ROOT_MPXU_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MPXU_CRYPTO_DIR_64): $(ROOT_MPXU_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_MPXU_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_MPXU_INC_DIR): $(USR_MPXU_DIR) $(INS.slink4) $(USR_MPXU_ISYS_DIR): $(USR_MPXU_INC_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(USR_MPXU_SBIN_DIR): $(USR_MPXU_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(USR_MPXU_SBIN_PRTDIAG): $(USR_MPXU_SBIN_DIR) $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@ @@ -84,7 +84,7 @@ $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%): $(USR_PLAT_DIR) $(INS.slink3) $(USR_MPXU_LIB_DIR): $(USR_MPXU_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_MPXU_MISC_DIR)/%: $(OBJS_DIR)/% $(ROOT_MPXU_MISC_DIR) $(INS.file) diff --git a/usr/src/uts/sun4u/mpxu/sys/Makefile b/usr/src/uts/sun4u/mpxu/sys/Makefile index 1db1962b4a..b3b2e572b2 100644 --- a/usr/src/uts/sun4u/mpxu/sys/Makefile +++ b/usr/src/uts/sun4u/mpxu/sys/Makefile @@ -63,7 +63,7 @@ $(USR_MPXU_ISYS_DIR)/%: % $(USR_MPXU_ISYS_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) FRC: diff --git a/usr/src/uts/sun4u/ngdr/sys/Makefile b/usr/src/uts/sun4u/ngdr/sys/Makefile index 1c9c3da2a9..9680386b52 100644 --- a/usr/src/uts/sun4u/ngdr/sys/Makefile +++ b/usr/src/uts/sun4u/ngdr/sys/Makefile @@ -60,7 +60,7 @@ $(USR_PSM_ISYS_DIR)/%: % $(USR_PSM_ISYS_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) FRC: diff --git a/usr/src/uts/sun4u/opl/Makefile.targ.shared b/usr/src/uts/sun4u/opl/Makefile.targ.shared index 86eb1b47b3..e85ddac84b 100644 --- a/usr/src/uts/sun4u/opl/Makefile.targ.shared +++ b/usr/src/uts/sun4u/opl/Makefile.targ.shared @@ -33,43 +33,43 @@ # Rules for implementation subdirectories. # $(ROOT_OPL_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_OPL_MOD_DIR): $(ROOT_OPL_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_OPL_DRV_DIR_32): $(ROOT_OPL_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_OPL_DRV_DIR_64): $(ROOT_OPL_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_OPL_CPU_DIR_32): $(ROOT_OPL_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_OPL_CPU_DIR_64): $(ROOT_OPL_CPU_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_OPL_MISC_DIR_32): $(ROOT_OPL_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_OPL_MISC_DIR_64): $(ROOT_OPL_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_OPL_CRYPTO_DIR_32): $(ROOT_OPL_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_OPL_CRYPTO_DIR_64): $(ROOT_OPL_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_OPL_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_OPL_INC_DIR): $(USR_OPL_DIR) $(USR_PSM_INCL_DIR) $(INS.slink4) $(USR_OPL_SBIN_DIR): $(USR_OPL_DIR) $(USR_PSM_SBIN_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(USR_OPL_SBIN_PRTDIAG): $(USR_OPL_SBIN_DIR) $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@ @@ -81,10 +81,10 @@ $(USR_OPL_SBIN_FRUADM): $(USR_OPL_SBIN_DIR) $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@ $(USR_OPL_LIB_DIR): $(USR_OPL_DIR) $(USR_PSM_LIB_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_OPL_ISYS_DIR): $(USR_OPL_INC_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(ROOT_OPL_KERN_DIR)/%: $(OBJS_DIR)/% $(ROOT_OPL_KERN_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/opl/sys/Makefile b/usr/src/uts/sun4u/opl/sys/Makefile index ca03d986c8..2d07ddff17 100644 --- a/usr/src/uts/sun4u/opl/sys/Makefile +++ b/usr/src/uts/sun4u/opl/sys/Makefile @@ -93,9 +93,6 @@ check: $(CHECKHDRS) $(USR_OPL_ISYS_DIR)/%: % $(USR_OPL_ISYS_DIR) $(INS.file) -$(ROOTDIRS): - $(INS.dir.bin.bin) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/quasar/Makefile.targ b/usr/src/uts/sun4u/quasar/Makefile.targ index 3e14e44857..566b8ffab8 100644 --- a/usr/src/uts/sun4u/quasar/Makefile.targ +++ b/usr/src/uts/sun4u/quasar/Makefile.targ @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u implementation specific modules. # @@ -36,16 +35,16 @@ IMPLEMENTED_PLATFORM = SUNW,Ultra-2 # Rules for implementation subdirectories. # $(ROOT_QUASAR_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_QUASAR_MOD_DIR): $(ROOT_QUASAR_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_QUASAR_MISC_DIR_32): $(ROOT_QUASAR_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_QUASAR_MISC_DIR_64): $(ROOT_QUASAR_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_QUASAR_DIR): $(USR_PLAT_DIR) -$(INS.slink3) diff --git a/usr/src/uts/sun4u/schumacher/Makefile.targ b/usr/src/uts/sun4u/schumacher/Makefile.targ index 80f3131135..e366b89aeb 100644 --- a/usr/src/uts/sun4u/schumacher/Makefile.targ +++ b/usr/src/uts/sun4u/schumacher/Makefile.targ @@ -32,37 +32,37 @@ IMPLEMENTED_PLATFORM = SUNW,Netra-CP3010 # Rules for implementation subdirectories. # $(ROOT_SCHUMACHER_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SCHUMACHER_MOD_DIR): $(ROOT_SCHUMACHER_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SCHUMACHER_MISC_DIR_32): $(ROOT_SCHUMACHER_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SCHUMACHER_MISC_DIR): $(ROOT_SCHUMACHER_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SCHUMACHER_DRV_DIR_32): $(ROOT_SCHUMACHER_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SCHUMACHER_DRV_DIR): $(ROOT_SCHUMACHER_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SCHUMACHER_CRYPTO_DIR_32): $(ROOT_SCHUMACHER_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SCHUMACHER_CRYPTO_DIR_64): $(ROOT_SCHUMACHER_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_SCHUMACHER_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_SCHUMACHER_INC_DIR): $(USR_SCHUMACHER_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_SCHUMACHER_SBIN_DIR): $(USR_SCHUMACHER_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_SCHUMACHER_SBIN_PRTDIAG): $(USR_SCHUMACHER_SBIN_DIR) $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@ @@ -74,10 +74,7 @@ $(USR_SCHUMACHER_SBIN_FRUADM): $(USR_SCHUMACHER_SBIN_DIR) $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@ $(USR_SCHUMACHER_LIB_DIR): $(USR_SCHUMACHER_DIR) - -$(INS.dir.root.bin) - -$(USR_SCHUMACHER_ISYS_DIR): $(USR_SCHUMACHER_INC_DIR) - -$(INS.dir.bin.bin) + -$(INS.dir) $(ROOT_SCHUMACHER_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_SCHUMACHER_MOD_DIR) $(INS.file) diff --git a/usr/src/uts/sun4u/seattle/Makefile.targ b/usr/src/uts/sun4u/seattle/Makefile.targ index 81c846f09f..1ba83a8c68 100644 --- a/usr/src/uts/sun4u/seattle/Makefile.targ +++ b/usr/src/uts/sun4u/seattle/Makefile.targ @@ -33,37 +33,37 @@ IMPLEMENTED_PLATFORM = SUNW,Sun-Fire-V215 # Rules for implementation subdirectories. # $(ROOT_SEATTLE_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SEATTLE_MOD_DIR): $(ROOT_SEATTLE_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SEATTLE_MISC_DIR_32): $(ROOT_SEATTLE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SEATTLE_MISC_DIR_64): $(ROOT_SEATTLE_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SEATTLE_DRV_DIR_32): $(ROOT_SEATTLE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SEATTLE_DRV_DIR_64): $(ROOT_SEATTLE_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SEATTLE_CRYPTO_DIR_32): $(ROOT_SEATTLE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SEATTLE_CRYPTO_DIR_64): $(ROOT_SEATTLE_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_SEATTLE_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_SEATTLE_INC_DIR): $(USR_SEATTLE_DIR) -$(INS.slink4) $(USR_SEATTLE_SBIN_DIR): $(USR_SEATTLE_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(USR_SEATTLE_SBIN_PRTDIAG): $(USR_SEATTLE_SBIN_DIR) $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@ @@ -81,10 +81,10 @@ $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%): $(USR_PLAT_DIR) $(INS.slink3) $(USR_SEATTLE_LIB_DIR): $(USR_SEATTLE_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_SEATTLE_ISYS_DIR): $(USR_SEATTLE_INC_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(ROOT_SEATTLE_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_SEATTLE_MOD_DIR) $(INS.file) diff --git a/usr/src/uts/sun4u/serengeti/Makefile.targ.shared b/usr/src/uts/sun4u/serengeti/Makefile.targ.shared index 4b9737e772..a74c1efc1b 100644 --- a/usr/src/uts/sun4u/serengeti/Makefile.targ.shared +++ b/usr/src/uts/sun4u/serengeti/Makefile.targ.shared @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u Serengeti implementation specific modules. # @@ -34,49 +33,49 @@ # Rules for implementation subdirectories. # $(ROOT_SERENGETI_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SERENGETI_MOD_DIR): $(ROOT_SERENGETI_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SERENGETI_CPU_DIR_32): $(ROOT_SERENGETI_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SERENGETI_CPU_DIR_64): $(ROOT_SERENGETI_CPU_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SERENGETI_DRV_DIR_32): $(ROOT_SERENGETI_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SERENGETI_DRV_DIR_64): $(ROOT_SERENGETI_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SERENGETI_MISC_DIR_32): $(ROOT_SERENGETI_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SERENGETI_MISC_DIR_64): $(ROOT_SERENGETI_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SERENGETI_CRYPTO_DIR_32): $(ROOT_SERENGETI_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SERENGETI_CRYPTO_DIR_64): $(ROOT_SERENGETI_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_SERENGETI_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_SERENGETI_INC_DIR): $(USR_SERENGETI_DIR) $(INS.slink4) $(USR_SERENGETI_ISYS_DIR): $(USR_SERENGETI_INC_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(USR_SERENGETI_SBIN_DIR): $(USR_SERENGETI_DIR) $(INS.slink5) $(USR_SERENGETI_LIB_DIR): $(USR_SERENGETI_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_SERENGETI_MISC_DIR)/%: $(OBJS_DIR)/% $(ROOT_SERENGETI_MISC_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/serengeti/sys/Makefile b/usr/src/uts/sun4u/serengeti/sys/Makefile index 72f110ba66..ae77ffec4b 100644 --- a/usr/src/uts/sun4u/serengeti/sys/Makefile +++ b/usr/src/uts/sun4u/serengeti/sys/Makefile @@ -60,7 +60,7 @@ $(USR_SERENGETI_ISYS_DIR)/%: % $(USR_SERENGETI_ISYS_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) FRC: diff --git a/usr/src/uts/sun4u/snowbird/Makefile.targ b/usr/src/uts/sun4u/snowbird/Makefile.targ index 176d4df30c..ec86663e3b 100644 --- a/usr/src/uts/sun4u/snowbird/Makefile.targ +++ b/usr/src/uts/sun4u/snowbird/Makefile.targ @@ -33,34 +33,34 @@ # Rules for implementation subdirectories. # $(ROOT_SNOWBIRD_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SNOWBIRD_MOD_DIR): $(ROOT_SNOWBIRD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SNOWBIRD_DRV_DIR_32): $(ROOT_SNOWBIRD_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SNOWBIRD_DRV_DIR_64): $(ROOT_SNOWBIRD_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SNOWBIRD_TOD_DIR_32): $(ROOT_SNOWBIRD_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SNOWBIRD_TOD_DIR_64): $(ROOT_SNOWBIRD_TOD_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SNOWBIRD_MISC_DIR_32): $(ROOT_SNOWBIRD_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SNOWBIRD_MISC_DIR_64): $(ROOT_SNOWBIRD_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SNOWBIRD_DACF_DIR_32): $(ROOT_SNOWBIRD_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SNOWBIRD_DACF_DIR_64): $(ROOT_SNOWBIRD_DACF_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SNOWBIRD_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_SNOWBIRD_MOD_DIR) FRC $(INS.file) @@ -78,13 +78,13 @@ $(ROOT_SNOWBIRD_TOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_SNOWBIRD_TOD_DIR) FRC $(INS.file) $(USR_SNOWBIRD_DIR): $(USR_PLAT_DIR) - $(INS.dir.root.sys) + $(INS.dir) $(USR_SNOWBIRD_INC_DIR): $(USR_SNOWBIRD_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_SNOWBIRD_SBIN_DIR): $(USR_SNOWBIRD_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_SNOWBIRD_SBIN_PRTDIAG): $(USR_SNOWBIRD_SBIN_DIR) $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@ @@ -96,10 +96,10 @@ $(USR_SNOWBIRD_SBIN_FRUADM): $(USR_SNOWBIRD_SBIN_DIR) $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@ $(USR_SNOWBIRD_LIB_DIR): $(USR_SNOWBIRD_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_SNOWBIRD_ISYS_DIR): $(USR_SNOWBIRD_INC_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) # # Include common targets. diff --git a/usr/src/uts/sun4u/snowbird/sys/Makefile b/usr/src/uts/sun4u/snowbird/sys/Makefile index c5867e721b..76da598e4a 100644 --- a/usr/src/uts/sun4u/snowbird/sys/Makefile +++ b/usr/src/uts/sun4u/snowbird/sys/Makefile @@ -58,7 +58,7 @@ $(ROOTDIR)/%: % $(ROOTDIR) $(INS.file) $(ROOTDIR): - $(INS.dir.root.bin) + $(INS.dir) FRC: diff --git a/usr/src/uts/sun4u/starcat/Makefile.targ.shared b/usr/src/uts/sun4u/starcat/Makefile.targ.shared index 4057dbc223..e22885a50c 100644 --- a/usr/src/uts/sun4u/starcat/Makefile.targ.shared +++ b/usr/src/uts/sun4u/starcat/Makefile.targ.shared @@ -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 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # Common targets for sun4u starcat implementation specific modules. @@ -34,37 +32,37 @@ # Rules for implementation subdirectories. # $(ROOT_STARCAT_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARCAT_MOD_DIR): $(ROOT_STARCAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARCAT_CPU_DIR_32): $(ROOT_STARCAT_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARCAT_CPU_DIR_64): $(ROOT_STARCAT_CPU_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARCAT_DRV_DIR_32): $(ROOT_STARCAT_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARCAT_DRV_DIR_64): $(ROOT_STARCAT_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARCAT_MISC_DIR_32): $(ROOT_STARCAT_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARCAT_MISC_DIR_64): $(ROOT_STARCAT_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARCAT_CRYPTO_DIR_32): $(ROOT_STARCAT_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARCAT_CRYPTO_DIR_64): $(ROOT_STARCAT_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_STARCAT_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_STARCAT_INC_DIR): $(USR_STARCAT_DIR) $(INS.slink4) @@ -73,10 +71,10 @@ $(USR_STARCAT_SBIN_DIR): $(USR_STARCAT_DIR) -$(INS.slink5) $(USR_STARCAT_LIB_DIR): $(USR_STARCAT_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_STARCAT_ISYS_DIR): $(USR_STARCAT_INC_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(ROOT_STARCAT_KERN_DIR)/%: $(OBJS_DIR)/% $(ROOT_STARCAT_KERN_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/starcat/sys/Makefile b/usr/src/uts/sun4u/starcat/sys/Makefile index f8062fb6ff..a0737ba647 100644 --- a/usr/src/uts/sun4u/starcat/sys/Makefile +++ b/usr/src/uts/sun4u/starcat/sys/Makefile @@ -69,9 +69,6 @@ check: $(CHECKHDRS) $(USR_STARCAT_ISYS_DIR)/%: % $(USR_STARCAT_ISYS_DIR) $(INS.file) -$(ROOTDIRS): - $(INS.dir.bin.bin) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/starfire/Makefile.targ b/usr/src/uts/sun4u/starfire/Makefile.targ index 71169768bf..e746704e81 100644 --- a/usr/src/uts/sun4u/starfire/Makefile.targ +++ b/usr/src/uts/sun4u/starfire/Makefile.targ @@ -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 1997-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # Common targets for sun4u starfire implementation specific modules. @@ -34,34 +32,34 @@ # Rules for implementation subdirectories. # $(ROOT_STARFIRE_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARFIRE_MOD_DIR): $(ROOT_STARFIRE_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARFIRE_KERN_DIR): $(ROOT_STARFIRE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARFIRE_DRV_DIR_32): $(ROOT_STARFIRE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARFIRE_DRV_DIR_64): $(ROOT_STARFIRE_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARFIRE_CPU_DIR_32): $(ROOT_STARFIRE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARFIRE_CPU_DIR_64): $(ROOT_STARFIRE_CPU_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARFIRE_MISC_DIR_32): $(ROOT_STARFIRE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_STARFIRE_MISC_DIR_64): $(ROOT_STARFIRE_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_STARFIRE_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_STARFIRE_INC_DIR): $(USR_STARFIRE_DIR) $(USR_PSM_INCL_DIR) $(INS.slink4) @@ -70,10 +68,10 @@ $(USR_STARFIRE_SBIN_DIR): $(USR_STARFIRE_DIR) $(USR_PSM_SBIN_DIR) -$(INS.slink5) $(USR_STARFIRE_LIB_DIR): $(USR_STARFIRE_DIR) $(USR_PSM_LIB_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_STARFIRE_ISYS_DIR): $(USR_STARFIRE_INC_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(ROOT_STARFIRE_KERN_DIR)/%: $(OBJS_DIR)/% $(ROOT_STARFIRE_KERN_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/starfire/sys/Makefile b/usr/src/uts/sun4u/starfire/sys/Makefile index 1b3f2aa488..00f306b5c3 100644 --- a/usr/src/uts/sun4u/starfire/sys/Makefile +++ b/usr/src/uts/sun4u/starfire/sys/Makefile @@ -61,7 +61,7 @@ $(USR_STARFIRE_ISYS_DIR)/%: % $(USR_STARFIRE_ISYS_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) FRC: diff --git a/usr/src/uts/sun4u/sunfire/Makefile.targ.shared b/usr/src/uts/sun4u/sunfire/Makefile.targ.shared index d74bada529..51607c85c9 100644 --- a/usr/src/uts/sun4u/sunfire/Makefile.targ.shared +++ b/usr/src/uts/sun4u/sunfire/Makefile.targ.shared @@ -20,10 +20,10 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u implementation specific modules. # @@ -34,37 +34,37 @@ # Rules for implementation subdirectories. # $(ROOT_SUNFIRE_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SUNFIRE_MOD_DIR): $(ROOT_SUNFIRE_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SUNFIRE_MISC_DIR_32): $(ROOT_SUNFIRE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SUNFIRE_MISC_DIR_64): $(ROOT_SUNFIRE_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SUNFIRE_DRV_DIR_32): $(ROOT_SUNFIRE_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_SUNFIRE_DRV_DIR_64): $(ROOT_SUNFIRE_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_SUNFIRE_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_SUNFIRE_INC_DIR): $(USR_SUNFIRE_DIR) $(USR_PSM_INCL_DIR) $(INS.slink4) $(USR_SUNFIRE_ISYS_DIR): $(USR_SUNFIRE_INC_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(USR_SUNFIRE_SBIN_DIR): $(USR_SUNFIRE_DIR) $(USR_PSM_SBIN_DIR) $(INS.slink5) $(USR_SUNFIRE_LIB_DIR): $(USR_SUNFIRE_DIR) $(USR_PSM_LIB_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_SUNFIRE_MISC_DIR)/%: $(OBJS_DIR)/% $(ROOT_SUNFIRE_MISC_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/sunfire/sys/Makefile b/usr/src/uts/sun4u/sunfire/sys/Makefile index 9e40e80589..d22c5433e3 100644 --- a/usr/src/uts/sun4u/sunfire/sys/Makefile +++ b/usr/src/uts/sun4u/sunfire/sys/Makefile @@ -60,7 +60,7 @@ $(USR_SUNFIRE_ISYS_DIR)/%: % $(USR_SUNFIRE_ISYS_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) FRC: diff --git a/usr/src/uts/sun4u/sys/Makefile b/usr/src/uts/sun4u/sys/Makefile index 089c13c4cc..4ac734662c 100644 --- a/usr/src/uts/sun4u/sys/Makefile +++ b/usr/src/uts/sun4u/sys/Makefile @@ -163,10 +163,10 @@ check: $(CHECKHDRS) # install rules # $(USR_PSM_MON_DIR): $(USR_PSM_ISYS_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(USR_PSM_ISYS_I2C_DIRS): - $(INS.dir.root.bin) + $(INS.dir) $(USR_PSM_ISYS_DIR)/%: $(CLOSED)/uts/sun4u/sys/% $(USR_PSM_ISYS_DIR) $(INS.file) @@ -184,7 +184,7 @@ $(USR_PSM_MON_DIR)/%: mon/% $(USR_PSM_MON_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) # -r because this used to be a directory and is now a link. $(ROOTLINK): $(ROOTDIRS) diff --git a/usr/src/uts/sun4u/taco/Makefile.targ b/usr/src/uts/sun4u/taco/Makefile.targ index 3f96de26de..fd129c240c 100644 --- a/usr/src/uts/sun4u/taco/Makefile.targ +++ b/usr/src/uts/sun4u/taco/Makefile.targ @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u implementation specific modules. # @@ -36,31 +35,31 @@ IMPLEMENTED_PLATFORM = SUNW,Sun-Blade-1500 # Rules for implementation subdirectories. # $(ROOT_TACO_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_TACO_MOD_DIR): $(ROOT_TACO_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_TACO_MISC_DIR_32): $(ROOT_TACO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_TACO_MISC_DIR_64): $(ROOT_TACO_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_TACO_DRV_DIR_32): $(ROOT_TACO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_TACO_DRV_DIR_64): $(ROOT_TACO_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_TACO_CRYPTO_DIR_32): $(ROOT_TACO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_TACO_CRYPTO_DIR_64): $(ROOT_TACO_CRYPTO_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_TACO_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_TACO_INC_DIR): $(USR_TACO_DIR) -$(INS.slink4) @@ -69,10 +68,7 @@ $(USR_TACO_SBIN_DIR): $(USR_TACO_DIR) -$(INS.slink5) $(USR_TACO_LIB_DIR): $(USR_TACO_DIR) - -$(INS.dir.root.bin) - -$(USR_TACO_ISYS_DIR): $(USR_TACO_INC_DIR) - -$(INS.dir.bin.bin) + -$(INS.dir) $(ROOT_TACO_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_TACO_MOD_DIR) $(INS.file) diff --git a/usr/src/uts/sun4u/tazmo/Makefile.targ.shared b/usr/src/uts/sun4u/tazmo/Makefile.targ.shared index 1dffe3de4c..90658a52ab 100644 --- a/usr/src/uts/sun4u/tazmo/Makefile.targ.shared +++ b/usr/src/uts/sun4u/tazmo/Makefile.targ.shared @@ -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,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # Common targets for sun4u Tazmo implementation specific modules. # @@ -36,25 +35,25 @@ IMPLEMENTED_PLATFORM = SUNW,Ultra-4 # Rules for implementation subdirectories. # $(ROOT_TAZMO_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_TAZMO_MOD_DIR): $(ROOT_TAZMO_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_TAZMO_DRV_DIR_32): $(ROOT_TAZMO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_TAZMO_DRV_DIR_64): $(ROOT_TAZMO_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_TAZMO_MISC_DIR_32): $(ROOT_TAZMO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_TAZMO_MISC_DIR_64): $(ROOT_TAZMO_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_TAZMO_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_TAZMO_INC_DIR): $(USR_TAZMO_DIR) -$(INS.slink4) @@ -63,10 +62,7 @@ $(USR_TAZMO_SBIN_DIR): $(USR_TAZMO_DIR) -$(INS.slink5) $(USR_TAZMO_LIB_DIR): $(USR_TAZMO_DIR) - -$(INS.dir.root.bin) - -$(USR_TAZMO_ISYS_DIR): $(USR_TAZMO_INC_DIR) - -$(INS.dir.bin.bin) + -$(INS.dir) $(ROOT_TAZMO_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_TAZMO_MOD_DIR) FRC $(INS.file) diff --git a/usr/src/uts/sun4u/vm/Makefile b/usr/src/uts/sun4u/vm/Makefile index c7feb0eeb6..4b13d436ff 100644 --- a/usr/src/uts/sun4u/vm/Makefile +++ b/usr/src/uts/sun4u/vm/Makefile @@ -63,7 +63,7 @@ $(USR_PSM_IVM_DIR)/%: ../../sfmmu/vm/% $(USR_PSM_IVM_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) # -r because this used to be a directory and is now a link. $(ROOTLINK): $(ROOTDIRS) diff --git a/usr/src/uts/sun4v/Makefile b/usr/src/uts/sun4v/Makefile index 630fe5e001..65570cd9c2 100644 --- a/usr/src/uts/sun4v/Makefile +++ b/usr/src/uts/sun4v/Makefile @@ -139,7 +139,7 @@ install_h check: install_platforms $(IMPLEMENTATIONS) FRC # here in kernel land. # $(ROOT_PLAT_DIRS): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%): $(ROOT_PLAT_DIR) $(INS.slink1) @@ -153,7 +153,7 @@ $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%): $(ROOT_PLAT_DIR) # that are linked to it. # $(USR_PLAT_DIR)/$(IMPLEMENTED_PLATFORM): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) # # create the links in /usr/platform/ foreach $(LINKED_PLATFORMS) @@ -208,76 +208,76 @@ $(USR_DESKTOP_SBIN_DIR): $(USR_DESKTOP_DIR) $(INS.slink5) $(USR_DESKTOP_LIB_DIR): $(USR_DESKTOP_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_STPAUL_DIR): $(USR_SUN4V_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_STPAUL_SBIN_DIR): $(USR_STPAUL_DIR) $(INS.slink5) $(USR_STPAUL_LIB_DIR): $(USR_STPAUL_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_HURON_DIR): $(USR_SUN4V_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_HURON_SBIN_DIR): $(USR_HURON_DIR) $(INS.slink5) $(USR_HURON_LIB_DIR): $(USR_HURON_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_GLENDALE_DIR): $(USR_SUN4V_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_GLENDALE_SBIN_DIR): $(USR_GLENDALE_DIR) $(INS.slink5) $(USR_GLENDALE_LIB_DIR): $(USR_GLENDALE_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_MARAMBA_DIR): $(USR_SUN4V_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_MARAMBA_SBIN_DIR): $(USR_MARAMBA_DIR) $(INS.slink5) $(USR_MARAMBA_LIB_DIR): $(USR_MARAMBA_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_THUNDER_DIR): $(USR_SUN4V_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_THUNDER_SBIN_DIR): $(USR_THUNDER_DIR) $(INS.slink5) $(USR_THUNDER_LIB_DIR): $(USR_THUNDER_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_TURGO_DIR): $(USR_SUN4V_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_TURGO_SBIN_DIR): $(USR_TURGO_DIR) $(INS.slink5) $(USR_TURGO_LIB_DIR): $(USR_TURGO_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_CONGO_DIR): $(USR_SUN4V_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_CONGO_SBIN_DIR): $(USR_CONGO_DIR) $(INS.slink5) $(USR_CONGO_LIB_DIR): $(USR_CONGO_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_MONZA_DIR): $(USR_SUN4V_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_MONZA_SBIN_DIR): $(USR_MONZA_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_MONZA_SBIN_LINKS): $(USR_MONZA_SBIN_DIR) $(INS.slink7) diff --git a/usr/src/uts/sun4v/montoya/Makefile.targ b/usr/src/uts/sun4v/montoya/Makefile.targ index fb5eaf5db0..8f2f4a3c82 100644 --- a/usr/src/uts/sun4v/montoya/Makefile.targ +++ b/usr/src/uts/sun4v/montoya/Makefile.targ @@ -30,25 +30,25 @@ # Rules for implementation subdirectories. # $(ROOT_MONTOYA_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MONTOYA_MOD_DIR): $(ROOT_MONTOYA_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MONTOYA_DRV_DIR_32): $(ROOT_MONTOYA_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MONTOYA_DRV_DIR_64): $(ROOT_MONTOYA_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MONTOYA_LIB_DIR): $(ROOT_MONTOYA_DIR) -$(INS.slink2) $(ROOT_MONTOYA_MISC_DIR_32): $(ROOT_MONTOYA_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MONTOYA_MISC_DIR_64): $(ROOT_MONTOYA_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MONTOYA_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_MONTOYA_MOD_DIR) FRC $(INS.file) @@ -60,19 +60,19 @@ $(ROOT_MONTOYA_DRV_DIR)/%: $(OBJS_DIR)/% $(ROOT_MONTOYA_DRV_DIR) FRC $(INS.file) $(USR_MONTOYA_DIR): $(USR_SUN4V_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_MONTOYA_INC_DIR): $(USR_MONTOYA_DIR) -$(INS.slink4) $(USR_MONTOYA_ISYS_DIR): $(USR_MONTOYA_INC_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_MONTOYA_SBIN_DIR): $(USR_MONTOYA_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_MONTOYA_LIB_DIR): $(USR_MONTOYA_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%): $(USR_PLAT_DIR) $(INS.slink3) diff --git a/usr/src/uts/sun4v/ontario/Makefile.targ b/usr/src/uts/sun4v/ontario/Makefile.targ index f1a06ad611..272b1c91df 100644 --- a/usr/src/uts/sun4v/ontario/Makefile.targ +++ b/usr/src/uts/sun4v/ontario/Makefile.targ @@ -18,10 +18,7 @@ # # CDDL HEADER END # -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # Common targets for sun4v platform-implementation specific modules. @@ -33,25 +30,25 @@ # Rules for implementation subdirectories. # $(ROOT_ONTARIO_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ONTARIO_MOD_DIR): $(ROOT_ONTARIO_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ONTARIO_DRV_DIR_32): $(ROOT_ONTARIO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ONTARIO_DRV_DIR_64): $(ROOT_ONTARIO_DRV_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ONTARIO_LIB_DIR): $(ROOT_ONTARIO_DIR) -$(INS.slink2) $(ROOT_ONTARIO_MISC_DIR_32): $(ROOT_ONTARIO_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ONTARIO_MISC_DIR_64): $(ROOT_ONTARIO_MISC_DIR_32) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_ONTARIO_MOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_ONTARIO_MOD_DIR) FRC $(INS.file) @@ -63,19 +60,19 @@ $(ROOT_ONTARIO_DRV_DIR)/%: $(OBJS_DIR)/% $(ROOT_ONTARIO_DRV_DIR) FRC $(INS.file) $(USR_ONTARIO_DIR): $(USR_SUN4V_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_ONTARIO_INC_DIR): $(USR_ONTARIO_DIR) -$(INS.slink4) $(USR_ONTARIO_ISYS_DIR): $(USR_ONTARIO_INC_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_ONTARIO_SBIN_DIR): $(USR_ONTARIO_DIR) -$(INS.slink5) $(USR_ONTARIO_LIB_DIR): $(USR_ONTARIO_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%): $(USR_PLAT_DIR) $(INS.slink3) diff --git a/usr/src/uts/sun4v/sys/Makefile b/usr/src/uts/sun4v/sys/Makefile index 448bd3ed64..e1fbc45731 100644 --- a/usr/src/uts/sun4v/sys/Makefile +++ b/usr/src/uts/sun4v/sys/Makefile @@ -143,7 +143,7 @@ $(USR_PSM_ISYS_DIR)/%: $(CLOSED)/uts/sun4v/sys/% $(USR_PSM_ISYS_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) # -r because this used to be a directory and is now a link. $(ROOTLINK): $(ROOTDIRS) diff --git a/usr/src/uts/sun4v/vm/Makefile b/usr/src/uts/sun4v/vm/Makefile index 631c8b39c1..f98b3bbdce 100644 --- a/usr/src/uts/sun4v/vm/Makefile +++ b/usr/src/uts/sun4v/vm/Makefile @@ -63,7 +63,7 @@ $(USR_PSM_IVM_DIR)/%: ../../sfmmu/vm/% $(USR_PSM_IVM_DIR) $(INS.file) $(ROOTDIRS): - $(INS.dir.root.bin) + $(INS.dir) # -r because this used to be a directory and is now a link. $(ROOTLINK): $(ROOTDIRS) |