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 | |
| 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
121 files changed, 906 insertions, 1182 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index d1349cde23..de647b53b7 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -54,12 +54,18 @@ ROOT= /proto # # The declaration POUND_SIGN is always '#'. This is needed to get around the # make feature that '#' is always a comment delimiter, even when escaped or -# quoted. The only way of generating this is the :sh macro mechanism. Note -# however that in general :sh macros should be avoided in makefiles that are -# widely included into other makefiles, as the resulting shell executions can -# cause a noticable slowdown in build times. +# quoted. We use this macro expansion method to get POUND_SIGN rather than +# always breaking out a shell because the general case can cause a noticable +# slowdown in build times when so many Makefiles include Makefile.master. # -POUND_SIGN:sh= echo \\043 +# While the majority of users are expected to override the setting below +# with an env file (via nightly or bldenv), if you aren't building that way +# (ie, you're using "ws" or some other bootstrapping method) then you need +# this definition in order to avoid the subshell invocation mentioned above. +# + +PRE_POUND= pre\# +POUND_SIGN= $(PRE_POUND:pre\%=%) NOT_RELEASE_BUILD= INTERNAL_RELEASE_BUILD= $(POUND_SIGN) @@ -885,11 +891,10 @@ RELEASE_MINOR= 11 RELEASE= $(RELEASE_MAJOR).$(RELEASE_MINOR) VERSION= SunOS Development PATCHID= $(VERSION) -RELEASE_DATE= October 2007 +RELEASE_DATE= release date not set PATCH_DATE= $(RELEASE_DATE) RELEASE_CM= "@($(POUND_SIGN))SunOS $(RELEASE) $(PATCHID) $(PATCH_DATE)" -DEV_CM= "@($(POUND_SIGN))SunOS Internal Development: \ -`$(ECHO) $$LOGNAME` `date +%Y-%m-%d` `$(ECHO) [\`basename $$CODEMGR_WS\`]`" +DEV_CM= "@($(POUND_SIGN))SunOS Internal Development: non-nightly build" PROCESS_COMMENT= @?${MCS} -c -a $(RELEASE_CM) -a $(DEV_CM) $(STRIP_COMMENTS)PROCESS_COMMENT= @?${MCS} -d -a $(RELEASE_CM) -a $(DEV_CM) diff --git a/usr/src/Makefile.psm b/usr/src/Makefile.psm index 81a8cb3c17..a178b2a208 100644 --- a/usr/src/Makefile.psm +++ b/usr/src/Makefile.psm @@ -26,16 +26,7 @@ # # Makefile.psm, global definitions for platform specific modules -# -# The distinction between root.sys and root.bin is largely historical; -# the files in group bin used to be owned by user bin. -# -INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@ -INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@ -# -# -# ROOT_PLAT_DIR = $(ROOT)/platform ROOT_PSM_DIR = $(ROOT_PLAT_DIR)/$(PLATFORM) diff --git a/usr/src/Makefile.psm.targ b/usr/src/Makefile.psm.targ index dae5ab3a49..aa593dee90 100644 --- a/usr/src/Makefile.psm.targ +++ b/usr/src/Makefile.psm.targ @@ -28,26 +28,26 @@ # Installation targets and rules: # $(ROOT_PLAT_DIR) $(USR_PLAT_DIR): - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_PSM_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_BOOT_PSM_KERN_DIR): - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_PSM_LIB_DIR) \ $(ROOT_PSM_SBIN_DIR): $(ROOT_PSM_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_PSM_LIB64_DIR): $(ROOT_PSM_LIB_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_PSM_MOD_DIR): $(ROOT_PSM_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_PSM_MOD_DIRS_32): $(ROOT_PSM_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_PSM_DIR)/%: % $(ROOT_PSM_DIR) $(INS.file) @@ -113,13 +113,13 @@ $(ROOT_PSM_BRAND_DIR)/%: $(OBJS_DIR)/% $(ROOT_PSM_BRAND_DIR) FRC $(INS.file) $(ROOT_PSM_LIB_FS_DIR): $(ROOT_PSM_LIB_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_PSM_LIB_UFS_DIR) \ $(ROOT_PSM_LIB_NFS_DIR) \ $(ROOT_PSM_LIB_HSFS_DIR) \ $(ROOT_PSM_LIB_ZFS_DIR): $(ROOT_PSM_LIB_FS_DIR) - $(INS.dir.root.bin) + $(INS.dir) $(ROOT_PSM_LIB_UFS_DIR)/%: % $(ROOT_PSM_LIB_UFS_DIR) $(INS.file) @@ -137,34 +137,34 @@ $(ROOT_PSM_LIB_ZFS_DIR)/%: % $(ROOT_PSM_LIB_ZFS_DIR) # # $(USR_PSM_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_INCL_DIR) \ $(USR_PSM_LIB_DIR) \ $(USR_PSM_SBIN_DIR): $(USR_PSM_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_LIB64_DIR): $(USR_PSM_LIB_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_LIB_FS_DIR): $(USR_PSM_LIB_DIR) $(LINKED_LIB_FS_DIRS) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_LIB_UFS_DIR) \ $(USR_PSM_LIB_NFS_DIR) \ $(USR_PSM_LIB_HSFS_DIR) \ $(USR_PSM_LIB_ZFS_DIR): $(USR_PSM_LIB_FS_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_MOD_DIR): $(USR_PSM_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_MOD_DIRS_32): $(USR_PSM_MOD_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_ISYS_DIR) \ $(USR_PSM_IVM_DIR): $(USR_PSM_INCL_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_INCL_DIR)/%: % $(USR_PSM_INCL_DIR) $(INS.file) @@ -227,10 +227,10 @@ $(USR_PSM_DACF_DIR)/%: % $(USR_PSM_DACF_DIR) FRC # links in /usr/platform # $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_ADB_DIRS): $(LINKED_LIB_DIRS) -$(INS.slink6) diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs index fe3b05ecf7..4cb855b1c1 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -24,43 +24,52 @@ # # -# The list is built of owner-group combinations. ROOT.SYS occurs twice -# because some directories owned by root and in group sys are subdirectories -# of directories having other owner-group attributes. -# # It is easier to think in terms of directory names without the ROOT macro # prefix. ROOTDIRS is TARGETDIRS with ROOT prefixes. It is necessary # to work with ROOT prefixes when controlling conditional assignments. # -# The macro SYM.ROOT.SYS means symlinks with owner root and group sys. - -SYMLINKS= $(SYM.ROOT.SYS) $(SYM.ROOT.BIN) $(SYM.OTHERS) -TARGETDIRS= $(ROOT.SYS) $(ROOT.BIN) $(ROOT.SYS2) \ - $(UUCP.UUCP) $(OTHERS) $(ROOT.OTHER) \ - $(SYM.USRCCSLIB) $(SYM.USRLIB) +DIRLINKS= $(SYM.DIRS) +$(BUILD64) DIRLINKS += $(SYM.DIRS64) -$(BUILD64) TARGETDIRS += $(ROOT.SYS64.2) $(ROOT.BIN64) \ - $(SYM.USRCCSLIB64) $(SYM.USRLIB64) +FILELINKS= $(SYM.USRCCSLIB) $(SYM.USRLIB) +$(BUILD64) FILELINKS += $(SYM.USRCCSLIB64) $(SYM.USRLIB64) -$(BUILD64) SYMLINKS += $(SYM.ROOT.BIN64) +TARGETDIRS= $(DIRS) +$(BUILD64) TARGETDIRS += $(DIRS64) -TARGETDIRS += $(SYMLINKS) +TARGETDIRS += $(FILELINKS) $(DIRLINKS) -i386_ROOT.SYS= \ +i386_DIRS= \ /boot/acpi \ /boot/acpi/tables \ /boot/grub \ /boot/grub/bin \ - /platform/i86pc + /platform/i86pc \ + /usr/lib/brand/lx \ + /usr/lib/brand/lx/amd64 \ + /usr/lib/brand/lx/distros \ + /usr/lib/xen \ + /usr/lib/xen/bin -sparc_ROOT.SYS= +sparc_DIRS= \ + /usr/lib/ldoms -ROOT.SYS= \ +# EXPORT DELETE START +XDIRS= \ + /usr/lib/inet/wanboot +# EXPORT DELETE END + +sparc_64ONLY= $(POUND_SIGN) +64ONLY= $($(MACH)_64ONLY) + +$(64ONLY) MACH32_DIRS=/usr/ucb/$(MACH32) + +DIRS= \ /boot \ /boot/solaris \ /boot/solaris/bin \ - $($(MACH)_ROOT.SYS) \ + $($(MACH)_DIRS) \ /dev \ /dev/dsk \ /dev/fd \ @@ -71,6 +80,7 @@ ROOT.SYS= \ /dev/pts \ /dev/sad \ /dev/swap \ + /dev/term \ /dev/vt \ /dev/zcons \ /devices \ @@ -83,10 +93,13 @@ ROOT.SYS= \ /etc/crypto \ /etc/crypto/certs \ /etc/crypto/crls \ + /etc/dbus-1 \ + /etc/dbus-1/system.d \ /etc/default \ /etc/devices \ /etc/dev \ /etc/dfs \ + /etc/dladm \ /etc/fs \ /etc/fs/nfs \ /etc/fs/zfs \ @@ -113,12 +126,24 @@ ROOT.SYS= \ /etc/init.d \ /etc/dhcp \ /etc/lib \ + /etc/mail \ + /etc/mail/cf \ + /etc/mail/cf/cf \ + /etc/mail/cf/domain \ + /etc/mail/cf/feature \ + /etc/mail/cf/m4 \ + /etc/mail/cf/mailer \ + /etc/mail/cf/ostype \ + /etc/mail/cf/sh \ + /etc/net-snmp \ + /etc/net-snmp/snmp \ /etc/opt \ /etc/rc0.d \ /etc/rc1.d \ /etc/rc2.d \ /etc/rc3.d \ /etc/rcS.d \ + /etc/saf \ /etc/sasl \ /etc/sfw \ /etc/svc \ @@ -129,98 +154,6 @@ ROOT.SYS= \ /etc/zones \ /export \ /home \ - /kernel \ - /mnt \ - /opt \ - /platform \ - /proc \ - /root \ - /sbin \ - /system \ - /system/contract \ - /system/object \ - /usr \ - /usr/kernel \ - /usr/platform \ - /usr/share \ - /var \ - /var/adm \ - /var/adm/pool \ - /var/adm/sm.bin \ - /var/adm/streams \ - /var/cores \ - /var/cron \ - /var/db \ - /var/db/ipf \ - /var/krb5 \ - /var/krb5/rcache \ - /var/krb5/rcache/root \ - /var/log \ - /var/log/pool \ - /var/sadm \ - /var/sadm/pkg \ - /var/sadm/security \ - /var/opt \ - /var/run \ - /var/smb \ - /var/svc \ - /var/svc/log \ - /var/svc/manifest \ - /var/svc/manifest/milestone \ - /var/svc/manifest/device \ - /var/svc/manifest/system \ - /var/svc/manifest/system/device \ - /var/svc/manifest/system/filesystem \ - /var/svc/manifest/system/security \ - /var/svc/manifest/system/svc \ - /var/svc/manifest/network \ - /var/svc/manifest/network/dns \ - /var/svc/manifest/network/ipsec \ - /var/svc/manifest/network/ldap \ - /var/svc/manifest/network/nfs \ - /var/svc/manifest/network/nis \ - /var/svc/manifest/network/rpc \ - /var/svc/manifest/network/security \ - /var/svc/manifest/network/shares \ - /var/svc/manifest/network/ssl \ - /var/svc/manifest/application \ - /var/svc/manifest/application/management \ - /var/svc/manifest/application/security \ - /var/svc/manifest/application/print \ - /var/svc/manifest/platform \ - /var/svc/manifest/platform/sun4u \ - /var/svc/manifest/platform/sun4v \ - /var/svc/manifest/site \ - /var/svc/profile \ - /var/tsol \ - /var/tsol/doors - -# EXPORT DELETE START -XROOT.BIN= \ - /usr/lib/inet/wanboot -# EXPORT DELETE END - -i386_ROOT.BIN= \ - /usr/lib/brand/lx \ - /usr/lib/brand/lx/amd64 \ - /usr/lib/brand/lx/distros \ - /usr/lib/xen \ - /usr/lib/xen/bin - -sparc_ROOT.BIN= \ - /usr/lib/ldoms - -sparc_64ONLY= $(POUND_SIGN) -64ONLY= $($(MACH)_64ONLY) - -$(64ONLY) MACH32_ROOT.UCB=/usr/ucb/$(MACH32) -ROOT.BIN= \ - $($(MACH)_ROOT.BIN) \ - /etc/dbus-1 \ - /etc/dbus-1/system.d \ - /etc/saf \ - /etc/net-snmp \ - /etc/net-snmp/snmp \ /lib \ /lib/crypto \ /lib/inet \ @@ -232,6 +165,18 @@ ROOT.BIN= \ /lib/svc/monitor \ /lib/svc/seed \ /lib/svc/share \ + /kernel \ + /mnt \ + /opt \ + /platform \ + /proc \ + /root \ + /sbin \ + /system \ + /system/contract \ + /system/object \ + /tmp \ + /usr \ /usr/4lib \ /usr/ast \ /usr/ast/bin \ @@ -245,7 +190,6 @@ ROOT.BIN= \ /usr/games \ /usr/include \ /usr/include/ast \ - /usr/include/sys/crypto \ /usr/include/fm \ /usr/include/gssapi \ /usr/include/hal \ @@ -255,7 +199,9 @@ ROOT.BIN= \ /usr/include/sasl \ /usr/include/scsi \ /usr/include/security \ + /usr/include/sys/crypto \ /usr/include/tsol \ + /usr/kernel \ /usr/kvm \ /usr/lib \ /usr/lib/abi \ @@ -272,17 +218,22 @@ ROOT.BIN= \ /usr/lib/crypto \ /usr/lib/drv \ /usr/lib/elfedit \ + /usr/lib/fm \ /usr/lib/font \ + /usr/lib/fs \ + /usr/lib/fs/nfs \ + /usr/lib/fs/proc \ + /usr/lib/fs/smb \ + /usr/lib/fs/zfs \ + /usr/lib/gss \ + /usr/lib/hal \ /usr/lib/inet \ /usr/lib/inet/dhcp \ /usr/lib/inet/dhcp/nsu \ /usr/lib/inet/dhcp/svc \ /usr/lib/inet/dhcp/svcadm \ /usr/lib/inet/$(MACH32) \ - $(XROOT.BIN) \ - /usr/lib/fm \ - /usr/lib/gss \ - /usr/lib/hal \ + $(XDIRS) \ /usr/lib/krb5 \ /usr/lib/link_audit \ /usr/lib/libp \ @@ -290,12 +241,20 @@ ROOT.BIN= \ /usr/lib/localedef/extensions \ /usr/lib/localedef/src \ /usr/lib/lwp \ + /usr/lib/mdb \ + /usr/lib/mdb/kvm \ + /usr/lib/mdb/proc \ + /usr/lib/mdb/disasm \ + /usr/lib/nfs \ + /usr/net \ + /usr/net/servers \ /usr/lib/pool \ /usr/lib/python2.4 \ /usr/lib/python2.4/vendor-packages \ /usr/lib/python2.4/vendor-packages/zfs \ /usr/lib/rcap \ /usr/lib/rcap/$(MACH32) \ + /usr/lib/sa \ /usr/lib/saf \ /usr/lib/sasl \ /usr/lib/scsi \ @@ -307,6 +266,7 @@ ROOT.BIN= \ /usr/lib/zones \ /usr/old \ /usr/openwin \ + /usr/platform \ /usr/proc \ /usr/proc/bin \ /usr/sadm \ @@ -315,18 +275,29 @@ ROOT.BIN= \ /usr/sadm/install/scripts \ /usr/sadm/sysadm \ /usr/sadm/sysadm/add-ons \ - /usr/snadm \ - /usr/snadm/lib \ /usr/sbin \ /usr/sbin/$(MACH32) \ + /usr/share \ + /usr/share/applications \ /usr/share/audio \ /usr/share/audio/samples \ /usr/share/audio/samples/au \ + /usr/share/gnome \ /usr/share/gnome/autostart \ + /usr/share/hwdata \ + /usr/share/lib \ + /usr/share/lib/ccs \ + /usr/share/lib/tmac \ + /usr/share/lib/ldif \ + /usr/share/lib/xml \ + /usr/share/lib/xml/dtd \ /usr/share/man \ /usr/share/man/man1m \ + /usr/share/src \ + /usr/snadm \ + /usr/snadm/lib \ /usr/ucb \ - $(MACH32_ROOT.UCB) \ + $(MACH32_DIRS) \ /usr/ucblib \ /usr/xpg4 \ /usr/xpg4/bin \ @@ -334,20 +305,86 @@ ROOT.BIN= \ /usr/xpg4/lib \ /usr/xpg6 \ /usr/xpg6/bin \ + /var \ + /var/adm \ + /var/adm/exacct \ + /var/adm/log \ + /var/adm/pool \ + /var/adm/sa \ + /var/adm/sm.bin \ + /var/adm/streams \ + /var/cores \ + /var/cron \ + /var/db \ + /var/db/ipf \ /var/games \ + /var/idmap \ + /var/krb5 \ + /var/krb5/rcache \ + /var/krb5/rcache/root \ /var/ld \ + /var/log \ + /var/log/pool \ + /var/mail \ /var/news \ + /var/opt \ /var/preserve \ + /var/run \ /var/saf \ + /var/sadm \ /var/sadm/install \ /var/sadm/install/admin \ /var/sadm/install/logs \ + /var/sadm/pkg \ + /var/sadm/security \ + /var/smb \ /var/spool \ - /var/spool/pkg + /var/spool/cron \ + /var/spool/cron/atjobs \ + /var/spool/cron/crontabs \ + /var/spool/lp \ + /var/spool/pkg \ + /var/spool/uucp \ + /var/spool/uucppublic \ + /var/svc \ + /var/svc/log \ + /var/svc/manifest \ + /var/svc/manifest/milestone \ + /var/svc/manifest/device \ + /var/svc/manifest/system \ + /var/svc/manifest/system/device \ + /var/svc/manifest/system/filesystem \ + /var/svc/manifest/system/security \ + /var/svc/manifest/system/svc \ + /var/svc/manifest/network \ + /var/svc/manifest/network/dns \ + /var/svc/manifest/network/ipsec \ + /var/svc/manifest/network/ldap \ + /var/svc/manifest/network/nfs \ + /var/svc/manifest/network/nis \ + /var/svc/manifest/network/rpc \ + /var/svc/manifest/network/security \ + /var/svc/manifest/network/shares \ + /var/svc/manifest/network/ssl \ + /var/svc/manifest/application \ + /var/svc/manifest/application/management \ + /var/svc/manifest/application/security \ + /var/svc/manifest/application/print \ + /var/svc/manifest/platform \ + /var/svc/manifest/platform/sun4u \ + /var/svc/manifest/platform/sun4v \ + /var/svc/manifest/site \ + /var/svc/profile \ + /var/uucp \ + /var/tmp \ + /var/tsol \ + /var/tsol/doors -sparcv9_ROOT.BIN64= \ +sparcv9_DIRS64= \ + /platform/sun4u \ /platform/sun4u/lib \ /platform/sun4u/lib/$(MACH64) \ + /usr/platform/sun4u \ /usr/platform/sun4u/sbin \ /usr/platform/sun4u/lib \ /platform/sun4v/lib \ @@ -357,11 +394,11 @@ sparcv9_ROOT.BIN64= \ /usr/platform/sun4u-us3/lib \ /usr/platform/sun4u-opl/lib -amd64_ROOT.BIN64= \ +amd64_DIRS64= \ /platform/i86pc/amd64 -ROOT.BIN64= \ - $($(MACH64)_ROOT.BIN64) \ +DIRS64= \ + $($(MACH64)_DIRS64) \ /lib/$(MACH64) \ /lib/crypto/$(MACH64) \ /lib/secure/$(MACH64) \ @@ -373,11 +410,15 @@ ROOT.BIN64= \ /usr/lib/brand/sn1/$(MACH64) \ /usr/lib/elfedit/$(MACH64) \ /usr/lib/fm/$(MACH64) \ + /usr/lib/fs/nfs/$(MACH64) \ + /usr/lib/fs/smb/$(MACH64) \ /usr/lib/inet/$(MACH64) \ /usr/lib/krb5/$(MACH64) \ /usr/lib/libp/$(MACH64) \ /usr/lib/link_audit/$(MACH64) \ /usr/lib/lwp/$(MACH64) \ + /usr/lib/mdb/kvm/$(MACH64) \ + /usr/lib/mdb/proc/$(MACH64) \ /usr/lib/rcap/$(MACH64) \ /usr/lib/sasl/$(MACH64) \ /usr/lib/scsi/$(MACH64) \ @@ -391,120 +432,50 @@ ROOT.BIN64= \ /usr/xpg4/lib/$(MACH64) \ /var/ld/$(MACH64) -ROOT.OTHER= \ - /usr/share/applications \ - /usr/share/gnome - -ROOT.SYS2= \ - /usr/lib/fs \ - /usr/lib/fs/nfs \ - /usr/lib/fs/proc \ - /usr/lib/fs/smb \ - /usr/lib/fs/zfs \ - /usr/lib/mdb \ - /usr/lib/mdb/kvm \ - /usr/lib/mdb/proc \ - /usr/lib/mdb/disasm \ - /usr/lib/nfs \ - /usr/net \ - /usr/net/servers \ - /usr/share/hwdata \ - /usr/share/lib \ - /usr/share/lib/xml \ - /usr/share/lib/xml/dtd \ - /usr/share/src \ - /var/spool/cron \ - /var/spool/cron/atjobs \ - /var/spool/cron/crontabs - -sparcv9_ROOT.SYS64.2 = \ - /platform/sun4u \ - /usr/platform/sun4u - -amd64_ROOT.SYS64.2 = - -ROOT.SYS64.2 = \ - $($(MACH64)_ROOT.SYS64.2) \ - /usr/lib/mdb/kvm/$(MACH64) \ - /usr/lib/mdb/proc/$(MACH64) \ - /usr/lib/fs/nfs/$(MACH64) \ - /usr/lib/fs/smb/$(MACH64) - -UUCP.UUCP= \ - /var/spool/uucp \ - /var/spool/uucppublic \ - /var/uucp - -OTHERS= \ - /dev/term \ - /tmp \ - /etc/dladm \ - /etc/mail \ - /etc/mail/cf \ - /etc/mail/cf/cf \ - /etc/mail/cf/domain \ - /etc/mail/cf/feature \ - /etc/mail/cf/m4 \ - /etc/mail/cf/mailer \ - /etc/mail/cf/ostype \ - /etc/mail/cf/sh \ - /usr/lib/sa \ - /usr/share/lib/ccs \ - /usr/share/lib/tmac \ - /usr/share/lib/ldif \ - /var/adm/exacct \ - /var/adm/log \ - /var/adm/sa \ - /var/idmap \ - /var/mail \ - /var/spool/lp \ - /var/tmp - # /var/mail/:saved is built directly by the rootdirs target in # /usr/src/Makefile because of the colon in its name. # macros for symbolic links - -SYM.ROOT.SYS= \ +SYM.DIRS= \ + /bin \ /dev/stdin \ /dev/stdout \ /dev/stderr \ - /usr/adm \ - /usr/lib/cron \ - /usr/man \ - /usr/pub - -SYM.ROOT.BIN= \ - /bin \ - /lib/32 \ - /lib/crypto/32 \ - /lib/secure/32 \ /etc/lib/ld.so.1 \ /etc/lib/libdl.so.1 \ /etc/lib/nss_files.so.1 \ + /etc/log \ + /lib/32 \ + /lib/crypto/32 \ + /lib/secure/32 \ + /usr/adm \ /usr/spool \ /usr/lib/tmac \ /usr/ccs/lib/link_audit \ /usr/news \ /usr/preserve \ - /usr/src \ /usr/lib/32 \ + /usr/lib/cron \ /usr/lib/elfedit/32 \ /usr/lib/libp/32 \ /usr/lib/lwp/32 \ /usr/lib/link_audit/32 \ /usr/lib/secure/32 \ - /var/ld/32 \ - /usr/ucblib/32 - + /usr/mail \ + /usr/man \ + /usr/pub \ + /usr/src \ + /usr/tmp \ + /usr/ucblib/32 \ + /var/ld/32 -i386_SYM.ROOT.BIN64= \ +i386_SYM.DIRS64= \ /usr/lib/brand/lx/64 -sparc_SYM.ROOT.BIN64= +sparc_SYM.DIRS64= -SYM.ROOT.BIN64= \ - $($(MACH)_SYM.ROOT.BIN64) \ +SYM.DIRS64= \ + $($(MACH)_SYM.DIRS64) \ /lib/64 \ /lib/crypto/64 \ /lib/secure/64 \ @@ -520,11 +491,6 @@ SYM.ROOT.BIN64= \ /var/ld/64 \ /usr/ucblib/64 -SYM.OTHERS= \ - /etc/log \ - /usr/mail \ - /usr/tmp - # prepend the ROOT prefix ROOTDIRS= $(TARGETDIRS:%=$(ROOT)%) @@ -536,62 +502,12 @@ ROOTDIRS= $(TARGETDIRS:%=$(ROOT)%) # default values assigned. If a directory is mentioned above and not # mentioned below, it has default values for attributes. # -# The default values for OWNER, GROUP, and DIRMODE are specified in -# /usr/src/Makefile.master. +# The default value for DIRMODE is specified in usr/src/Makefile.master. # -$(ROOT)/tmp \ -$(ROOT)/usr/tmp \ -$(ROOT)/var/tmp \ -$(ROOT)/var/adm/sa \ -$(ROOT.SYS:%=$(ROOT)%) \ -$(ROOT.SYS2:%=$(ROOT)%) \ -$(ROOT.SYS64.2:%=$(ROOT)%) \ -$(SYM.ROOT.SYS:%=$(ROOT)%):= GROUP= sys - -$(ROOT.OTHER:%=$(ROOT)%):= GROUP= other - $(ROOT)/var/adm \ $(ROOT)/var/adm/sa := DIRMODE= 775 -$(ROOT)/var/idmap := OWNER= daemon -$(ROOT)/var/idmap := GROUP= daemon - -$(ROOT)/root:= GROUP= root - -$(ROOT)/dev/term:= GROUP= root - -$(UUCP.UUCP:%=$(ROOT)%):= OWNER= uucp -$(UUCP.UUCP:%=$(ROOT)%):= GROUP= uucp - -$(ROOT)/etc/log \ -$(ROOT)/usr/lib/sa \ -$(ROOT)/var/adm/exacct \ -$(ROOT)/var/adm/log \ -$(ROOT)/var/adm/sa:= OWNER= adm - -$(ROOT)/etc/log \ -$(ROOT)/var/adm/exacct \ -$(ROOT)/var/adm/log:= GROUP= adm - -$(ROOT)/etc/mail \ -$(ROOT)/etc/mail/cf \ -$(ROOT)/etc/mail/cf/cf \ -$(ROOT)/etc/mail/cf/domain \ -$(ROOT)/etc/mail/cf/feature \ -$(ROOT)/etc/mail/cf/m4 \ -$(ROOT)/etc/mail/cf/mailer \ -$(ROOT)/etc/mail/cf/ostype \ -$(ROOT)/etc/mail/cf/sh \ -$(ROOT)/usr/mail \ -$(ROOT)/var/mail := GROUP= mail - - -$(ROOT)/etc/dladm := OWNER= dladm -$(ROOT)/etc/dladm := GROUP= sys - -$(ROOT)/var/spool/lp:= OWNER= lp -$(ROOT)/var/spool/lp:= GROUP= lp $(ROOT)/var/spool/lp:= DIRMODE= 775 # file mode @@ -624,12 +540,8 @@ $(ROOT)/var/sadm/install/logs := DIRMODE= 555 $(ROOT)/dev/fd \ $(ROOT)/home:= DIRMODE= 555 -$(ROOT)/dev/fd \ -$(ROOT)/home:= GROUP= root - $(ROOT)/var/mail:= DIRMODE=1777 -$(ROOT)/proc:= GROUP= root $(ROOT)/proc:= DIRMODE= 555 $(ROOT)/system/contract:= DIRMODE= 555 @@ -686,10 +598,11 @@ $(BUILD64) $(ROOT)/usr/xpg4/lib/64:= LINKDEST=$(MACH64) $(BUILD64) $(ROOT)/var/ld/64:= LINKDEST=$(MACH64) $(BUILD64) $(ROOT)/usr/ucblib/64:= LINKDEST=$(MACH64) +# # Installing a directory symlink calls for overriding INS.dir to install # a symlink. # -$(SYMLINKS:%=$(ROOT)%):= \ +$(DIRLINKS:%=$(ROOT)%):= \ INS.dir= -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ # Special symlinks to populate usr/ccs/lib, whose objects @@ -856,13 +769,6 @@ SYM.USRCCSLIB64= \ /usr/lib/lwp/$(MACH64)/libthread.so.1 \ /usr/lib/lwp/$(MACH64)/libthread_db.so.1 - -$(SYM.USRCCSLIB:%=$(ROOT)%):= \ - INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@ - -$(SYM.USRCCSLIB64:%=$(ROOT)%):= \ - INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@ - # Special symlinks to direct libraries that have been moved # from /usr/lib to /lib in order to live in the root filesystem. $(ROOT)/lib/libposix4.so.1:= REALPATH=librt.so.1 @@ -1892,9 +1798,9 @@ SYM.USRLIB64= \ /usr/lib/$(MACH64)/nss_nisplus.so.1 \ /usr/lib/$(MACH64)/nss_user.so.1 -$(SYM.USRLIB:%=$(ROOT)%):= \ - INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@ - -$(SYM.USRLIB64:%=$(ROOT)%):= \ +# +# usr/src/Makefile uses INS.dir for any member of ROOTDIRS, the fact +# these are symlinks to files has no bearing on this. +# +$(FILELINKS:%=$(ROOT)%):= \ INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@ - diff --git a/usr/src/cmd/cron/Makefile b/usr/src/cmd/cron/Makefile index 561b44dc40..ce64d5a69b 100644 --- a/usr/src/cmd/cron/Makefile +++ b/usr/src/cmd/cron/Makefile @@ -141,12 +141,7 @@ $(XPG6) := CFLAGS += -DXPG6 LINTFLAGS += -u -$(ROOTSVCSYSTEM)/cron.xml := OWNER = root -$(ROOTSVCSYSTEM)/cron.xml := GROUP = sys $(ROOTSVCSYSTEM)/cron.xml := FILEMODE = 0444 - -$(ROOTLIBSVCMETHOD)/svc-cron := OWNER = root -$(ROOTLIBSVCMETHOD)/svc-cron := GROUP = bin $(ROOTLIBSVCMETHOD)/svc-cron := FILEMODE = 0555 diff --git a/usr/src/cmd/fcoesvc/Makefile b/usr/src/cmd/fcoesvc/Makefile index e15836ce3c..9194ca2484 100644 --- a/usr/src/cmd/fcoesvc/Makefile +++ b/usr/src/cmd/fcoesvc/Makefile @@ -47,8 +47,6 @@ SVCMETHOD += svc-fcoei ROOTMANIFESTDIR = $(ROOTSVCSYSTEM) $(ROOTSVCSYSTEM)/fcoe_target.xml := FILEMODE = 0444 -$(ROOTSVCSYSTEM)/fcoe_initiator.xml := OWNER = root -$(ROOTSVCSYSTEM)/fcoe_initiator.xml := GROUP = bin $(ROOTSVCSYSTEM)/fcoe_initiator.xml := FILEMODE = 0444 .KEEP_STATE: diff --git a/usr/src/cmd/mdb/Makefile.kmdb b/usr/src/cmd/mdb/Makefile.kmdb index 5332079844..bff02e2cb2 100644 --- a/usr/src/cmd/mdb/Makefile.kmdb +++ b/usr/src/cmd/mdb/Makefile.kmdb @@ -130,8 +130,6 @@ $(KCTLTGTS) := ASFLAGS += -D_KERNEL ffs.o ffs.ln := CPPFLAGS += -Dffs=mdb_ffs -INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@ - $(ROOTMISC) $(ROOTMISC64) := FILEMODE = 0755 include ../../../Makefile.kmdb.targ diff --git a/usr/src/cmd/mdb/intel/amd64/kmdb/Makefile b/usr/src/cmd/mdb/intel/amd64/kmdb/Makefile index c22ed7a256..59edd9bec0 100644 --- a/usr/src/cmd/mdb/intel/amd64/kmdb/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/kmdb/Makefile @@ -19,10 +19,9 @@ # 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. # -#ident "%Z%%M% %I% %E% SMI" # # Build and link kmdb @@ -96,7 +95,7 @@ kmdb_context_off.h: ../../kmdb/kmdb_context_off.in # $(ROOT_MISC_DIR) $(ROOT_MISC_DIR_64): - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MISC_DIR)/%: % $(ROOT_MISC_DIR) $(INS.file) diff --git a/usr/src/cmd/mdb/intel/ia32/kmdb/Makefile b/usr/src/cmd/mdb/intel/ia32/kmdb/Makefile index 594594ecb5..b17aa884f0 100644 --- a/usr/src/cmd/mdb/intel/ia32/kmdb/Makefile +++ b/usr/src/cmd/mdb/intel/ia32/kmdb/Makefile @@ -19,10 +19,9 @@ # 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. # -#ident "%Z%%M% %I% %E% SMI" # # Build and link kmdb @@ -87,7 +86,7 @@ kmdb_context_off.h: ../../kmdb/kmdb_context_off.in # $(ROOT_MISC_DIR) $(ROOT_MISC_DIR_64): - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MISC_DIR)/%: % $(ROOT_MISC_DIR) $(INS.file) diff --git a/usr/src/cmd/mdb/sun4u/v9/kmdb/Makefile b/usr/src/cmd/mdb/sun4u/v9/kmdb/Makefile index b99e6181e0..15167ca0aa 100644 --- a/usr/src/cmd/mdb/sun4u/v9/kmdb/Makefile +++ b/usr/src/cmd/mdb/sun4u/v9/kmdb/Makefile @@ -19,11 +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" -# + all: $(PROG) @@ -191,7 +190,7 @@ kmdb_context_off.h: ../../../sparc/kmdb/kmdb_context_off.in # $(ROOT_MISC_DIR) $(ROOT_MISC_DIR_64): - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MISC_DIR)/%: % $(ROOT_MISC_DIR) $(INS.file) diff --git a/usr/src/cmd/mdb/sun4v/v9/kmdb/Makefile b/usr/src/cmd/mdb/sun4v/v9/kmdb/Makefile index fb865e9e03..4450e96109 100644 --- a/usr/src/cmd/mdb/sun4v/v9/kmdb/Makefile +++ b/usr/src/cmd/mdb/sun4v/v9/kmdb/Makefile @@ -20,11 +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" -# + all: $(PROG) @@ -204,7 +203,7 @@ kmdb_context_off.h: ../../../sparc/kmdb/kmdb_context_off.in # $(ROOT_MISC_DIR) $(ROOT_MISC_DIR_64): - -$(INS.dir.root.sys) + -$(INS.dir) $(ROOT_MISC_DIR)/%: % $(ROOT_MISC_DIR) $(INS.file) diff --git a/usr/src/cmd/oplhpd/Makefile b/usr/src/cmd/oplhpd/Makefile index 2619136962..b512c9f08c 100644 --- a/usr/src/cmd/oplhpd/Makefile +++ b/usr/src/cmd/oplhpd/Makefile @@ -67,16 +67,16 @@ clean: lint: lint_SRCS $(USR_PLAT_DIR): - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_LIB_DIR): $(USR_PSM_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_LIB64_DIR): $(USR_PSM_LIB_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_LIB64_DIR)/%: % $(USR_PSM_LIB64_DIR) $(INS.file) diff --git a/usr/src/cmd/scadm/Makefile.com b/usr/src/cmd/scadm/Makefile.com index 10d310e01a..16ec946480 100644 --- a/usr/src/cmd/scadm/Makefile.com +++ b/usr/src/cmd/scadm/Makefile.com @@ -85,7 +85,7 @@ LINKED_SBIN_DIRS = $(PLATLINKS:%=$(USR_PLAT_DIR)/%/sbin) .PARALLEL: $(OBJS) $(LINKED_SBIN_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) %.o: common/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/cmd/sf880drd/Makefile b/usr/src/cmd/sf880drd/Makefile index e01451fb29..d3604de8b1 100644 --- a/usr/src/cmd/sf880drd/Makefile +++ b/usr/src/cmd/sf880drd/Makefile @@ -56,13 +56,13 @@ clean: lint: lint_PROG $(USR_PLAT_DIR): - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_DIR): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_LIB_DIR): $(USR_PSM_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(INS.file) diff --git a/usr/src/lib/cfgadm_plugins/Makefile.com b/usr/src/lib/cfgadm_plugins/Makefile.com index 422de44173..2f2739dd9a 100644 --- a/usr/src/lib/cfgadm_plugins/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/Makefile.com @@ -72,10 +72,10 @@ LINKED_CFG_DIRS = $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/cfgadm) INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_CFG_DIRS): $(USR_PLAT_DIR) -$(INS.slink6) diff --git a/usr/src/lib/cfgadm_plugins/ac/Makefile.com b/usr/src/lib/cfgadm_plugins/ac/Makefile.com index 6393026734..68af7f6ad0 100644 --- a/usr/src/lib/cfgadm_plugins/ac/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/ac/Makefile.com @@ -35,9 +35,6 @@ OBJECTS= mema.o mema_prom.o mema_test.o mema_test_config.o mema_test_subr.o \ # include library definitions include $(SRC)/lib/Makefile.lib -INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@ -INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@ - USR_PLAT_DIR = $(ROOT)/usr/platform USR_PSM_DIR = $(USR_PLAT_DIR)/sun4u USR_PSM_LIB_DIR = $(USR_PSM_DIR)/lib @@ -64,16 +61,16 @@ lint: lintcheck # Create target directories $(USR_PSM_DIR): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_LIB_DIR): $(USR_PSM_DIR) $(LINKED_LIB_DIRS) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_LIB_CFG_DIR): $(USR_PSM_LIB_DIR) $(LINKED_CFG_DIRS) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_LIB_CFG_DIR_64): $(USR_PSM_LIB_CFG_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_LIB_CFG_DIR)/%: % $(USR_PSM_LIB_CFG_DIR) -$(INS.file) diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile.com b/usr/src/lib/cfgadm_plugins/pci/Makefile.com index be002b0f79..58aad22226 100644 --- a/usr/src/lib/cfgadm_plugins/pci/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/pci/Makefile.com @@ -31,8 +31,6 @@ OBJECTS= cfga.o pci_strings.o include ../../../Makefile.lib SRCDIR = ../common -INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@ -INS.dir.bin.bin= $(INS) -s -d -m $(DIRMODE) $@ USR_LIB_DIR = $(ROOT)/usr/lib USR_LIB_DIR_CFGADM = $(USR_LIB_DIR)/cfgadm @@ -57,13 +55,13 @@ lint: lintcheck # Create target directories $(USR_LIB_DIR): - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_LIB_DIR_CFGADM): $(USR_LIB_DIR) - -$(INS.dir.bin.bin) + -$(INS.dir) $(USR_LIB_DIR_CFGADM_64): $(USR_LIB_DIR_CFGADM) - -$(INS.dir.bin.bin) + -$(INS.dir) $(USR_LIB_DIR_CFGADM)/%: % $(USR_LIB_DIR_CFGADM) -$(INS.file) diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com index 75469b5cc8..fb3046ba42 100644 --- a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com @@ -32,9 +32,6 @@ OBJECTS= ap.o ap_msg.o ap_rcm.o ap_sbd.o ap_seq.o cfga.o ap_err.o # include library definitions include ../../../Makefile.lib -INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@ -INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@ - USR_PLAT_DIR = $(ROOT)/usr/platform USR_PSM_DIR = $(USR_PLAT_DIR)/sun4u USR_PSM_LIB_DIR = $(USR_PSM_DIR)/lib @@ -67,16 +64,16 @@ lint: lintcheck # Create target directories $(USR_PSM_DIR): - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_LIB_DIR): $(USR_PSM_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_LIB_CFG_DIR): $(USR_PSM_LIB_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_LIB_CFG_DIR_64): $(USR_PSM_LIB_CFG_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_LIB_CFG_DIR)/%: % $(USR_PSM_LIB_CFG_DIR) -$(INS.file) diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com index 0e5e8d7059..97074136e6 100644 --- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com @@ -34,9 +34,6 @@ OBJECTS= cfga.o # include library definitions include $(SRC)/lib/Makefile.lib -INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@ -INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@ - USR_PLAT_DIR = $(ROOT)/usr/platform USR_PSM_DIR = $(USR_PLAT_DIR)/sun4u USR_PSM_LIB_DIR = $(USR_PSM_DIR)/lib @@ -63,16 +60,16 @@ lint: lintcheck # Create target directories $(USR_PSM_DIR): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(USR_PSM_LIB_DIR): $(USR_PSM_DIR) $(LINKED_LIB_DIRS) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_LIB_CFG_DIR): $(USR_PSM_LIB_DIR) $(LINKED_CFG_DIRS) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_LIB_CFG_DIR_64): $(USR_PSM_LIB_CFG_DIR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_PSM_LIB_CFG_DIR)/%: % $(USR_PSM_LIB_CFG_DIR) -$(INS.file) diff --git a/usr/src/lib/hbaapi/Makefile.com b/usr/src/lib/hbaapi/Makefile.com index b6b188cee7..54dd62919f 100644 --- a/usr/src/lib/hbaapi/Makefile.com +++ b/usr/src/lib/hbaapi/Makefile.com @@ -33,7 +33,6 @@ ROOTETC= $(ROOT)/etc include ../../Makefile.lib HETCFILES= $(CONFIGFILE:%=$(ROOTETC)/%) -HETCFILES:= FILEMODE= 644 LIBS = $(DYNLIB) $(LINTLIB) SRCDIR= ../common diff --git a/usr/src/lib/libc_psr/sun4u-opl/Makefile b/usr/src/lib/libc_psr/sun4u-opl/Makefile index 8bdf09f488..d42f5eae13 100644 --- a/usr/src/lib/libc_psr/sun4u-opl/Makefile +++ b/usr/src/lib/libc_psr/sun4u-opl/Makefile @@ -54,13 +54,13 @@ all install: lib32 $(BUILD64) lib64 $(LIBC_PSR_LINKS) $(LIBC_PSR64_LINKS) clean clobber: lib32 $(BUILD64) lib64 $(LIBC_PSR_DIRS): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR_LINKS): $(LIBC_PSR_DIRS) -$(INS.slink6) $(LIBC_PSR64_DIRS): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR64_LINKS): $(LIBC_PSR64_DIRS) -$(INS.slink7) diff --git a/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile b/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile index 90cc968db8..5e5962bf76 100644 --- a/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile +++ b/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile @@ -19,11 +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. # -# ident "%Z%%M% %I% %E% SMI" -# + # # Platform specific Makefile for libc_psr. @@ -53,7 +52,7 @@ LIBC_PSR_DIR = $(ROOT_PSM_LIB_DIR) LIBC_PSR_LIB = $(LIBC_PSR_DIR)/$(MODULE) $(LIBC_PSR_DIRS): - -$(INS.dir.root.bin) + -$(INS.dir) all: $(LIBS) diff --git a/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile index 769f18d0c8..7b6318a413 100644 --- a/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile +++ b/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile @@ -19,11 +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. # -# ident "%Z%%M% %I% %E% SMI" -# + # # Platform specific Makefile for libc_psr. @@ -56,7 +55,7 @@ LIBC_PSR64_DIR = $(ROOT_PSM_LIB_DIR)/$(MACH64) LIBC_PSR64_LIB = $(LIBC_PSR64_DIR)/$(MODULE) $(LIBC_PSR64_DIRS): - -$(INS.dir.root.bin) + -$(INS.dir) all: $(LIBS) diff --git a/usr/src/lib/libc_psr/sun4u-us3/Makefile b/usr/src/lib/libc_psr/sun4u-us3/Makefile index dd9baaa89a..ee1ea7bb7f 100644 --- a/usr/src/lib/libc_psr/sun4u-us3/Makefile +++ b/usr/src/lib/libc_psr/sun4u-us3/Makefile @@ -58,8 +58,6 @@ LINKED_PLATFORMS += SUNW,Sun-Fire-280R LINKED_PLATFORMS += SUNW,Sun-Fire-15000 LINKED_PLATFORMS += SUNW,Sun-Fire-880 LINKED_PLATFORMS += SUNW,Sun-Fire-480R -LINKED_PLATFORMS += SUNW,Sun-Fire-V890 -LINKED_PLATFORMS += SUNW,Sun-Fire-V490 LINKED_PLATFORMS += SUNW,Netra-T12 LINKED_PLATFORMS += SUNW,Netra-T4 LINKED_PLATFORMS += SUNW,Netra-CP3010 @@ -67,25 +65,25 @@ LINKED_PLATFORMS += SUNW,Sun-Fire-V215 LINKED_PLATFORMS += SUNW,Sun-Fire-V445 $(ROOT_PSM_LIB_DIR): - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_PSM_LIB_DIR)/$(MODULE): $(ROOT_PSM_LIB_DIR) $(MODULE) $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE) $(ROOT_PSM_LIB64_DIR): - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_PSM_LIB64_DIR)/$(MODULE): $(ROOT_PSM_LIB64_DIR) $(MODULE) $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE) $(LIBC_PSR_DIRS): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR_LINKS): $(LIBC_PSR_DIRS) -$(INS.slink6) $(LIBC_PSR64_DIRS): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR64_LINKS): $(LIBC_PSR64_DIRS) -$(INS.slink7) diff --git a/usr/src/lib/libc_psr/sun4u/sparc/Makefile b/usr/src/lib/libc_psr/sun4u/sparc/Makefile index 8531739c8d..aef22af9ec 100644 --- a/usr/src/lib/libc_psr/sun4u/sparc/Makefile +++ b/usr/src/lib/libc_psr/sun4u/sparc/Makefile @@ -49,7 +49,7 @@ LIBC_PSR_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE)) INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ $(LIBC_PSR_DIRS): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR_LINKS): $(LIBC_PSR_DIRS) -$(INS.slink6) diff --git a/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile index 30b5968784..d00fc7070e 100644 --- a/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile +++ b/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile @@ -51,7 +51,7 @@ LIBC_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODUL INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ $(LIBC_PSR64_DIRS): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR64_LINKS): $(LIBC_PSR64_DIRS) -$(INS.slink6) diff --git a/usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile index 9c56c16c57..b3b1b1a96f 100644 --- a/usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile +++ b/usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile @@ -19,11 +19,9 @@ # 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. # -# ident "%Z%%M% %I% %E% SMI" -# # # Platform specific Makefile for libc_psr_hwcap1. @@ -53,7 +51,7 @@ LIBC_PSR_LIB = $(LIBC_PSR_DIR)/$(MODULE) INS.libc = $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE) $(LIBC_PSR_DIR): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR_LIB): $(LIBC_PSR_DIR) $(MODULE) -$(INS.libc) diff --git a/usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile index 15e2aab263..0b6bf3fd01 100644 --- a/usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile +++ b/usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile @@ -19,11 +19,9 @@ # 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. # -# ident "%Z%%M% %I% %E% SMI" -# # # Platform specific Makefile for libc_psr_hwcap1. @@ -56,7 +54,7 @@ LIBC_PSR64_LIB = $(LIBC_PSR64_DIR)/$(MODULE) INS.libc.64 = $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE) $(LIBC_PSR64_DIR): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR64_LIB): $(LIBC_PSR64_DIR) $(MODULE) -$(INS.libc.64) diff --git a/usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile index 1a260ada61..3b143c6846 100644 --- a/usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile +++ b/usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile @@ -19,11 +19,9 @@ # 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. # -# ident "%Z%%M% %I% %E% SMI" -# # # Platform specific Makefile for libc_psr_hwcap2. @@ -53,7 +51,7 @@ LIBC_PSR_LIB = $(LIBC_PSR_DIR)/$(MODULE) INS.libc = $(RM) -r $@; $(INS) -s -f $(@D) $(MODULE) $(LIBC_PSR_DIR): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR_LIB): $(LIBC_PSR_DIR) $(MODULE) -$(INS.libc) diff --git a/usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile index 7d6173ca52..ff80420951 100644 --- a/usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile +++ b/usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile @@ -19,11 +19,9 @@ # 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. # -# ident "%Z%%M% %I% %E% SMI" -# # # Platform specific Makefile for libc_psr_hwcap2. @@ -56,7 +54,7 @@ LIBC_PSR64_LIB = $(LIBC_PSR64_DIR)/$(MODULE) INS.libc.64 = $(RM) -r $@; $(INS) -f $(@D) $(MODULE) $(LIBC_PSR64_DIR): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR64_LIB): $(LIBC_PSR64_DIR) $(MODULE) -$(INS.libc.64) diff --git a/usr/src/lib/libc_psr/sun4v/Makefile b/usr/src/lib/libc_psr/sun4v/Makefile index 7bd571a3bf..15d8ac8231 100644 --- a/usr/src/lib/libc_psr/sun4v/Makefile +++ b/usr/src/lib/libc_psr/sun4v/Makefile @@ -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" -# include $(SRC)/lib/Makefile.lib include $(SRC)/Makefile.psm @@ -40,13 +38,13 @@ TOUCH = /usr/bin/touch MODULE = libc_psr.so.1 $(ROOT_PSM_LIB_DIR): - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_PSM_LIB_DIR)/$(MODULE): $(ROOT_PSM_LIB_DIR) $(MODULE) $(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(MODULE) $(ROOT_PSM_LIB64_DIR): - -$(INS.dir.root.bin) + -$(INS.dir) $(ROOT_PSM_LIB64_DIR)/$(MODULE): $(ROOT_PSM_LIB64_DIR) $(MODULE) $(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(MODULE) diff --git a/usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile index 5026d2cdd6..af88210a82 100644 --- a/usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile +++ b/usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile @@ -52,7 +52,7 @@ INS.libc = $(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(MODULE) $(LIBC_PSR_LIB) := FILEMODE= 0755 $(LIBC_PSR_DIR): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR_LIB): $(LIBC_PSR_DIR) $(MODULE) -$(INS.libc) diff --git a/usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile index 645bdeb932..c2f495bea0 100644 --- a/usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile +++ b/usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile @@ -56,7 +56,7 @@ INS.libc.64 = $(RM) -r $@; $(INS) -m $(FILEMODE) -f $(@D) $(MODULE) $(LIBC_PSR64_LIB) := FILEMODE= 0755 $(LIBC_PSR64_DIR): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR64_LIB): $(LIBC_PSR64_DIR) $(MODULE) -$(INS.libc.64) diff --git a/usr/src/lib/libc_psr/sun4v_hwcap2/sparc/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap2/sparc/Makefile index 70da3011e0..d0074ac473 100644 --- a/usr/src/lib/libc_psr/sun4v_hwcap2/sparc/Makefile +++ b/usr/src/lib/libc_psr/sun4v_hwcap2/sparc/Makefile @@ -51,7 +51,7 @@ INS.libc = $(RM) -r $@; $(INS) -s -m $(FILEMODE) -f $(@D) $(MODULE) $(LIBC_PSR_LIB) := FILEMODE= 0755 $(LIBC_PSR_DIR): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR_LIB): $(LIBC_PSR_DIR) $(MODULE) -$(INS.libc) diff --git a/usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile index e30973ec0f..356e58462e 100644 --- a/usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile +++ b/usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile @@ -53,7 +53,7 @@ INS.libc.64 = $(RM) -r $@; $(INS) -m $(FILEMODE) -f $(@D) $(MODULE) $(LIBC_PSR64_LIB) := FILEMODE= 0755 $(LIBC_PSR64_DIR): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBC_PSR64_LIB): $(LIBC_PSR64_DIR) $(MODULE) -$(INS.libc.64) diff --git a/usr/src/lib/libmd/Makefile.com b/usr/src/lib/libmd/Makefile.com index 05358fba47..5622942fb7 100644 --- a/usr/src/lib/libmd/Makefile.com +++ b/usr/src/lib/libmd/Makefile.com @@ -105,13 +105,13 @@ INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ INS.slink64 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ $(LIBMD_PSR_DIRS): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBMD_PSR_LINKS): $(LIBMD_PSR_DIRS) -$(INS.slink6) $(LIBMD_PSR64_DIRS): - -$(INS.dir.root.bin) + -$(INS.dir) $(LIBMD_PSR64_LINKS): $(LIBMD_PSR64_DIRS) -$(INS.slink64) diff --git a/usr/src/lib/libmd/sun4u/Makefile.links b/usr/src/lib/libmd/sun4u/Makefile.links index 7f774387e5..f849f9c603 100644 --- a/usr/src/lib/libmd/sun4u/Makefile.links +++ b/usr/src/lib/libmd/sun4u/Makefile.links @@ -18,10 +18,7 @@ # # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # lib/libmd/Makefile.sun4u.links @@ -57,8 +54,6 @@ LINKED_PLATFORMS += SUNW,Sun-Fire-280R LINKED_PLATFORMS += SUNW,Sun-Fire-15000 LINKED_PLATFORMS += SUNW,Sun-Fire-880 LINKED_PLATFORMS += SUNW,Sun-Fire-480R -LINKED_PLATFORMS += SUNW,Sun-Fire-V890 -LINKED_PLATFORMS += SUNW,Sun-Fire-V490 LINKED_PLATFORMS += SUNW,Serverblade1 LINKED_PLATFORMS += SUNW,Netra-T12 LINKED_PLATFORMS += SUNW,Netra-T4 diff --git a/usr/src/lib/libmd/sun4v/sparc/Makefile b/usr/src/lib/libmd/sun4v/sparc/Makefile index 2ae6feae21..e0754a7da3 100644 --- a/usr/src/lib/libmd/sun4v/sparc/Makefile +++ b/usr/src/lib/libmd/sun4v/sparc/Makefile @@ -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" -# CLASS = 32 PLATFORM = sun4v @@ -50,6 +48,6 @@ all: $(LIBS) $(ROOT_PSM_LIB_DIR)/% := FILEMODE = 755 -install: all $(LIBMD_PSR_LINKS) $(ROOT_PSM_LIBS) +install: all $(ROOT_PSM_LIB_DIR)/$(LIBS) include $(SRC)/Makefile.psm.targ diff --git a/usr/src/lib/libmd/sun4v/sparcv9/Makefile b/usr/src/lib/libmd/sun4v/sparcv9/Makefile index aaa1f90636..0c535c6bfb 100644 --- a/usr/src/lib/libmd/sun4v/sparcv9/Makefile +++ b/usr/src/lib/libmd/sun4v/sparcv9/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -50,6 +50,6 @@ all: $(LIBS) $(ROOT_PSM_LIB64_DIR)/% := FILEMODE = 755 -install: all $(LIBMD_PSR64_LINKS) $(ROOT_PSM_LIB64_DIR)/$(LIBS) +install: all $(ROOT_PSM_LIB64_DIR)/$(LIBS) include $(SRC)/Makefile.psm.targ diff --git a/usr/src/lib/libpcp/sparc/Makefile b/usr/src/lib/libpcp/sparc/Makefile index f647d6b506..6d4ccea2b6 100644 --- a/usr/src/lib/libpcp/sparc/Makefile +++ b/usr/src/lib/libpcp/sparc/Makefile @@ -58,13 +58,13 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(INS.file) $(USR_PSM_LIB_DIR): - $(INS.dir.root.sys) + $(INS.dir) $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIBPCP_DIR): $(USR_PLAT_DIR) -$(INS.slink7) diff --git a/usr/src/lib/libprtdiag_psr/sparc/cherrystone/Makefile b/usr/src/lib/libprtdiag_psr/sparc/cherrystone/Makefile index 283d1d80aa..f54f6f38da 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/cherrystone/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/cherrystone/Makefile @@ -77,10 +77,10 @@ $(USR_PSM_LIB_DIR): cd $(UTSBASE)/sun4u/cherrystone; pwd ; $(MAKE) $(USR_PSM_LIB_DIR) $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR) -$(INS.slink6) diff --git a/usr/src/lib/libprtdiag_psr/sparc/daktari/Makefile b/usr/src/lib/libprtdiag_psr/sparc/daktari/Makefile index 4f1cd45fd5..ad046bb974 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/daktari/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/daktari/Makefile @@ -71,10 +71,10 @@ $(USR_PSM_LIB_DIR): cd $(UTSBASE)/sun4u/daktari; pwd ; $(MAKE) $(USR_PSM_LIB_DIR) $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR) -$(INS.slink6) diff --git a/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile b/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile index b01ed14458..069456d064 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile @@ -91,10 +91,10 @@ $(USR_PSM_LIB_DIR): $(INS.dir) $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_PRTDIAG_DIRS): $(LINKED_LIB_DIRS) -$(INS.slink6) diff --git a/usr/src/lib/libprtdiag_psr/sparc/montecarlo/Makefile b/usr/src/lib/libprtdiag_psr/sparc/montecarlo/Makefile index a04a5218a8..a9b0ef79a2 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/montecarlo/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/montecarlo/Makefile @@ -76,10 +76,10 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(INS.file) $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_PRTDIAG_DIRS): $(LINKED_LIB_DIRS) -$(INS.slink6) diff --git a/usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile b/usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile index eb0e9befaa..424ef58118 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile @@ -60,13 +60,13 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(INS.file) $(USR_PSM_LIB_DIR): - $(INS.dir.root.sys) + $(INS.dir) $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR) -$(INS.slink6) diff --git a/usr/src/lib/libprtdiag_psr/sparc/monza/Makefile b/usr/src/lib/libprtdiag_psr/sparc/monza/Makefile index 6902e5c18a..772dbd462b 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/monza/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/monza/Makefile @@ -59,13 +59,13 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(INS.file) $(USR_PSM_LIB_DIR): - $(INS.dir.root.sys) + $(INS.dir) $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR) -$(INS.slink6) diff --git a/usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile b/usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile index 529a2a40e7..60c2862426 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile @@ -69,13 +69,13 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(INS.file) $(USR_PSM_LIB_DIR): - $(INS.dir.root.sys) + $(INS.dir) $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR) -$(INS.slink6) diff --git a/usr/src/lib/libprtdiag_psr/sparc/schumacher/picl/Makefile b/usr/src/lib/libprtdiag_psr/sparc/schumacher/picl/Makefile index 161d8dff72..dfdb093e46 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/schumacher/picl/Makefile +++ b/usr/src/lib/libprtdiag_psr/sparc/schumacher/picl/Makefile @@ -66,10 +66,10 @@ $(USR_PSM_LIB_DIR): $(INS.dir) $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_PRTDIAG_DIRS): $(USR_PLAT_DIR) -$(INS.slink6) diff --git a/usr/src/lib/librsc/Makefile.com b/usr/src/lib/librsc/Makefile.com index e83ce8c3b1..a1d16211d3 100644 --- a/usr/src/lib/librsc/Makefile.com +++ b/usr/src/lib/librsc/Makefile.com @@ -78,10 +78,10 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(INS.file) $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIBRSC_DIR): $(USR_PLAT_DIR) -$(INS.slink7) diff --git a/usr/src/lib/libtsalarm/sparc/Makefile b/usr/src/lib/libtsalarm/sparc/Makefile index 055e79f7a4..92809885b6 100644 --- a/usr/src/lib/libtsalarm/sparc/Makefile +++ b/usr/src/lib/libtsalarm/sparc/Makefile @@ -52,19 +52,19 @@ $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(INS.file) $(USR_PSM_LIB_DIR): - $(INS.dir.root.sys) + $(INS.dir) $(USR_PSM_INCL_DIR)/%: ../common/% $(USR_PSM_INCL_DIR) $(INS.file) $(USR_PSM_INCL_DIR): - $(INS.dir.root.sys) + $(INS.dir) $(LINKED_DIRS): $(USR_PLAT_DIR) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIB_DIRS): $(LINKED_DIRS) - -$(INS.dir.root.sys) + -$(INS.dir) $(LINKED_LIBTSALARM_DIR): $(USR_PLAT_DIR) -$(INS.slink7) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com index d1581a890e..e3669a3b80 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com +++ b/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com @@ -152,7 +152,7 @@ INS.slink64 = $(RM) -r $@; \ $(SOFT_PSR_DIRS) \ $(SOFT_PSR64_DIRS): - -$(INS.dir.root.bin) + -$(INS.dir) $(SOFT_PSR_LINKS): $(SOFT_PSR_DIRS) -$(INS.slink6) diff --git a/usr/src/lib/smhba/Makefile.com b/usr/src/lib/smhba/Makefile.com index e13057c82b..a19413dc27 100644 --- a/usr/src/lib/smhba/Makefile.com +++ b/usr/src/lib/smhba/Makefile.com @@ -33,9 +33,6 @@ ROOTETC= $(ROOT)/etc include ../../Makefile.lib HETCFILES= $(CONFIGFILE:%=$(ROOTETC)/%) -HETCFILES:= FILEMODE= 644 -HETCFILES:= OWNER= root -HETCFILES:= GROUP= sys LIBS = $(DYNLIB) $(LINTLIB) SRCDIR= ../common diff --git a/usr/src/psm/stand/bootblks/ufs/Makefile b/usr/src/psm/stand/bootblks/ufs/Makefile index bf5167906d..5c1c0cb075 100644 --- a/usr/src/psm/stand/bootblks/ufs/Makefile +++ b/usr/src/psm/stand/bootblks/ufs/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 # + # -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright (c) 1989-1994,1998 by by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # psm/stand/bootblks/ufs/Makefile # @@ -49,7 +47,7 @@ FRC: # install targets # $(USR_SBIN): $(USR) - -$(INS.dir.root.bin) + -$(INS.dir) $(USR_SBIN)/%: % $(USR_SBIN) $(INS.file) diff --git a/usr/src/tools/Makefile.tools b/usr/src/tools/Makefile.tools index e55490203a..881e60456f 100644 --- a/usr/src/tools/Makefile.tools +++ b/usr/src/tools/Makefile.tools @@ -66,6 +66,7 @@ ROOTONBLDMACHBINARIES= $(BINARIES:%=$(ROOTONBLDBINMACH)/%) ROOTONBLDETCFILES= $(ETCFILES:%=$(ROOTONBLDETC)/%) ROOTONBLDENVFILES= $(ENVFILES:%=$(ROOTONBLDENV)/%) ROOTONBLDGKFILES= $(GKFILES:%=$(ROOTONBLDGK)/.%) +ROOTONBLDGKSHFILES= $(SHFILES:%=$(ROOTONBLDGK)/%) ROOTONBLDPERLFILES= $(PERLFILES:%=$(ROOTONBLDBIN)/%) ROOTONBLDPERLMODULES= $(PERLMODULES:%=$(ROOTONBLDLIBPERL)/%) ROOTONBLDPYFILES= $(PYFILES:%=$(ROOTONBLDBIN)/%) @@ -102,3 +103,6 @@ $(ROOTONBLDENV)/%: % $(ROOTONBLDGK)/.%: % $(INS.rename) + +$(ROOTONBLDGK)/%: % + $(INS.file) diff --git a/usr/src/tools/SUNWonbld/postinstall b/usr/src/tools/SUNWonbld/postinstall deleted file mode 100644 index 66392db40c..0000000000 --- a/usr/src/tools/SUNWonbld/postinstall +++ /dev/null @@ -1,88 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -LC_ALL=C -export LC_ALL -GREP=/usr/bin/grep -LN=/usr/bin/ln -CP=/usr/bin/cp -MV=/usr/bin/mv -PSRINFO=/usr/sbin/psrinfo -SED=/usr/bin/sed -UNAME=/usr/bin/uname -AWK=/usr/bin/awk -WC=/usr/bin/wc - -# Add the 'gk' account with the same password as root -$GREP "^gk:" $BASEDIR/etc/passwd >/dev/null 2>&1 -if [ "$?" != "0" ]; then - echo "Installing 'gk' account" - echo "gk:x:0:1:Gatekeeper:/opt/onbld/gk:/usr/bin/csh" \ - >> $BASEDIR/etc/passwd - $GREP "^root:" $BASEDIR/etc/shadow | $SED -e 's/^root:/gk:/' \ - >> $BASEDIR/etc/shadow -fi - -# Back up gk's existing .make.machines file -if [ "(" -f $BASEDIR/opt/onbld/gk/.make.machines ")" -a "!" "(" -f \ - $BASEDIR/opt/onbld/gk/.make.machines.orig ")" ]; then - echo "Backing up $BASEDIR/opt/onbld/gk/.make.machines" \ - "to $BASEDIR/opt/onbld/gk/.make.machines.orig"; - $CP $BASEDIR/opt/onbld/gk/.make.machines \ - $BASEDIR/opt/onbld/gk/.make.machines.orig; -fi - -# Back up root's existing .make.machines file -if [ "(" -f $BASEDIR/.make.machines ")" -a "!" "(" -f \ - $BASEDIR/.make.machines.orig ")" ]; then - echo "Backing up $BASEDIR/.make.machines to" \ - "$BASEDIR/.make.machines.orig"; - $MV $BASEDIR/.make.machines \ - $BASEDIR/.make.machines.orig; -fi - -# Create a .make.machines file for dmake. Preserve concurrency setting -# for the local machine if present. -$GREP `$UNAME -n` $BASEDIR/opt/onbld/gk/.make.machines >/dev/null 2>&1; -if [ "$?" = "0" ]; then - echo "Preserving existing dmake concurrency."; - $GREP `$UNAME -n` $BASEDIR/opt/onbld/gk/.make.machines \ - > /tmp/.make.machines; - $MV /tmp/.make.machines $BASEDIR/opt/onbld/gk/.make.machines; -else - cpus=`$PSRINFO | $GREP on-line | $WC -l`; - max=`expr '(' $cpus + 1 ')' '*' 2`; - speed=`$PSRINFO -v | head -3 | $AWK '/MHz/ { print $6 }'`; - if [ $speed -gt "500" ]; then - max=`expr $max '*' 2`; - fi - echo "`$UNAME -n` max=$max" > $BASEDIR/opt/onbld/gk/.make.machines; - echo "dmake concurrency set to $max."; -fi - -# Create link for root's .make.machines. -cd $BASEDIR ; -$LN -s opt/onbld/gk/.make.machines .make.machines >/dev/null 2>&1 ; -exit 0 ; diff --git a/usr/src/tools/SUNWonbld/preremove b/usr/src/tools/SUNWonbld/preremove deleted file mode 100644 index 5278dd958c..0000000000 --- a/usr/src/tools/SUNWonbld/preremove +++ /dev/null @@ -1,58 +0,0 @@ -# -# 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. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 1993-2002 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" - -# Remove the 'gk' account -echo "Removing 'gk' account" -ed $BASEDIR/etc/passwd <<EOF >/dev/null -1,\$g/^gk:/d -1,\$p -w -q -EOF -ed $BASEDIR/etc/shadow <<EOF >/dev/null -1,\$g/^gk:/d -1,\$p -w -q -EOF - -# Remove gk's .make.machines file. -echo "Removing .make.machines"; -rm -f $BASEDIR/opt/onbld/gk/.make.machines > /dev/null 2>&1; - -# Remove root's link to gk's .make.machines file. -/usr/bin/test -L $BASEDIR/.make.machines ; -if [ "$?" = "0" ]; then - rm -f $BASEDIR/.make.machines > /dev/null 2>&1; -fi - -# Restore previous ~gk/.make.machines, if it exists. -mv $BASEDIR/opt/onbld/gk/.make.machines.orig \ - $BASEDIR/opt/onbld/gk/.make.machines > /dev/null 2>&1; -# Restore previous /.make.machines, if it exists. -mv $BASEDIR/.make.machines.orig $BASEDIR/.make.machines > /dev/null 2>&1; -exit 0; diff --git a/usr/src/tools/SUNWonbld/prototype_com b/usr/src/tools/SUNWonbld/prototype_com index 065da29c3f..91408ddda5 100644 --- a/usr/src/tools/SUNWonbld/prototype_com +++ b/usr/src/tools/SUNWonbld/prototype_com @@ -39,8 +39,6 @@ i depend i pkginfo i copyright -i postinstall -i preremove # # source locations relative to the prototype file # @@ -174,6 +172,7 @@ f none opt/onbld/etc/exception_lists/interface_cmp 644 root bin d none opt/onbld/gk 755 root bin f none opt/onbld/gk/.cshrc 644 root bin f none opt/onbld/gk/.login 644 root bin +f none opt/onbld/gk/gen_make.machines 755 root bin d none opt/onbld/man 755 root bin d none opt/onbld/man/man1 755 root bin f none opt/onbld/man/man1/Install.1 644 root bin diff --git a/usr/src/tools/gk/Makefile b/usr/src/tools/gk/Makefile index 6790a54999..0ba98fd187 100644 --- a/usr/src/tools/gk/Makefile +++ b/usr/src/tools/gk/Makefile @@ -27,16 +27,22 @@ GKFILES= \ cshrc \ login +SHFILES = gen_make.machines +ROOTONBLDGKSHFILES = $(SHFILES) -include ../Makefile.tools +CLEANFILES += $(GKFILES) $(SHFILES) -FILEMODE= 644 +include ../Makefile.tools .KEEP_STATE: -all: $(GKFILES) +FILEMODE = 0644 +$(ROOTONBLDGKSHFILES):= FILEMODE= 755 + +all: $(GKFILES) $(SHFILES) -install: all .WAIT $(ROOTONBLDGKFILES) +install: all .WAIT $(ROOTONBLDGKFILES) \ + $(ROOTONBLDGKSHFILES) clean: $(RM) $(CLEANFILES) diff --git a/usr/src/tools/gk/gen_make.machines.sh b/usr/src/tools/gk/gen_make.machines.sh new file mode 100644 index 0000000000..8d3fc4d9b8 --- /dev/null +++ b/usr/src/tools/gk/gen_make.machines.sh @@ -0,0 +1,48 @@ +#!/usr/bin/ksh93 +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# script to generate example .make.machines for build users +# + + +PATH=/usr/bin:/usr/sbin + +THISHOST=$(uname -n) + +cpus=$(psrinfo | grep on-line | wc -l) +max=$(((cpus + 1) * 2)) + +EXISTING=$(grep "^$THISHOST" $HOME/.make.machines |awk -F"=" '{print $2}') + +if [[ -n "$EXISTING" ]] then + printf "Your existing \$HOME/.make.machines has a concurrency " + printf "setting of $EXISTING for host\n" + printf "$THISHOST. If you wish to change the setting then this " + printf "script suggests\nsetting concurrency to $max for a single-user " + printf "machine. Multi-user machines might\nrequire different values.\n" +else + printf "$THISHOST max=$max\n" >> $HOME/.make.machines + printf "dmake concurrency for host $THISHOST set to $max.\n" +fi diff --git a/usr/src/tools/scripts/bldenv.sh b/usr/src/tools/scripts/bldenv.sh index e14112bc3d..9354d12468 100644 --- a/usr/src/tools/scripts/bldenv.sh +++ b/usr/src/tools/scripts/bldenv.sh @@ -278,6 +278,16 @@ do esac done +POUND_SIGN="#" +# have we set RELEASE_DATE in our env file? +if [ -z "$RELEASE_DATE" ]; then + RELEASE_DATE=$(LC_ALL=C date +"%B %Y") +fi +BUILD_DATE=$(LC_ALL=C date +%Y-%b-%d) +BASEWSDIR=$(basename $CODEMGR_WS) +DEV_CM="\"@(#)SunOS Internal Development: $LOGNAME $BUILD_DATE [$BASEWSDIR]\"" +export DEV_CM RELEASE_DATE POUND_SIGN + export INTERNAL_RELEASE_BUILD= print 'Build type is \c' @@ -380,7 +390,6 @@ if "${flags.o}" ; then else unset CH fi -POUND_SIGN="#" DEF_STRIPFLAG="-s" TMPDIR="/tmp" @@ -392,7 +401,8 @@ export o_FLAG="$(${flags.o} && print 'y' || print 'n')" export \ PATH TMPDIR \ POUND_SIGN \ - DEF_STRIPFLAG + DEF_STRIPFLAG \ + RELEASE_DATE unset \ CFLAGS \ LD_LIBRARY_PATH diff --git a/usr/src/tools/scripts/nightly.1 b/usr/src/tools/scripts/nightly.1 index 0ad82da9b1..0adf15cdbb 100644 --- a/usr/src/tools/scripts/nightly.1 +++ b/usr/src/tools/scripts/nightly.1 @@ -436,7 +436,9 @@ The version text string to be used; e.g., "onnv:`date '+%Y-%m-%d'`". .LP .B RELEASE_DATE .RS 5 -The release date text to be used; e.g., October 2007. +The release date text to be used; e.g., October 2009. If not set in +your environment file, then this text defaults to the output from +$(LC_ALL=C date +"%B %Y"); e.g., "October 2009". .RE .LP .B INTERNAL_RELEASE_BUILD diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index a3f3cab08a..90b8b500ba 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -1536,10 +1536,17 @@ else PROTOCMPTERSE="protocmp.terse -gu" fi POUND_SIGN="#" +# have we set RELEASE_DATE in our env file? +if [ -z "$RELEASE_DATE" ]; then + RELEASE_DATE=$(LC_ALL=C date +"%B %Y") +fi +BUILD_DATE=$(LC_ALL=C date +%Y-%b-%d) +BASEWSDIR=$(basename $CODEMGR_WS) +DEV_CM="\"@(#)SunOS Internal Development: $LOGNAME $BUILD_DATE [$BASEWSDIR]\"" -# we export POUND_SIGN to speed up the build process -- prevents evaluation of -# the Makefile.master definitions. -export o_FLAG X_FLAG POUND_SIGN +# we export POUND_SIGN, RELEASE_DATE and DEV_CM to speed up the build process +# by avoiding repeated shell invocations to evaluate Makefile.master definitions. +export o_FLAG X_FLAG POUND_SIGN RELEASE_DATE DEV_CM maketype="distributed" MAKE=dmake diff --git a/usr/src/tools/scripts/webrev.sh b/usr/src/tools/scripts/webrev.sh index d20b9607ac..c1da7846dc 100644 --- a/usr/src/tools/scripts/webrev.sh +++ b/usr/src/tools/scripts/webrev.sh @@ -3250,7 +3250,8 @@ if [[ -z "$preparer" ]]; then ') fi -print "<tr><th>Prepared by:</th><td>$preparer on `date`</td></tr>" +PREPDATE=$(LC_ALL=C /usr/bin/date +%Y-%b-%d\ %R\ %z\ %Z) +print "<tr><th>Prepared by:</th><td>$preparer on $PREPDATE</td></tr>" print "<tr><th>Workspace:</th><td>$CWS" if [[ -n $CWS_REV ]]; then print "(at $CWS_REV)" 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) |