4072 make clobber leaves trash

Reviewed by: Albert Lee <trisk@nexenta.com> Reviewed by: Dan McDonald <danmcd@nexenta.com> Reviewed by: Marcel Telka <marcel.telka@nexenta.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Approved by: Garrett D'Amore <garrett@damore.org>
author: Gordon Ross <gwr@nexenta.com> 2013-08-23 18:31:03 -0400
committer: Gordon Ross <gwr@nexenta.com> 2013-08-30 14:41:32 -0400
commit: b6805bf78d2bbbeeaea8909a05623587b42d58b3 (patch)
tree: 1ed4f5376932228adba6378d95bbea467bdea834 /usr/src
parent: a9478106a12424322498e53cf7cd75bd8a4d6004 (diff)
download: illumos-gate-b6805bf78d2bbbeeaea8909a05623587b42d58b3.tar.gz
205 files changed, 726 insertions, 399 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile
index 2f091e3883..9f817ea2db 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -118,7 +118,7 @@ install1: mapfiles closedbins sgs
 
 install2: install1 $(SUBDIRS)
 
-_msg: _msgdirs rootdirs install2 FRC
+_msg: _msgdirs rootdirs FRC
 	@for m in $(MSGSUBDIRS); do \
 		cd $$m; pwd; $(MAKE) _msg; cd ..; \
 	done
@@ -126,7 +126,12 @@ _msg: _msgdirs rootdirs install2 FRC
 mapfiles: bldtools
 	@cd common/mapfiles; pwd; $(MAKE) install
 
-clean clobber: $(SUBDIRS) head pkg
+clean: $(SUBDIRS) head pkg
+clobber: $(SUBDIRS) head pkg clobber_local
+clobber_local:
+	@cd tools; pwd; $(MAKE) clobber
+	@cd common/mapfiles; pwd; $(MAKE) clobber
+	@cd msg; pwd; $(MAKE) clobber
 
 closedbins: bldtools $(ROOTDIRS) FRC
 	@CLOSED_ROOT="$$ON_CLOSED_BINS/root_$(MACH)$${RELEASE_BUILD+-nd}"; \
diff --git a/usr/src/cmd/Adm/Makefile b/usr/src/cmd/Adm/Makefile
index dbd4539bdf..dd50d275c1 100644
--- a/usr/src/cmd/Adm/Makefile
+++ b/usr/src/cmd/Adm/Makefile
@@ -80,8 +80,6 @@ $(DIRS):
 
 FRC:
 
-clean:
+clean clobber: $(SUBDIRS)
 
 lint:
-
-clobber:
diff --git a/usr/src/cmd/abi/spectrans/parser/Makefile.targ b/usr/src/cmd/abi/spectrans/parser/Makefile.targ
index 59837ab138..314a5daf49 100644
--- a/usr/src/cmd/abi/spectrans/parser/Makefile.targ
+++ b/usr/src/cmd/abi/spectrans/parser/Makefile.targ
@@ -39,7 +39,7 @@ SRCS	=	$(OBJECTS:%.o=../%.c)
 
 LINTFLAGS +=	-xsuF -errtags=yes
 CLEANFILES +=	$(LINTOUT)
-CLOBBERFILES += $(LINTLIB)
+CLOBBERFILES += $(LINTLIB) $(LIBRARY)
 
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-unused-label
diff --git a/usr/src/cmd/addbadsec/Makefile b/usr/src/cmd/addbadsec/Makefile
index a4d48dbad2..5903d759ff 100644
--- a/usr/src/cmd/addbadsec/Makefile
+++ b/usr/src/cmd/addbadsec/Makefile
@@ -45,6 +45,7 @@ $(PROG):        $(OBJECTS)
 install: all $(ROOTPROG)
 
 clean:
+	$(RM) $(OBJECTS)
 
 lint:	lint_SRCS
 
diff --git a/usr/src/cmd/audio/audioconvert/Makefile b/usr/src/cmd/audio/audioconvert/Makefile
index be72b9bb90..42248df2ed 100644
--- a/usr/src/cmd/audio/audioconvert/Makefile
+++ b/usr/src/cmd/audio/audioconvert/Makefile
@@ -23,8 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Makefile for cmd/audio/audioconvert
 
 PROG= audioconvert
@@ -58,8 +56,9 @@ $(PROG):	$(OBJS)
 		$(POST_PROCESS)
 
 clean:
+	$(RM) $(OBJS)
 
-clobber:
+clobber: clean
 	$(RM) $(PROG) $(CLOBBERFILES)
 
 lint:
diff --git a/usr/src/cmd/audio/audiotest/Makefile b/usr/src/cmd/audio/audiotest/Makefile
index ad3033716c..043b9eb2b8 100644
--- a/usr/src/cmd/audio/audiotest/Makefile
+++ b/usr/src/cmd/audio/audiotest/Makefile
@@ -44,6 +44,7 @@ $(PROG):	$(OBJS)
 install: all $(ROOTPROG)
 
 clean:
+	$(RM) $(OBJS)
 
 lint:	lint_SRCS
 
diff --git a/usr/src/cmd/audio/utilities/Makefile b/usr/src/cmd/audio/utilities/Makefile
index 40da0a01f5..4b11e0eec9 100644
--- a/usr/src/cmd/audio/utilities/Makefile
+++ b/usr/src/cmd/audio/utilities/Makefile
@@ -96,6 +96,7 @@ clean:
 	$(RM) $(COBJS) $(CCOBJS)
 
 clobber: clean
+	$(RM) $(libaudio)
 
 lint:
 	$(LINT.c) $(LIBCSRCS) $(LDLIBS)
diff --git a/usr/src/cmd/avs/errgen/Makefile b/usr/src/cmd/avs/errgen/Makefile
index f37035c367..afd5db1b7b 100644
--- a/usr/src/cmd/avs/errgen/Makefile
+++ b/usr/src/cmd/avs/errgen/Makefile
@@ -33,6 +33,7 @@ OBJS=	errgen.o
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-switch
 LINTFLAGS += -erroff=E_SEC_SPRINTF_UNBOUNDED_COPY
+CLOBBERFILES += $(DYNPROG)
 
 .KEEP_STATE:
 
@@ -45,7 +46,7 @@ install: all
 lint:	lint_PROG
 
 clean:
-	$(RM) *.o $(POFILE)
+	$(RM) $(OBJS)
 
 $(PROG):	$(OBJS)
 	$(NATIVECC) $(CFLAGS) $(OBJS) -o $@
diff --git a/usr/src/cmd/backup/Makefile b/usr/src/cmd/backup/Makefile
index eb08fe8f4d..b4a35fc060 100644
--- a/usr/src/cmd/backup/Makefile
+++ b/usr/src/cmd/backup/Makefile
@@ -20,8 +20,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 1993,1998,2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -60,4 +58,7 @@ $(UFSINSDIRS):
 $(COMMONPRODSUBDIRS) $(UFSPRODSUBDIRS): $(LIBSUBDIRS) FRC
 	$(DO_SUBDIR)
 
+$(LIBSUBDIRS): FRC
+	$(DO_SUBDIR)
+
 FRC:
diff --git a/usr/src/cmd/backup/dump/Makefile b/usr/src/cmd/backup/dump/Makefile
index 775127419f..997ffeaa64 100644
--- a/usr/src/cmd/backup/dump/Makefile
+++ b/usr/src/cmd/backup/dump/Makefile
@@ -59,7 +59,7 @@ HEADERS=	../../../head/protocols/dumprestore.h \
 	../include/memutils.h \
 	../include/rmt.h dump.h dumpusg.h
 
-CLOBBERFILES=	$(PRODUCT) $(DEBUGPRODUCTS) dumpdates *.ln $(POFILES)
+CLOBBERFILES +=	$(PRODUCT) $(DEBUGPRODUCTS) dumpdates
 
 LOCAL=		.
 GENERAL=	../include
diff --git a/usr/src/cmd/backup/lib/Makefile b/usr/src/cmd/backup/lib/Makefile
index 678c18d78c..42c882a999 100644
--- a/usr/src/cmd/backup/lib/Makefile
+++ b/usr/src/cmd/backup/lib/Makefile
@@ -52,7 +52,7 @@ HDRS=		../include/byteorder.h \
 YFILE=		getdate.y
 YSRC=		getdate.c
 
-CLOBBERFILES=	$(YSRC) $(GLIB) *.ln
+CLOBBERFILES +=	$(LIBS) $(GLIB)
 
 LOBJS=		rmtlib.o myrcmd.o \
 		$(YSRC:%.c=%.o) \
diff --git a/usr/src/cmd/backup/restore/Makefile b/usr/src/cmd/backup/restore/Makefile
index 53cd027c0b..b68aa1f2aa 100644
--- a/usr/src/cmd/backup/restore/Makefile
+++ b/usr/src/cmd/backup/restore/Makefile
@@ -35,7 +35,7 @@ HEADERS=	../../../head/protocols/dumprestore.h \
 	../include/byteorder.h ../include/memutils.h \
 	../include/rmt.h restore.h
 
-CLOBBERFILES=	$(PRODUCT) $(DEBUGPRODUCTS) *.ln $(POFILES)
+CLOBBERFILES +=	$(PRODUCT) $(DEBUGPRODUCTS)
 
 LOCAL=		.
 GENERAL=	../include
diff --git a/usr/src/cmd/bnu/Makefile b/usr/src/cmd/bnu/Makefile
index 00c2ed394c..b51411c6d6 100644
--- a/usr/src/cmd/bnu/Makefile
+++ b/usr/src/cmd/bnu/Makefile
@@ -49,6 +49,10 @@ FILES =		Config Devconfig Devices Dialcodes	\
 
 CLEANFILES =	$(SRCS:%.c=%.o) common.o
 
+# This Makefile overrides the standard POFILES (*.cat)
+# so we have to augment clobber this ugly way.
+CLOBBERFILES +=	$(SRCS:%.c=%.po) common.po
+
 TXTFILES =	README $(FILES)	\
 		dkbreak.c dkdial.c dkerr.c dkminor.c dtnamer.c	\
 		Cvt Install SetUp Teardown dial.c dial.h getopt.c strpbrk.c
diff --git a/usr/src/cmd/bnu/Makefile.inc b/usr/src/cmd/bnu/Makefile.inc
index a8642655c2..4d16a7a8a2 100644
--- a/usr/src/cmd/bnu/Makefile.inc
+++ b/usr/src/cmd/bnu/Makefile.inc
@@ -37,8 +37,7 @@ SRCS =		account.c anlwrk.c bnuconvert.c callers.c		\
 		utility.c uucheck.c uucico.c uucleanup.c uucp.c		\
 		uucpdefs.c uucpname.c uudecode.c uuencode.c		\
 		uuglist.c uuname.c uusched.c uustat.c uux.c		\
-		uuxqt.c versys.c xio.c xqt.c				\
-		../chmod/common.c
+		uuxqt.c versys.c xio.c xqt.c
 
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-char-subscripts
diff --git a/usr/src/cmd/boot/mbr/Makefile b/usr/src/cmd/boot/mbr/Makefile
index 8f18eaee27..387067cae8 100644
--- a/usr/src/cmd/boot/mbr/Makefile
+++ b/usr/src/cmd/boot/mbr/Makefile
@@ -31,6 +31,7 @@ SRCS = $(OBJS:.o=.c)
 include ../Makefile.com
 
 CERRWARN += -_gcc=-Wno-parentheses
+CLOBBERFILES = $(BOOTPROG)
 
 .KEEP_STATE:
 
diff --git a/usr/src/cmd/boot/symdef/Makefile b/usr/src/cmd/boot/symdef/Makefile
index 9e551fccae..5e0322f3f0 100644
--- a/usr/src/cmd/boot/symdef/Makefile
+++ b/usr/src/cmd/boot/symdef/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-# 
 
 BOOTPROG= symdef
 
@@ -40,6 +38,8 @@ LDLIBS +=	-lelf
 # behavior, which causes us to take SIGSEGV on such a write.
 CFLAGS +=	$(XSTRCONST)
 
+CLOBBERFILES= $(BOOTPROG)
+
 all: $(BOOTPROG)
 
 install: all $(ROOTBOOTSOLARISBINPROG)
diff --git a/usr/src/cmd/calendar/Makefile b/usr/src/cmd/calendar/Makefile
index 04aa6c8869..5a082b22f8 100644
--- a/usr/src/cmd/calendar/Makefile
+++ b/usr/src/cmd/calendar/Makefile
@@ -25,11 +25,11 @@
 
 PROG= calprog
 SHFILES= calendar
-CLOBBERFILES = $(SHFILE)
 
 include ../Makefile.cmd
 
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
+CLOBBERFILES = $(SHFILES)
 
 .KEEP_STATE:
 
diff --git a/usr/src/cmd/cdrw/Makefile b/usr/src/cmd/cdrw/Makefile
index cfda1f13c4..2b626aeb59 100644
--- a/usr/src/cmd/cdrw/Makefile
+++ b/usr/src/cmd/cdrw/Makefile
@@ -63,6 +63,7 @@ $(POFILE) : $(SRCS)
 	$(RM) $@
 	$(COMPILE.cpp) $(SRCS) | $(XGETTEXT) $(XGETFLAGS) -
 	$(SED) -e '/^domain/d' messages.po > $@
+	$(RM) messages.po
 
 sb: $(SRCS)
 	$(COMPILE.c) -xsbfast $(SRCS)
diff --git a/usr/src/cmd/cmd-crypto/tpmadm/Makefile b/usr/src/cmd/cmd-crypto/tpmadm/Makefile
index de581b779b..cfb20a8ea5 100644
--- a/usr/src/cmd/cmd-crypto/tpmadm/Makefile
+++ b/usr/src/cmd/cmd-crypto/tpmadm/Makefile
@@ -38,6 +38,8 @@ CPPFLAGS += -xCC
 LINTFLAGS += -XCC  -L$(ADJUNCT_PROTO)/usr/lib
 LDLIBS += -ltspi -luuid
 
+CLOBBERFILES = C.ln $(POFILE) $(POFILES)
+
 .KEEP_STATE:
 
 all : $(PROG)
diff --git a/usr/src/cmd/cmd-inet/usr.bin/Makefile b/usr/src/cmd/cmd-inet/usr.bin/Makefile
index 3b01f3f109..5ad5213eb6 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/Makefile
@@ -56,6 +56,9 @@ COMMONSRCS=	$(CMDINETCOMMONDIR)/$(COMMONOBJS:.o=.c)
 POFILES=	rlogin.po rsh.po rcp.po $(COMMONPOFILES)
 POFILE=		usr.bin.po
 
+CLOBBERFILES +=	$(ALL)
+CLEANFILES +=	kcmd.o rcp.o rlogin.o rsh.o
+
 all:=		TARGET= all
 install:=	TARGET= install
 clean:=		TARGET= clean
@@ -169,14 +172,13 @@ $(SUBDIRS): FRC
 
 FRC:
 
-clean: $(SUBDIRS)
+clean: $(SUBDIRS) clean_local
+clean_local:
+	$(RM) $(CLEANFILES)
 
 clobber: $(SUBDIRS) clobber_local
-
-clobber_local:
-	echo $(CLOBBERFILES)
-	$(RM) $(ALL)  $(CLOBBERFILES) 
-
+clobber_local: clean_local
+	$(RM) $(CLOBBERFILES) 
 
 LINTLOCALS=	$(LINTCLEAN:%.c=lint-%)
 
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
index f732a03576..0d2599827c 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
@@ -124,7 +124,8 @@ lint:=		TARGET= lint
 _msg:=		TARGET= _msg
 
 CLOBBERFILES +=	$(ROOTFS_PROG) $(PROG)
-CLEANFILES += $(COMMONOBJS) $(K5RLOGINOBJS) $(K5RSHDOBJS) $(TFTPDOBJS)
+CLEANFILES += $(COMMONOBJS) $(K5RLOGINOBJS) $(K5RSHDOBJS) $(TFTPDOBJS) \
+		$(K5TELNETOBJS)
 
 CPPFLAGS +=	-DSYSV -DBSD_COMP -I$(CMDINETCOMMONDIR) -I
 
@@ -229,11 +230,13 @@ FRC:
 
 check:	$(CHKMANIFEST)
 
-clean:	$(SUBDIRS)
-	-$(RM) $(CLEANFILES)
+clean: $(SUBDIRS) clean_local
+clean_local:
+	$(RM) $(CLEANFILES)
 
-clobber: $(SUBDIRS)
-	-$(RM) $(CLEANFILES) $(CLOBBERFILES)
+clobber: $(SUBDIRS) clobber_local
+clobber_local: clean_local
+	$(RM) $(CLOBBERFILES)
 
 lint: $(LINTSUBDIRS)
 	$(LINT.c) 6to4relay.c $(LDLIBS) -lsocket -ldladm
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
index 627a311076..3fc271c39a 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
@@ -35,6 +35,7 @@ LFLAGS =	-t
 LDLIBS +=	-ll -ltecla -lnwam -lumem
 YFLAGS +=	-d -b nwamcfg_grammar
 CLEANFILES +=	nwamcfg_lex.c nwamcfg_grammar.tab.c nwamcfg_grammar.tab.h
+CLEANFILES +=	$(PROG).ln
 
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
diff --git a/usr/src/cmd/dcs/sparc/sun4u/Makefile b/usr/src/cmd/dcs/sparc/sun4u/Makefile
index 909bfa3040..0abbf69042 100644
--- a/usr/src/cmd/dcs/sparc/sun4u/Makefile
+++ b/usr/src/cmd/dcs/sparc/sun4u/Makefile
@@ -124,7 +124,7 @@ lint:
 	$(LINT) $(LINT_FLAGS) $(CPPFLAGS) $(LINT_SRCS)
 
 clean:
-	$(RM) $(PROG) $(OBJS) $(LINT_FILES) $(POFILES) $(POFILE) core 
+	$(RM) $(PROG) $(OBJS) $(LINT_FILES)
 
 $(POFILE): $(POFILES)
 	$(RM) $(POFILE)
diff --git a/usr/src/cmd/devfsadm/Makefile.com b/usr/src/cmd/devfsadm/Makefile.com
index 7fd05bd0f2..4df3b00585 100644
--- a/usr/src/cmd/devfsadm/Makefile.com
+++ b/usr/src/cmd/devfsadm/Makefile.com
@@ -50,6 +50,7 @@ LINKMOD_DIR = linkmod
 DEVFSADM_DIR = devfsadm
 
 CLOBBERFILES = $(MODS) $(DEVLINKTAB) $(DEVFSCOMPATLINKS) $(DEVFSADM_DAEMON)
+CLOBBERFILES += $(POFILE) $(POFILES) ../plcysubr.c
 
 LINK_OBJS_CMN =			\
 	disk_link.o		\
diff --git a/usr/src/cmd/dfs.cmds/sharectl/Makefile b/usr/src/cmd/dfs.cmds/sharectl/Makefile
index 45e60ccb1b..11e1d009b5 100644
--- a/usr/src/cmd/dfs.cmds/sharectl/Makefile
+++ b/usr/src/cmd/dfs.cmds/sharectl/Makefile
@@ -19,8 +19,6 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -42,7 +40,10 @@ lint	:=	TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber lint _msg:	$(SUBDIRS)
+all clean lint _msg:	$(SUBDIRS)
+
+clobber: $(SUBDIRS)
+	$(RM) sharectl.po
 
 install: $(SUBDIRS) $(ROOTETCDEFAULTFILES)
 
diff --git a/usr/src/cmd/dfs.cmds/sharectl/Makefile.com b/usr/src/cmd/dfs.cmds/sharectl/Makefile.com
index 1651a72089..052b0100d7 100644
--- a/usr/src/cmd/dfs.cmds/sharectl/Makefile.com
+++ b/usr/src/cmd/dfs.cmds/sharectl/Makefile.com
@@ -46,7 +46,7 @@ SRCS = $(SHARECTL_SRC)
 OBJS = $(SHARECTL_OBJ)
 MODS = $(SHARECTL_MOD)
 
-CLOBBERFILES = $(MODS)
+CLOBBERFILES = $(MODS) $(POFILE) $(POFILES) shareutil.c
 
 POFILES = $(SHARECTL_SRC:.c=.po)
 POFILE  = sharectl.po
diff --git a/usr/src/cmd/dtrace/demo/Makefile b/usr/src/cmd/dtrace/demo/Makefile
index 7da281ed3d..4492ef700d 100644
--- a/usr/src/cmd/dtrace/demo/Makefile
+++ b/usr/src/cmd/dtrace/demo/Makefile
@@ -135,14 +135,18 @@ DEMOFILES = \
 
 MKDEMO	= mkdemo
 CLEANFILES += $(DFILES) $(MKDEMO)
+CLOBBERFILES = $(HTMLFILES)
 
 ROOTDEMODIR = $(ROOT)/usr/demo/dtrace
 ROOTDEMOFILES = $(DEMOFILES:%=$(ROOTDEMODIR)/%)
 
 all:	$(DEMOFILES)
 
-clobber clean:
-	-$(RM) $(CLEANFILES)
+clean:
+	$(RM) $(CLEANFILES)
+
+clobber: clean
+	$(RM) $(CLOBBERFILES)
 
 clean.lint install_h lint:
 
diff --git a/usr/src/cmd/dtrace/test/tst/common/Makefile b/usr/src/cmd/dtrace/test/tst/common/Makefile
index 9853f3be16..4b813cb231 100644
--- a/usr/src/cmd/dtrace/test/tst/common/Makefile
+++ b/usr/src/cmd/dtrace/test/tst/common/Makefile
@@ -40,6 +40,7 @@ RPCSVCDIR = $(SRC)/head/rpcsvc
 RPCSVCOBJS = nfs_prot.o
 RPCSVCSRCS = ${RPCSVCOBJS:%o=%c}
 CLOBBERFILES += nfs/$(RPCSVCOBJS) $(RPCSVCDIR)/$(RPCSVCSRCS)
+CLOBBERFILES += usdt/forker.h usdt/lazyprobe.h
 
 fasttrap/tst.fasttrap.exe := LDLIBS += -ldtrace
 fasttrap/tst.stack.exe := LDLIBS += -ldtrace
diff --git a/usr/src/cmd/expand/Makefile b/usr/src/cmd/expand/Makefile
index 3799b14d2b..157b7167f5 100644
--- a/usr/src/cmd/expand/Makefile
+++ b/usr/src/cmd/expand/Makefile
@@ -23,8 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # cmd/expand/Makefile 
 #
 
@@ -37,7 +35,7 @@ include		../Makefile.cmd
 POFILES= expand_cmd.po unexpand.po
 POFILE= expand.po
 
-CLEANFILES += expand_cmd.c
+CLOBBERFILES += expand_cmd.c
 
 .KEEP_STATE:
 
diff --git a/usr/src/cmd/find/Makefile b/usr/src/cmd/find/Makefile
index b7765acf17..fa138bdd66 100644
--- a/usr/src/cmd/find/Makefile
+++ b/usr/src/cmd/find/Makefile
@@ -69,7 +69,7 @@ xpg4_%.o:	$(SRC)/common/util/%.c
 	$(POST_PROCESS_O)
 
 clean:
-	$(RM) $(FINDOBJS)
+	$(RM) $(FINDOBJS) $(XPG4FINDOBJS)
 
 lint:	lint_SRCS
 
diff --git a/usr/src/cmd/fm/eversholt/eftinfo/Makefile.com b/usr/src/cmd/fm/eversholt/eftinfo/Makefile.com
index c4a018513d..f191c64f3b 100644
--- a/usr/src/cmd/fm/eversholt/eftinfo/Makefile.com
+++ b/usr/src/cmd/fm/eversholt/eftinfo/Makefile.com
@@ -23,7 +23,6 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 .KEEP_STATE:
 
@@ -53,7 +52,7 @@ $(PROG): $(OBJS)
 	$(POST_PROCESS)
 
 clean:
-	$(RM) $(OBJS) y.output y.tab.c y.tab.h a.out core
+	$(RM) $(OBJS) y.output y.tab.c y.tab.h
 
 clobber: clean
 	$(RM) $(PROG)
diff --git a/usr/src/cmd/fm/eversholt/esc/Makefile.com b/usr/src/cmd/fm/eversholt/esc/Makefile.com
index 8c282040b6..73980a9f87 100644
--- a/usr/src/cmd/fm/eversholt/esc/Makefile.com
+++ b/usr/src/cmd/fm/eversholt/esc/Makefile.com
@@ -23,7 +23,6 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 .KEEP_STATE:
 
@@ -52,7 +51,7 @@ $(PROG): $(OBJS)
 	$(POST_PROCESS)
 
 clean:
-	$(RM) $(OBJS) y.output y.tab.c y.tab.h a.out core
+	$(RM) $(OBJS) y.output y.tab.c y.tab.h
 
 clobber: clean
 	$(RM) $(PROG)
diff --git a/usr/src/cmd/fs.d/Makefile b/usr/src/cmd/fs.d/Makefile
index d8c2f66a0a..8e8faaa643 100644
--- a/usr/src/cmd/fs.d/Makefile
+++ b/usr/src/cmd/fs.d/Makefile
@@ -44,6 +44,8 @@ SUBDIR2= dev fd pcfs nfs hsfs proc ctfs udfs ufs tmpfs cachefs \
 SUBDIRS= $(SUBDIR1) $(SUBDIR2)
 I18NDIRS= $(SUBDIR2)
 
+CLEANFILES +=	deffs.o df.o ff.o fsck.o fssnapsup.o \
+		mount.o preenlib.o switchout.o umount.o volcopy.o
 
 all:=		TARGET= all
 install:=	TARGET= install
@@ -184,11 +186,10 @@ $(ROOTUSRSBINFF):	$(ROOTUSRSBIN)/ff
 	-$(RM) $@; $(SYMLINK) ./ff $@
 
 clean: $(SUBDIRS) .WAIT clean_local
-
 clean_local:
+	$(RM) $(CLEANFILES)
 
 clobber: $(SUBDIRS) .WAIT clobber_local
-
 clobber_local:	clean_local
 	$(RM) $(PROG) $(ROOTFS_PROG) $(SPPROG) $(MNTTAB) $(DEFAULTFILES) \
 	$(CLOBBERFILES)
diff --git a/usr/src/cmd/fs.d/Makefile.mount b/usr/src/cmd/fs.d/Makefile.mount
index 0f8083b443..fcfc16a7d1 100644
--- a/usr/src/cmd/fs.d/Makefile.mount
+++ b/usr/src/cmd/fs.d/Makefile.mount
@@ -20,8 +20,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -37,3 +35,7 @@ SRCS=		$(LIBPROG).c $(COMMONSRC)
 POFILE= $(LIBPROG).po
 
 CPPFLAGS += -I$(FSCOMMONDIR)
+
+# not $(OBJS) due to ../fslib.o
+CLEANFILES   += $(LIBPROG).o
+CLOBBERFILES += $(LIBPROG) $(POFILE) $(FSTYPE).po
diff --git a/usr/src/cmd/fs.d/Makefile.mount.targ b/usr/src/cmd/fs.d/Makefile.mount.targ
index 50e9e98562..b4d28552a8 100644
--- a/usr/src/cmd/fs.d/Makefile.mount.targ
+++ b/usr/src/cmd/fs.d/Makefile.mount.targ
@@ -20,8 +20,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -38,6 +36,9 @@ $(LIBPROG):	$(OBJS)
 		$(COMPILE.c) -o $@ $<
 		$(POST_PROCESS_O)
 
+clean:
+	$(RM) $(CLEANFILES)
+
 lint:		lint_SRCS
 
 catalog:	$(POFILE)
diff --git a/usr/src/cmd/fs.d/cachefs/cfsd/Makefile b/usr/src/cmd/fs.d/cachefs/cfsd/Makefile
index 1f614208c9..0b49a010cc 100644
--- a/usr/src/cmd/fs.d/cachefs/cfsd/Makefile
+++ b/usr/src/cmd/fs.d/cachefs/cfsd/Makefile
@@ -23,7 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # cmd/fs.d/cachefs/cfsd
 #
@@ -45,7 +44,7 @@ include		../Makefile.cachefs
 MDBUGLIB=	../mdbug/libdbug.a
 CPPFLAGS +=	-I.. -D_REENTRANT
 RPCGENFLAGS=	-M -C -T
-CLOBBERFILES +=	$(LIBPROG_C)
+CLOBBERFILES +=	$(LIBPROG_C) cachefsd_tbl.i
 
 all : $(LIBPROG_C)
 
diff --git a/usr/src/cmd/fs.d/nfs/umount/Makefile b/usr/src/cmd/fs.d/nfs/umount/Makefile
index 8d85c2a575..37d7011147 100644
--- a/usr/src/cmd/fs.d/nfs/umount/Makefile
+++ b/usr/src/cmd/fs.d/nfs/umount/Makefile
@@ -20,8 +20,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.	*/
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -66,7 +64,7 @@ $(LIBPROG):	$(OBJS)
 lint:	lint_SRCS
 
 clean:     
-	$(RM) $(OBJS)
+	$(RM) $(LIBPROG).o replica.o
 
 replica.o: ../lib/replica.c 
 	$(COMPILE.c) ../lib/replica.c
diff --git a/usr/src/cmd/fs.d/pcfs/mkfs/Makefile b/usr/src/cmd/fs.d/pcfs/mkfs/Makefile
index 6a3a05acf9..6e9829a447 100644
--- a/usr/src/cmd/fs.d/pcfs/mkfs/Makefile
+++ b/usr/src/cmd/fs.d/pcfs/mkfs/Makefile
@@ -43,12 +43,10 @@ CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 CERRWARN +=	-_gcc=-Wno-parentheses
 
 $(LIBPROG):	$(OBJS)
-		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
-		$(POST_PROCESS)
+	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
+	$(POST_PROCESS)
 
 lint:		lint_SRCS
 
 clean:
-		${RM} ${OBJS} ${LIBPROG} core
-
-clobber:	clean
+	$(RM) $(OBJS)
diff --git a/usr/src/cmd/fs.d/smbclnt/umount/Makefile b/usr/src/cmd/fs.d/smbclnt/umount/Makefile
index d85891b6db..09a11ce9fb 100644
--- a/usr/src/cmd/fs.d/smbclnt/umount/Makefile
+++ b/usr/src/cmd/fs.d/smbclnt/umount/Makefile
@@ -36,33 +36,30 @@ include		../../Makefile.fstype
 COMMON=		$(FSLIB)
 OBJS=		$(LIBPROG).o $(COMMON)
 SRCS=		$(LIBPROG).c $(FSLIBSRC)
-POFILE=		$(LIBPROG).po
-CLOBBERFILES	+= $(LIBPROG)
 
 $(ROOTLIBFSTYPE)/umount := FILEMODE= 04555
 
 CPPFLAGS += -I../.. -I../lib
 CFLAGS += $(CCVERBOSE)
 
-.KEEP_STATE:
-
-all:	$(ROOTFS_PROG)
-
-include		$(SRC)/cmd/fs.d/Makefile.mount.targ
-
 #
 # Message catalog
 #
-POFILE= umount.po
-
-#
-# message catalog
-#
+POFILE=	$(LIBPROG).po
 catalog: $(POFILE)
 
-install:	$(ROOTLIBFSTYPEPROG)
+$(POFILE):      $(SRCS)
+	$(RM) $@
+	$(COMPILE.cpp) $(SRCS)   > $(POFILE).i
+	$(XGETTEXT) $(XGETFLAGS)        $(POFILE).i
+	sed "/^domain/d"        messages.po     > $@
+	$(RM) messages.po $(POFILE).i
+
+$(LIBPROG):	$(OBJS)
+		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
+		$(POST_PROCESS)
 
 lint:	lint_SRCS
 
 clean:     
-	$(RM) $(LIBPROG).o $(POFILE)
+	$(RM) $(LIBPROG).o
diff --git a/usr/src/cmd/fs.d/udfs/fsdb/Makefile b/usr/src/cmd/fs.d/udfs/fsdb/Makefile
index 4da2706c79..bda23962f3 100644
--- a/usr/src/cmd/fs.d/udfs/fsdb/Makefile
+++ b/usr/src/cmd/fs.d/udfs/fsdb/Makefile
@@ -60,14 +60,18 @@ fsdb.o : fsdb.c
 	$(COMPILE.c) -o $@ fsdb.c
 	$(POST_PROCESS_O)
 
-ud_lib.o : ../fstyp/ud_lib.c
-	$(RM) ud_lib.c
-	$(CP) ../fstyp/ud_lib.c ud_lib.c
-	$(RM) ud_lib.h
-	$(CP) ../fstyp/ud_lib.h ud_lib.h
+ud_lib.o : ud_lib.c ud_lib.h
 	$(COMPILE.c) -o $@ ud_lib.c
 	$(POST_PROCESS_O)
 
+ud_lib.c : ../fstyp/ud_lib.c
+	$(RM) $@
+	$(CP) ../fstyp/ud_lib.c $@
+
+ud_lib.h : ../fstyp/ud_lib.h
+	$(RM) $@
+	$(CP) ../fstyp/ud_lib.h $@
+
 y.tab.c : fsdb_yacc.y
 	$(YACC.y) fsdb_yacc.y
 
@@ -103,11 +107,7 @@ $(POFILE):      $(CATSRCS)
 	$(SED) "/^domain/d" messages.po >  $@
 	$(RM) $(POFILE).i messages.po
 
-lint: y.tab.c lex.yy.c
-	$(RM) ud_lib.h
-	$(CP) ../fstyp/ud_lib.h ud_lib.h
-	$(RM) ud_lib.c
-	$(CP) ../fstyp/ud_lib.c ud_lib.c
+lint: y.tab.c lex.yy.c ud_lib.c ud_lib.h
 	$(LINT.c) -mu $(SRCS)
 
 putback :
diff --git a/usr/src/cmd/fs.d/udfs/fstyp/Makefile b/usr/src/cmd/fs.d/udfs/fstyp/Makefile
index 454d7f43c1..292faf8b32 100644
--- a/usr/src/cmd/fs.d/udfs/fstyp/Makefile
+++ b/usr/src/cmd/fs.d/udfs/fstyp/Makefile
@@ -49,6 +49,9 @@ LINTFLAGS64 += -erroff=E_STATIC_UNUSED -erroff=E_NAME_DEF_NOT_USED2
 #
 PMAP=
 
+# No msg catalog here.
+POFILE=
+
 OBJS= fstyp.o ud_lib.o
 
 SRCS= $(OBJS:%.o=%.c)
@@ -78,6 +81,4 @@ cstyle:
 	$(CSTYLE) $(SRCS)
 
 clean:     
-	$(RM) $(LIBPROG)
-
-clobber: clean
+	$(RM) $(OBJS)
diff --git a/usr/src/cmd/fs.d/ufs/clri/Makefile b/usr/src/cmd/fs.d/ufs/clri/Makefile
index 1937b4be2e..649ae3dafe 100644
--- a/usr/src/cmd/fs.d/ufs/clri/Makefile
+++ b/usr/src/cmd/fs.d/ufs/clri/Makefile
@@ -20,8 +20,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -32,13 +30,16 @@ DCOPY=		dcopy
 ATTMK=		$(LIBPROG)
 
 OTHERINSTALL=	$(ROOTLIBFSTYPE)/$(DCOPY)
-		
+
 include		../../Makefile.fstype
 include		../Makefile.roll
 
 OBJS=		$(LIBPROG).o $(ROLLOBJS)
 SRCS=		$(LIBPROG).c $(ROLLSRCS)
 
+# No msg catalog here.
+POFILE=
+
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 
@@ -46,6 +47,9 @@ $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
 
+clean:
+		$(RM) $(LIBPROG).o
+
 lint :=		PROG=$(LIBPROG)
 lint:		lint_PROG
 
diff --git a/usr/src/cmd/fs.d/ufs/df/Makefile b/usr/src/cmd/fs.d/ufs/df/Makefile
index 5b579980b9..fc76d7ca8e 100644
--- a/usr/src/cmd/fs.d/ufs/df/Makefile
+++ b/usr/src/cmd/fs.d/ufs/df/Makefile
@@ -53,4 +53,7 @@ $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
 
+clean:
+		$(RM) $(LIBPROG).o
+
 lint:		lint_SRCS
diff --git a/usr/src/cmd/fs.d/ufs/ff/Makefile b/usr/src/cmd/fs.d/ufs/ff/Makefile
index 2c12941ec9..09c79c2688 100644
--- a/usr/src/cmd/fs.d/ufs/ff/Makefile
+++ b/usr/src/cmd/fs.d/ufs/ff/Makefile
@@ -34,6 +34,9 @@ include		../Makefile.roll
 OBJS=           $(LIBPROG).o $(ROLLOBJS)
 SRCS=           $(LIBPROG).c $(ROLLSRCS)
 
+# No msg catalog here.
+POFILE=
+
 CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
@@ -42,4 +45,7 @@ $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
 
+clean:
+		$(RM) $(LIBPROG).o
+
 lint:		lint_SRCS
diff --git a/usr/src/cmd/fs.d/ufs/ncheck/Makefile b/usr/src/cmd/fs.d/ufs/ncheck/Makefile
index 8f9dc4d089..70b746470e 100644
--- a/usr/src/cmd/fs.d/ufs/ncheck/Makefile
+++ b/usr/src/cmd/fs.d/ufs/ncheck/Makefile
@@ -20,8 +20,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1989,1996,1997 by Sun Microsystems, Inc.
 # All rights reserved.
 #
@@ -36,10 +34,16 @@ include		../Makefile.roll
 OBJS=		$(LIBPROG).o $(ROLLOBJS)
 SRCS=		$(LIBPROG).c $(ROLLSRCS)
 
+# No msg catalog here.
+POFILE=
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
 
 CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 
+clean:
+		$(RM) $(LIBPROG).o
+
 lint:		lint_SRCS
diff --git a/usr/src/cmd/fs.d/ufs/roll_log/Makefile b/usr/src/cmd/fs.d/ufs/roll_log/Makefile
index 26f4e03e18..ab513c53d6 100644
--- a/usr/src/cmd/fs.d/ufs/roll_log/Makefile
+++ b/usr/src/cmd/fs.d/ufs/roll_log/Makefile
@@ -29,11 +29,10 @@ include		../../Makefile.fstype
 INCLUDES=	roll_log.h
 SRCS=		roll_log.c
 OBJS=		$(SRCS:%.c=$(MACH)/%.o)
+POFILE=		roll_log.po
 
 CERRWARN +=	-_gcc=-Wno-switch
 
-CLOBBERFILES=	$(OBJS)
-
 .KEEP_STATE:
 
 all install:	$(MACH) .WAIT $(OBJS)
@@ -48,4 +47,4 @@ $(MACH)/%.o:	%.c
 
 lint:	lint_SRCS
 
-clean clobber:
+clean:
diff --git a/usr/src/cmd/geniconvtbl/Makefile.com b/usr/src/cmd/geniconvtbl/Makefile.com
index 389ce98098..4030af32e6 100644
--- a/usr/src/cmd/geniconvtbl/Makefile.com
+++ b/usr/src/cmd/geniconvtbl/Makefile.com
@@ -79,7 +79,7 @@ OBJS	= $(SRCSC1:%.c=%.o) $(YTABC:.c=.o) $(LEXYY:.c=.o)
 
 CHECKHDRS = $(HDRS%.h=%.check)
 
-CLOBBERFILES=	$(ITM)
+CLOBBERFILES=	$(ITM) $(SRCYC)
 CLEANFILES = 	$(OBJS) $(YTABC) $(YTABH) $(LEXYY) $(YOUT) \
 		$(POFILES) $(POFILE)
 
diff --git a/usr/src/cmd/hal/Makefile b/usr/src/cmd/hal/Makefile
index c97b46b9c0..12ce3ea7cb 100644
--- a/usr/src/cmd/hal/Makefile
+++ b/usr/src/cmd/hal/Makefile
@@ -47,7 +47,7 @@ $(ROOT_HAL_CONF) :=	FILEMODE = 644
 
 all: $(SUBDIRS) $(HAL_CONF)
 
-clean: $(SUBDIRS)
+clean clobber: $(SUBDIRS)
 
 install: $(SUBDIRS) $(ROOT_HAL_CONF)
 
diff --git a/usr/src/cmd/hal/hald/Makefile b/usr/src/cmd/hal/hald/Makefile
index 3182c00408..9352dd5e56 100644
--- a/usr/src/cmd/hal/hald/Makefile
+++ b/usr/src/cmd/hal/hald/Makefile
@@ -48,6 +48,8 @@ all install $(PROG) :=	LDLIBS += -lexpat
 CPPFLAGS +=	$(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS)
 C99MODE =	$(C99_ENABLE)
 
+CLOBBERFILES += hald_marshal.c hald_marshal.h
+
 all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
@@ -77,7 +79,7 @@ $(PROG): $(SUBDIRS) .WAIT $(OBJS_ALL)
 install: all $(ROOTCMD) $(SUBDIRS)
 
 clean: $(SUBDIRS)
-	$(RM) $(OBJS) hald_marshal.c hald_marshal.h
+	$(RM) $(OBJS) $(OBJS_SOL)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/cmd/hal/tools/Makefile b/usr/src/cmd/hal/tools/Makefile
index ac423e7c5e..1c4fceb34b 100644
--- a/usr/src/cmd/hal/tools/Makefile
+++ b/usr/src/cmd/hal/tools/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 SUBDIR =	sunos	
 
@@ -56,7 +54,7 @@ STORAGE_SHAREDSRCS =	$(STORAGE_SHAREDOBJS:%.o=%.c) $(STORAGE_SHAREDOBJS:%.o=../u
 SRCS =		$(PROGSRCS) $(STORAGE_SHAREDSRCS)
 
 CLOBBERFILES += $(HAL_PROG) $(STORAGE_PROG) $(SCRIPT_BIN) $(SCRIPT_LIB) $(HAL_LIB)
-CLEANFILES += $(STORAGE_SHAREDOBJS) $(STORAGE_OBJS)
+CLEANFILES += $(STORAGE_SHAREDOBJS) $(STORAGE_OBJS) hal-storage-zpool.o
 
 include ../../Makefile.cmd
 include ../Makefile.hal
diff --git a/usr/src/cmd/hotplug/Makefile b/usr/src/cmd/hotplug/Makefile
index fe62d9acc6..2bab171cb0 100644
--- a/usr/src/cmd/hotplug/Makefile
+++ b/usr/src/cmd/hotplug/Makefile
@@ -51,6 +51,7 @@ check:	$(PROG).c
 	$(CSTYLE) -pP $(SRCS:%=%)
 
 clean:
+	$(RM) $(OBJS)
 
 lint: lint_SRCS
 
diff --git a/usr/src/cmd/ipf/examples/Makefile b/usr/src/cmd/ipf/examples/Makefile
index aba12bbffc..078c7eef53 100644
--- a/usr/src/cmd/ipf/examples/Makefile
+++ b/usr/src/cmd/ipf/examples/Makefile
@@ -38,6 +38,8 @@ SHSRCS= $(SHPROG:%=%.sh)
 
 include ../../Makefile.cmd
 
+CLOBBERFILES =	$(SHPROG)
+
 SHAREIPF= $(ROOT)/usr/share/ipfilter
 SHAREIPFX= $(SHAREIPF)/examples
 
@@ -63,8 +65,6 @@ all:		$(SHPROG)
 
 clean:
 
-clobber:
-
 install:	all $(SHAREIPF) $(SHAREIPFX)  \
 		$(IPFEXAMPLES) $(IPFEXSHPROG)
 
diff --git a/usr/src/cmd/ipf/tools/Makefile b/usr/src/cmd/ipf/tools/Makefile
index 0562aca48e..03bb135de2 100644
--- a/usr/src/cmd/ipf/tools/Makefile
+++ b/usr/src/cmd/ipf/tools/Makefile
@@ -54,17 +54,13 @@ $(USRLIBIPF)/% : %
 
 .KEEP_STATE:
 
-all:		$(SUBDIRS) 
+all clean clobber lint: $(SUBDIRS)
 
-clean clobber lint: $(SUBDIRS)
+install: all $(SUBDIRS) install_local
 
-install:	all $(SUBDIRS) $(USRLIBIPF) \
-		$(USRLIBIPFLICENCE)
+install_local: $(USRLIBIPF) $(USRLIBIPFLICENCE)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET)
 
-
 FRC:
-
-include ../../Makefile.targ
diff --git a/usr/src/cmd/ipf/tools/Makefile.tools b/usr/src/cmd/ipf/tools/Makefile.tools
index 71f81169f1..5d8bee1d04 100644
--- a/usr/src/cmd/ipf/tools/Makefile.tools
+++ b/usr/src/cmd/ipf/tools/Makefile.tools
@@ -22,6 +22,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+#
 
 PROG=		ipf ipfs ipmon ipnat ippool ipfstat
 IPFPROG=	ipftest
@@ -43,7 +45,7 @@ IPFTEST_OBJS=	ipftest.o  \
 		ip_pool.o radix.o
 
 OBJS=		$(IPF_OBJS) $(IPFS_OBJS) $(IPFSTAT_OBJS) \
-		$(IPMON_OBJS) $(IPNAT_OBJS) $(IPFTEST_OBJS)
+		$(IPMON_OBJS) $(IPNAT_OBJS) $(IPPOOL_OBJS) $(IPFTEST_OBJS)
 
 OBJSL=		$(IPF_OBJS) $(IPFS_OBJS) $(IPFSTAT_OBJS) \
 		$(IPMON_OBJS) $(IPNAT_OBJS)
@@ -69,6 +71,7 @@ ipnat		:=	LDLIBS += -lsocket -lnsl -lkvm -lelf
 ippool		:=	LDLIBS += -lsocket -lnsl -lkvm -lelf
 
 CLEANFILES	+= $(OBJS)
+CLOBBERFILES	+= $(IPFPROG)
 
 ROOTIPF=	$(ROOTLIB)/ipf
 ROOTIPF32=	$(ROOTIPF)/$(MACH32)
@@ -80,6 +83,8 @@ ROOTIPFPROG64=	$(IPFPROG:%=$(ROOTIPF64)/%)
 ROOTIPFLINKS=		$(IPFPROG:%=$(ROOTIPF)/%)
 ROOTUSRSBINLINKS=	$(PROG:%=$(ROOTUSRSBIN)/%)
 
+all:
+
 $(ROOTIPF32):
 	$(INS.dir)
 
@@ -118,6 +123,9 @@ ipf_y.o: ../ipf_y.c $(COMMONIPF)/netinet/ip_fil.h $(COMMONIPF)/ipf.h \
 	sed -e 's/yy/ipf_yy/g' -e 's/y.tab.h/ipf_y.h/' \
 	   ipf.tab.h > ../ipf_y.h
 
+CLEANFILES += ipf.tab.c ipf.tab.h
+CLEANFILES += ../ipf_y.c ../ipf_y.h
+
 ipf_l.o: ../ipf_l.c $(COMMONIPF)/netinet/ip_fil.h $(COMMONIPF)/ipf.h  \
 	 ../ipf_y.h ../ipf_l.h
 	$(COMPILE.c) ../ipf_l.c -o $@
@@ -129,6 +137,9 @@ ipf_l.o: ../ipf_l.c $(COMMONIPF)/netinet/ip_fil.h $(COMMONIPF)/ipf.h  \
 ../ipf_l.h: ../lexer.h
 	sed -e 's/yy/ipf_yy/g' ../lexer.h > $@
 
+CLEANFILES += ../ipf_l.c ../ipf_l.h
+
+
 ipfs:	$(IPFS_OBJS)
 	$(LINK.c) -o ipfs $(IPFS_OBJS) $(LDLIBS)
 	$(POST_PROCESS)
@@ -153,6 +164,9 @@ ipmon_y.o: ../ipmon_y.c $(COMMONIPF)/ipmon.h \
 	sed -e 's/yy/ipmon_yy/g' -e 's/y.tab.h/ipmon_y.h/' \
 	   ipmon.tab.h > ../ipmon_y.h
 
+CLEANFILES += ipmon.tab.c ipmon.tab.h
+CLEANFILES += ../ipmon_y.c ../ipmon_y.h
+
 ipmon_l.o: ../ipmon_l.c $(COMMONIPF)/ipmon.h ../ipmon_y.h ../ipmon_l.h
 	$(COMPILE.c) ../ipmon_l.c -o $@
 
@@ -163,6 +177,8 @@ ipmon_l.o: ../ipmon_l.c $(COMMONIPF)/ipmon.h ../ipmon_y.h ../ipmon_l.h
 ../ipmon_l.h: ../lexer.h
 	sed -e 's/yy/ipmon_yy/g' ../lexer.h > $@
 
+CLEANFILES += ../ipmon_l.c ../ipmon_l.h
+
 ipnat:	$(IPNAT_OBJS) $(LIBIPF) $(MAPFILE.NGB)
 	$(LINK.c) -o ipnat $(IPNAT_OBJS) $(LDLIBS)
 	$(POST_PROCESS)
@@ -179,6 +195,9 @@ ipnat_y.o: ../ipnat_y.c $(COMMONIPF)/netinet/ip_nat.h \
 	sed -e 's/yy/ipnat_yy/g' -e 's/y.tab.h/ipnat_y.h/' \
 	   ipnat.tab.h > ../ipnat_y.h
 
+CLEANFILES += ipnat.tab.c ipnat.tab.h
+CLEANFILES += ../ipnat_y.c ../ipnat_y.h
+
 ipnat_l.o: ../ipnat_l.c $(COMMONIPF)/netinet/ip_nat.h ../ipnat_l.h
 	$(COMPILE.c) ../ipnat_l.c -o $@
 
@@ -189,6 +208,8 @@ ipnat_l.o: ../ipnat_l.c $(COMMONIPF)/netinet/ip_nat.h ../ipnat_l.h
 ../ipnat_l.h: ../lexer.h
 	sed -e 's/yy/ipnat_yy/g' ../lexer.h > $@
 
+CLEANFILES += ../ipnat_l.c ../ipnat_l.h
+
 ippool:	$(IPPOOL_OBJS) $(LIBIPF) $(MAPFILE.NGB)
 	$(LINK.c) -o ippool $(IPPOOL_OBJS) $(LDLIBS)
 	$(POST_PROCESS)
@@ -205,6 +226,9 @@ ippool_y.o: ../ippool_y.c $(COMMONIPF)/netinet/ip_pool.h \
 	sed -e 's/yy/ippool_yy/g' -e 's/y.tab.h/ippool_y.h/' \
 	   ippool.tab.h > ../ippool_y.h
 
+CLEANFILES += ippool.tab.c ippool.tab.h
+CLEANFILES += ../ippool_y.c ../ippool_y.h
+
 ippool_l.o: ../ippool_l.c $(COMMONIPF)/netinet/ip_pool.h ../ippool_l.h
 	$(COMPILE.c) ../ippool_l.c -o $@
 
@@ -215,6 +239,8 @@ ippool_l.o: ../ippool_l.c $(COMMONIPF)/netinet/ip_pool.h ../ippool_l.h
 ../ippool_l.h: ../lexer.h
 	sed -e 's/yy/ippool_yy/g' ../lexer.h > $@
 
+CLEANFILES += ../ippool_l.c ../ippool_l.h
+
 ipftest:	$(IPFTEST_OBJS) $(LIBIPF) $(MAPFILE.NGB)
 	$(LINK.c) $(ZIGNORE) -o ipftest $(IPFTEST_OBJS) $(LDLIBS)  
 	$(POST_PROCESS)
diff --git a/usr/src/cmd/isalist/Makefile b/usr/src/cmd/isalist/Makefile
index 7ece4027f8..ee02189475 100644
--- a/usr/src/cmd/isalist/Makefile
+++ b/usr/src/cmd/isalist/Makefile
@@ -29,6 +29,8 @@ OBJS= isalist.o
 
 include ../Makefile.cmd
 
+CLOBBERFILES += $(SHFILES)
+
 FILEMODE= 0555
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/isns/isnsd/Makefile b/usr/src/cmd/isns/isnsd/Makefile
index aaecd2ae6f..9de0a42d7a 100644
--- a/usr/src/cmd/isns/isnsd/Makefile
+++ b/usr/src/cmd/isns/isnsd/Makefile
@@ -63,6 +63,8 @@ CERRWARN += -_gcc=-Wno-ignored-qualifiers
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+CLOBBERFILES += $(DTRACE_HEADER)
+
 obj.o := CERRWARN += -erroff=E_CONST_OBJ_SHOULD_HAVE_INITIZR
 obj.o := CERRWARN += -erroff=E_IMPLICIT_DECL_FUNC_RETURN_INT
 
diff --git a/usr/src/cmd/keyserv/Makefile b/usr/src/cmd/keyserv/Makefile
index 946579dfd2..0c26bd4cca 100644
--- a/usr/src/cmd/keyserv/Makefile
+++ b/usr/src/cmd/keyserv/Makefile
@@ -119,7 +119,7 @@ install: all $(DIRS) $(IBINPROG) $(ISBINPROG) $(ROOTETCDEFAULTFILES) \
 	$(ROOTMANIFEST)
 
 clean:
-	$(RM) $(OBJS)
+	$(RM) $(OBJS) $(OUTSIDE_UTIL_OBJS)
 
 lint: lint_SRCS
 
diff --git a/usr/src/cmd/krb5/kadmin/kclient/Makefile b/usr/src/cmd/krb5/kadmin/kclient/Makefile
index bcc097899c..a5faf8b1ea 100644
--- a/usr/src/cmd/krb5/kadmin/kclient/Makefile
+++ b/usr/src/cmd/krb5/kadmin/kclient/Makefile
@@ -32,7 +32,7 @@ SHFILES=	kclient
 SECFILES=	pam_krb5_first \
 		pam_krb5_only \
 		pam_krb5_optional
-CLOBBERFILES=	$(SHFILES)
+CLOBBERFILES +=	$(SHFILES)
 
 KRB5SBINSHFILES=$(SHFILES:%=$(KRB5SBIN)/%)
 
@@ -103,7 +103,7 @@ $(USRLIBSEC)/%: %
 	$(INS.file)
 
 clean:
-	$(RM) $(PROG) $(SHFILES)
+	$(RM) $(OBJS)
 
 lint:	lint_SRCS
 
diff --git a/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile b/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile
index 0bbbba7255..3e5e1e4d86 100644
--- a/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile
+++ b/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile
@@ -39,6 +39,8 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 
 LDLIBS	+=	-lresolv -lnsl
 
+CLOBBERFILES +=	$(KLPROG)
+
 .KEEP_STATE:
 
 all: $(PROG) $(KLPROG)
@@ -55,6 +57,6 @@ lint:
 	$(LINT.c) $(CSRCS) $(LDLIBS)
 
 clean:
-	$(RM) $(PROG) $(KLPROG)
+	$(RM) $(OBJS)
 
 include ../../../Makefile.targ
diff --git a/usr/src/cmd/ldapcachemgr/Makefile b/usr/src/cmd/ldapcachemgr/Makefile
index 12574d5c68..6084b26e4d 100644
--- a/usr/src/cmd/ldapcachemgr/Makefile
+++ b/usr/src/cmd/ldapcachemgr/Makefile
@@ -102,7 +102,7 @@ install: all $(ROOTLDAPLIB) $(ROOTLDAPPROG) $(ROOTMANIFEST) $(ROOTSVCMETHOD)
 check:	$(CHKMANIFEST)
 
 clean:
-	${RM} ${OBJS} ${POFILE} ${POFILES}
+	$(RM) $(OBJS) $(LINTOUT)
 
 $(POFILE): $(POFILES)
 	$(RM) $@
diff --git a/usr/src/cmd/loadkeys/Makefile b/usr/src/cmd/loadkeys/Makefile
index e41a5d823b..53f6ec8787 100644
--- a/usr/src/cmd/loadkeys/Makefile
+++ b/usr/src/cmd/loadkeys/Makefile
@@ -42,6 +42,8 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-uninitialized
 
+CLOBBERFILES = $(PROG) loadkeys.c
+
 .KEEP_STATE:
 
 .PARALLEL:	$(SUBDIRS)
@@ -74,7 +76,6 @@ clobber:	$(SUBDIRS)
 	$(RM) $(CLOBBERFILES)
 
 clean:	$(SUBDIRS)
-	$(RM) loadkeys.c
 
 lint:
 	$(LINT.c) dumpkeys.c $(LDLIBS)
diff --git a/usr/src/cmd/localedef/Makefile b/usr/src/cmd/localedef/Makefile
index bd41aa702e..9168327f38 100644
--- a/usr/src/cmd/localedef/Makefile
+++ b/usr/src/cmd/localedef/Makefile
@@ -42,7 +42,9 @@ CLEANFILES	+= \
 		8859-11.cm 8859-13.cm 8859-14.cm 8859-15.cm \
 		8859-16.cm \
 		KOI8-R.cm
-CLOBBERFILES	= $(PROG) $(POFILE) $(DATA:%=locale/%)
+CLOBBERFILES	= $(PROG) $(POFILE) \
+		GB18030.cm UTF-8.cm
+
 PIFILES		= $(OBJS:%.o=%.i)
 POFILE		= localedef_cmd.po
 
@@ -248,6 +250,10 @@ clean:
 	$(RM) $(CLEANFILES)
 	$(RM) $(STAMPFILES)
 
+clobber: clean
+	$(RM) $(CLOBBERFILES)
+	$(RM) -r $(LOCDIRS)
+
 $(POFILE):	$(PIFILES)
 	$(RM) $@
 	$(RM) messages.po
@@ -258,7 +264,8 @@ $(POFILE):	$(PIFILES)
 locale $(ROOTLOCDIRS) $(ROOTCATDIRS):
 	$(INS.dir)
 
-include ../Makefile.targ
+$(ROOTBIN)/%: $(ROOTBIN) %
+	$(INS.file)
 
 # Strip LC_CTYPE contents for UTF-8 locales and replace them
 # with UTF-8.ct we compiled
diff --git a/usr/src/cmd/lp/filter/postscript/postreverse/Makefile b/usr/src/cmd/lp/filter/postscript/postreverse/Makefile
index bfd7985c8c..1264a6a574 100644
--- a/usr/src/cmd/lp/filter/postscript/postreverse/Makefile
+++ b/usr/src/cmd/lp/filter/postscript/postreverse/Makefile
@@ -20,8 +20,6 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 1989-2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -56,7 +54,7 @@ $(PROG) : 	$(OBJS)
 install :	all $(ROOTLIBLPPOSTPROG)
 
 clean :
-		$(RM) $(OBJS) core *~ *#
+		$(RM) $(OBJS)
 
 strip :
 		$(STRIP) $(PROG)
diff --git a/usr/src/cmd/lvm/Makefile b/usr/src/cmd/lvm/Makefile
index ddbebdb5dc..f655679dfd 100644
--- a/usr/src/cmd/lvm/Makefile
+++ b/usr/src/cmd/lvm/Makefile
@@ -23,7 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Makefile definitions for volume management
 #
@@ -55,13 +54,10 @@ _msg :=		TARGET= catalog
 
 .KEEP_STATE:
 
-all install cstyle lint: $(SUBDIRS)
-
-clean: $(SUBDIRS)
-	$(RM) $(POFILES)
+all install clean cstyle lint: $(SUBDIRS)
 
 clobber: $(SUBDIRS)
-	$(RM) $(POFILE)
+	$(RM) $(CLOBBERFILES)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/cmd/lvm/md_monitord/i386/Makefile b/usr/src/cmd/lvm/md_monitord/i386/Makefile
index 890ddd7b10..e11cd9adea 100644
--- a/usr/src/cmd/lvm/md_monitord/i386/Makefile
+++ b/usr/src/cmd/lvm/md_monitord/i386/Makefile
@@ -23,7 +23,6 @@
 # Copyright 1996, 2000-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Makefile for logical volume management
 #
@@ -67,6 +66,6 @@ lint:
 	${LINT.c} $(LINTFLAGS) ${SRCS}
 
 clean:
-	${RM} ${OBJS} *.o a.out core
+	${RM} ${OBJS} *.o
 
 include $(SRC)/cmd/Makefile.targ
diff --git a/usr/src/cmd/lvm/md_monitord/sparc/Makefile b/usr/src/cmd/lvm/md_monitord/sparc/Makefile
index 890ddd7b10..f9db2aa8b5 100644
--- a/usr/src/cmd/lvm/md_monitord/sparc/Makefile
+++ b/usr/src/cmd/lvm/md_monitord/sparc/Makefile
@@ -23,8 +23,6 @@
 # Copyright 1996, 2000-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Makefile for logical volume management
 #
 
@@ -67,6 +65,6 @@ lint:
 	${LINT.c} $(LINTFLAGS) ${SRCS}
 
 clean:
-	${RM} ${OBJS} *.o a.out core
+	${RM} ${OBJS} *.o
 
 include $(SRC)/cmd/Makefile.targ
diff --git a/usr/src/cmd/lvm/metassist/Makefile.targ b/usr/src/cmd/lvm/metassist/Makefile.targ
index e818705bfe..2d2744146b 100644
--- a/usr/src/cmd/lvm/metassist/Makefile.targ
+++ b/usr/src/cmd/lvm/metassist/Makefile.targ
@@ -94,8 +94,7 @@ check: cstyle hdrchk
 clobber: ${SUBDIRS}
 
 clean: ${SUBDIRS}
-	-${RM} *.o *.ln *.i *~ core a.out $(CLEANFILES) \
-		*$(SUFFIX_LINT)
+	$(RM) *.o *.ln *.i *.lint $(CLEANFILES)
 
 catalog: $(POFILE)
 
diff --git a/usr/src/cmd/lvm/rpc.mdcommd/Makefile b/usr/src/cmd/lvm/rpc.mdcommd/Makefile
index fdbfe216a1..47bd985d20 100644
--- a/usr/src/cmd/lvm/rpc.mdcommd/Makefile
+++ b/usr/src/cmd/lvm/rpc.mdcommd/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 MANIFEST=	mdcomm.xml
 
@@ -55,10 +53,7 @@ $(POFILE): $(POFILES)
 	$(RM) $@
 	cat $(POFILES) > $(POFILE)
 
-clean:	$(SUBDIRS)
-	$(RM) *.po
-
-lint:     $(SUBDIRS)
+clean clobber lint:	$(SUBDIRS)
 
 install:        $(SUBDIRS) $(ROOTMANIFEST)
 
diff --git a/usr/src/cmd/lvm/rpc.mdcommd/i386/Makefile b/usr/src/cmd/lvm/rpc.mdcommd/i386/Makefile
index 3c0bc10f42..bce5b2fa00 100644
--- a/usr/src/cmd/lvm/rpc.mdcommd/i386/Makefile
+++ b/usr/src/cmd/lvm/rpc.mdcommd/i386/Makefile
@@ -23,8 +23,6 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 COMMD = rpc.mdcommd
 MDDOORS = mddoors
@@ -93,10 +91,10 @@ lint:
 	done
 
 clean:
-	$(RM) $(OBJECTSS) $(DERIVED_FILES) *.o a.out core
+	$(RM) $(OBJECTS) $(DERIVED_FILES) *.o
 
 clobber: clean
-	$(RM) $(PROG)
+	$(RM) $(PROG) $(CLOBBERFILES)
 
 $(DERIVED_FILES): $(SRC)/uts/common/sys/lvm/mdmn_commd.x
 	$(RPCGEN) -c $(SRC)/uts/common/sys/lvm/mdmn_commd.x -o $@
diff --git a/usr/src/cmd/lvm/rpc.mdcommd/sparc/Makefile b/usr/src/cmd/lvm/rpc.mdcommd/sparc/Makefile
index 1429f36f64..45efea82a5 100644
--- a/usr/src/cmd/lvm/rpc.mdcommd/sparc/Makefile
+++ b/usr/src/cmd/lvm/rpc.mdcommd/sparc/Makefile
@@ -23,8 +23,6 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 COMMD = rpc.mdcommd
 MDDOORS = mddoors
@@ -91,10 +89,10 @@ lint:
 	done
 
 clean:
-	$(RM) $(OBJECTSS) $(DERIVED_FILES) *.o a.out core
+	$(RM) $(OBJECTS) $(DERIVED_FILES) *.o
 
 clobber: clean
-	$(RM) $(PROG)
+	$(RM) $(PROG) $(CLOBBERFILES)
 
 $(DERIVED_FILES): $(SRC)/uts/common/sys/lvm/mdmn_commd.x
 	$(RPCGEN) -c $(SRC)/uts/common/sys/lvm/mdmn_commd.x -o $@
diff --git a/usr/src/cmd/lvm/rpc.metad/Makefile b/usr/src/cmd/lvm/rpc.metad/Makefile
index e94bd249df..d446ec246d 100644
--- a/usr/src/cmd/lvm/rpc.metad/Makefile
+++ b/usr/src/cmd/lvm/rpc.metad/Makefile
@@ -22,7 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Makefile for logical volume management
 #
@@ -59,10 +58,9 @@ $(POFILE): $(POFILES)
 	$(RM) $@
 	cat $(POFILES) > $(POFILE)
 
-clean:	$(SUBDIRS)
-	$(RM) metad_svc.c *.po
+CLOBBERFILES += metad_svc.c
 
-lint:     $(SUBDIRS)
+clean clobber lint:	$(SUBDIRS)
 
 install:        $(SUBDIRS) $(ROOTMANIFEST)
 
diff --git a/usr/src/cmd/lvm/rpc.metad/i386/Makefile b/usr/src/cmd/lvm/rpc.metad/i386/Makefile
index df9751d2fd..9284ccc58c 100644
--- a/usr/src/cmd/lvm/rpc.metad/i386/Makefile
+++ b/usr/src/cmd/lvm/rpc.metad/i386/Makefile
@@ -23,7 +23,6 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Makefile for logical volume management
 #
@@ -85,10 +84,10 @@ lint:
 	${LINT.c} $(LINTFLAGS) ${LINTSRCS}
 
 clean:
-	${RM} ${OBJS} ${DERIVED_FILES} *.o a.out core metad.x
+	${RM} ${OBJS} ${DERIVED_FILES} *.o
 
 clobber: clean
-	${RM} $(PROG)
+	$(RM) $(PROG) $(CLOBBERFILES)
 
 metad_svc.c: $(SRC)/head/metad.x
 	$(CP) $(SRC)/head/metad.x .
diff --git a/usr/src/cmd/lvm/rpc.metad/sparc/Makefile b/usr/src/cmd/lvm/rpc.metad/sparc/Makefile
index 8a81336b80..62c269a8c9 100644
--- a/usr/src/cmd/lvm/rpc.metad/sparc/Makefile
+++ b/usr/src/cmd/lvm/rpc.metad/sparc/Makefile
@@ -23,7 +23,6 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Makefile for logical volume management
 #
@@ -41,7 +40,6 @@ LINTOBJECTS=	metad_freeresult.o \
 		metad_init.o \
 		metad_svc_subr.o
 
-
 OBJECTS +=		$(DERIVED_FILES:.c=.o)
 
 SRCS = $(OBJECTS:%.o=../%.c)
@@ -85,10 +83,10 @@ lint:
 	${LINT.c} $(LINTFLAGS) ${LINTSRCS}
 
 clean:
-	${RM} ${OBJS} ${DERIVED_FILES} *.o a.out core metad.x
+	${RM} ${OBJS} ${DERIVED_FILES} *.o
 
 clobber: clean
-	${RM} $(PROG)
+	$(RM) $(PROG) $(CLOBBERFILES)
 
 metad_svc.c: $(SRC)/head/metad.x
 	$(CP) $(SRC)/head/metad.x .
diff --git a/usr/src/cmd/lvm/rpc.metamhd/i386/Makefile b/usr/src/cmd/lvm/rpc.metamhd/i386/Makefile
index 766dbd7c7d..856ec7d49e 100644
--- a/usr/src/cmd/lvm/rpc.metamhd/i386/Makefile
+++ b/usr/src/cmd/lvm/rpc.metamhd/i386/Makefile
@@ -23,7 +23,6 @@
 # Copyright 1996, 2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Makefile for logical volume management 
 #
@@ -110,10 +109,10 @@ lint:
 	${LINT.c} $(LINTFLAGS) ${LINTSRCS}
 
 clean:
-	${RM} ${OBJECTS} ${DERIVED_FILES} *.o a.out core metamhd.x
+	${RM} ${OBJECTS} ${DERIVED_FILES} *.o
 
 clobber: clean
-	${RM} $(PROG)
+	$(RM) $(PROG) $(CLOBBERFILES)
 
 metamhd_svc.c: $(SRC)/head/metamhd.x
 	$(CP) $(SRC)/head/metamhd.x .
diff --git a/usr/src/cmd/lvm/rpc.metamhd/sparc/Makefile b/usr/src/cmd/lvm/rpc.metamhd/sparc/Makefile
index 766dbd7c7d..856ec7d49e 100644
--- a/usr/src/cmd/lvm/rpc.metamhd/sparc/Makefile
+++ b/usr/src/cmd/lvm/rpc.metamhd/sparc/Makefile
@@ -23,7 +23,6 @@
 # Copyright 1996, 2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Makefile for logical volume management 
 #
@@ -110,10 +109,10 @@ lint:
 	${LINT.c} $(LINTFLAGS) ${LINTSRCS}
 
 clean:
-	${RM} ${OBJECTS} ${DERIVED_FILES} *.o a.out core metamhd.x
+	${RM} ${OBJECTS} ${DERIVED_FILES} *.o
 
 clobber: clean
-	${RM} $(PROG)
+	$(RM) $(PROG) $(CLOBBERFILES)
 
 metamhd_svc.c: $(SRC)/head/metamhd.x
 	$(CP) $(SRC)/head/metamhd.x .
diff --git a/usr/src/cmd/lvm/util/Makefile b/usr/src/cmd/lvm/util/Makefile
index fbeff3abd0..abe846675a 100644
--- a/usr/src/cmd/lvm/util/Makefile
+++ b/usr/src/cmd/lvm/util/Makefile
@@ -22,7 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Makefile for logical volume management
 #
@@ -66,7 +65,7 @@ ROOTMANIFESTDIR=	$(ROOTSVCSYSTEM)
 SCRIPTS = \
 	$(GROWFSSCRIPT)
 
-CLOBBERFILES = growfs
+CLOBBERFILES += growfs
 
 SRCS = $(PROGS:%=%.c)
 
@@ -96,14 +95,17 @@ $(POFILE):	$(MSGFILES)
 
 GROWFSFILE=	$(GROWFSSCRIPT:%=$(ROOTUSRSBIN)/%)
 
-clobber lint: $(SUBDIRS)
+lint: $(SUBDIRS)
 
 check:	$(CHKMANIFEST)
 
+clobber: $(SUBDIRS)
+
 clean: $(SUBDIRS)
 	$(RM) $(MSGFILES)
 
-install:	$(SCRIPTS) $(GROWFSFILE) $(ROOTSVCMETHOD) $(ROOTMANIFEST) $(SUBDIRS)
+install:	$(SCRIPTS) $(GROWFSFILE) $(ROOTSVCMETHOD) $(ROOTMANIFEST) \
+		$(SUBDIRS)
 
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/cmd/lvm/util/Makefile.com b/usr/src/cmd/lvm/util/Makefile.com
index e75c0fa1b2..9702621628 100644
--- a/usr/src/cmd/lvm/util/Makefile.com
+++ b/usr/src/cmd/lvm/util/Makefile.com
@@ -23,7 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Architecture independent makefile for svm utilities
 #
@@ -87,7 +86,7 @@ include ../../Makefile.lvm
 
 ROOTLIBSVM = $(ROOTLIB)/lvm
 
-CLOBBERFILES += $(ROOTFS_PROG)
+CLOBBERFILES += $(ROOTFS_PROG) $(METACLUST)
 
 ROOTUSRSBINPROG = $(PROG:%=$(ROOTUSRSBIN)/%)
 
diff --git a/usr/src/cmd/mailx/Makefile b/usr/src/cmd/mailx/Makefile
index 5def4e8c67..93b527b72a 100644
--- a/usr/src/cmd/mailx/Makefile
+++ b/usr/src/cmd/mailx/Makefile
@@ -70,6 +70,8 @@ LINTFLAGS= 	-hb
 LDLIBS +=	-lmail
 LDFLAGS +=	$(MAPFILE.NGB:%=-M%)
 
+CLOBBERFILES += $(MAILXHELP)
+
 # install rules
 $(ROOTMAILXD)/% : %
 	$(INS.file)
diff --git a/usr/src/cmd/mdb/Makefile.module b/usr/src/cmd/mdb/Makefile.module
index a5c6669c74..8c4deeb081 100644
--- a/usr/src/cmd/mdb/Makefile.module
+++ b/usr/src/cmd/mdb/Makefile.module
@@ -134,7 +134,7 @@ install: all $$(ROOTTGTS)
 dmods: install
 
 clean.lint:
-	$(RM) $(LINTFILES)
+	$(RM) $(LINTFILES) $(MODSRCS:.c=.ln)
 
 clean:
 	$(RM) $(MODOBJS) $(KMODOBJS) $(CLEANFILES)
diff --git a/usr/src/cmd/modload/Makefile.com b/usr/src/cmd/modload/Makefile.com
index 3fe1c676fd..3033e5942a 100644
--- a/usr/src/cmd/modload/Makefile.com
+++ b/usr/src/cmd/modload/Makefile.com
@@ -105,7 +105,7 @@ modinfo:	modinfo.o $(MODCOMMONOBJ)
 	$(POST_PROCESS)
 
 clean:
-	$(RM) $(OBJECTS) core
+	$(RM) $(OBJECTS)
 
 lint_%.c:
 	$(LINT.c) $(@:lint_%.c=../%.c) $(COMMONSRC) $(LDLIBS)
diff --git a/usr/src/cmd/netadm/Makefile b/usr/src/cmd/netadm/Makefile
index 47288bb4dd..50f11dce35 100644
--- a/usr/src/cmd/netadm/Makefile
+++ b/usr/src/cmd/netadm/Makefile
@@ -52,6 +52,8 @@ ROOTVARPM = $(PMLOG:%=$(VARPMD)/%)
 
 FILEMODE= 0644
 
+CLOBBERFILES += $(PMLOG)
+
 $(ETCSAFD)/% : %
 	$(INS.file)
 
diff --git a/usr/src/cmd/oamuser/lib/Makefile b/usr/src/cmd/oamuser/lib/Makefile
index 561cf0a3fd..36f85ac89f 100644
--- a/usr/src/cmd/oamuser/lib/Makefile
+++ b/usr/src/cmd/oamuser/lib/Makefile
@@ -73,6 +73,8 @@ LINTFLAGS=	-u
 ROOTUSRSADM=	$(ROOT)/usr/sadm
 ROOTUSRSADMFILE=$(DATEFILE:%=$(ROOTUSRSADM)/%)
 
+CLOBBERFILES += $(LIBRARY)
+
 .KEEP_STATE:
 
 all:		$(PRODUCT) $(TXT)
diff --git a/usr/src/cmd/picl/plugins/common/memcfg/Makefile b/usr/src/cmd/picl/plugins/common/memcfg/Makefile
index e077e128bc..481c7bd220 100644
--- a/usr/src/cmd/picl/plugins/common/memcfg/Makefile
+++ b/usr/src/cmd/picl/plugins/common/memcfg/Makefile
@@ -20,8 +20,6 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -56,6 +54,8 @@ $(SPARC_BLD)LDLIBS +=	-R/usr/platform/\$$PLATFORM/lib/picl/plugins \
 			-R/usr/platform/sun4u/lib/picl/plugins
 LDLIBS +=	-R/usr/lib/picl/plugins
 
+CLOBBERFILES += $(LIBLINKS)
+
 .KEEP_STATE:
 
 SUBDIRS=
diff --git a/usr/src/cmd/pools/poold/Makefile b/usr/src/cmd/pools/poold/Makefile
index 12e5c63023..1ca87a6111 100644
--- a/usr/src/cmd/pools/poold/Makefile
+++ b/usr/src/cmd/pools/poold/Makefile
@@ -100,8 +100,13 @@ $(ROOTJAVA) :=	FILEMODE = 444
 all:	$(PROG) $(JAVA_SUBDIRS) $(JARFILE) \
 		    .WAIT $(SUBDIRS)
 
-clean :	$(JAVA_SUBDIRS) $(SUBDIRS)
-	-$(RM) $(OBJS) $(POFILES)
+clean :	$(JAVA_SUBDIRS) $(SUBDIRS) clean_local
+clean_local:
+	$(RM) $(OBJS)
+
+clobber : $(JAVA_SUBDIRS) $(SUBDIRS) clobber_local
+clobber_local: clean_local
+	$(RM) $(CLOBBERFILES)
 
 lint: $(SUBDIRS)
 
diff --git a/usr/src/cmd/projadd/Makefile b/usr/src/cmd/projadd/Makefile
index f134faa4d1..115840f433 100644
--- a/usr/src/cmd/projadd/Makefile
+++ b/usr/src/cmd/projadd/Makefile
@@ -30,9 +30,11 @@ include ../Makefile.cmd
 PROGS= projadd projmod projdel
 USRSBINPROGS= $(PROGS:%=$(ROOTUSRSBIN)/%)
 POFILES= $(PROGS:%=%.po)
+
+# No msg catalog here.
 POFILE=
 
-CLOBBERFILES= $(PROGS)
+CLOBBERFILES += $(PROGS)
 
 .KEEP_STATE:
 
@@ -49,7 +51,7 @@ $(MSGDOMAIN):
 	$(INS.dir)
 
 clobber: clean
-	-$(RM) $(PROG) $(CLOBBERFILES)
+	$(RM) $(PROG) $(CLOBBERFILES)
 
 $(ROOTUSRSBIN)/% : %
 	$(INS.file)
diff --git a/usr/src/cmd/ptools/Makefile b/usr/src/cmd/ptools/Makefile
index 230f5aa7d4..88806787e8 100644
--- a/usr/src/cmd/ptools/Makefile
+++ b/usr/src/cmd/ptools/Makefile
@@ -80,7 +80,10 @@ POFILE = ptools.po
 
 .PARALLEL: $(SUBDIRS)
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean lint: $(SUBDIRS)
+clobber: $(SUBDIRS) clobber_local
+clobber_local:
+	$(RM) $(CLOBBERFILES)
 
 $(NEW_SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) PTOOL_TYPE=NEW -f ../Makefile.ptool $(TARGET)
diff --git a/usr/src/cmd/rcm_daemon/Makefile.com b/usr/src/cmd/rcm_daemon/Makefile.com
index e2e3ba9720..4b12d1cd27 100644
--- a/usr/src/cmd/rcm_daemon/Makefile.com
+++ b/usr/src/cmd/rcm_daemon/Makefile.com
@@ -112,7 +112,7 @@ RCM_DIR = rcm
 MOD_DIR = modules
 SCRIPT_DIR = scripts
 
-CLOBBERFILES = $(COMMON_RCM_MODS) $($(MACH)_RCM_MODS) $(RCM_DAEMON)
+CLOBBERFILES += $(COMMON_RCM_MODS) $($(MACH)_RCM_MODS) $(RCM_DAEMON)
 
 LINT_MODULES = $(COMMON_MOD_SRC:.c=.ln) $($(MACH)_MOD_SRC:.c=.ln)
 
diff --git a/usr/src/cmd/refer/Makefile b/usr/src/cmd/refer/Makefile
index 4adb63a15d..323c2652ac 100644
--- a/usr/src/cmd/refer/Makefile
+++ b/usr/src/cmd/refer/Makefile
@@ -50,6 +50,8 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-uninitialized
 
+CLOBBERFILES += $(PROG3)
+
 addbib.po :=	XGETFLAGS += -a -x addbib.xcl
 
 
diff --git a/usr/src/cmd/sckmd/sparc/sun4u/Makefile b/usr/src/cmd/sckmd/sparc/sun4u/Makefile
index 06d6eef994..e9a415991f 100644
--- a/usr/src/cmd/sckmd/sparc/sun4u/Makefile
+++ b/usr/src/cmd/sckmd/sparc/sun4u/Makefile
@@ -78,7 +78,7 @@ lint:
 	$(LINT) $(LINT_FLAGS) $(CPPFLAGS) $(LINT_SRCS)
 
 clean:
-	$(RM) $(PROG) $(OBJS) *.po $(LINT_FILES) core
+	$(RM) $(PROG) $(OBJS) *.po $(LINT_FILES)
 
 
 include ../../../Makefile.targ
diff --git a/usr/src/cmd/sendmail/cf/cf/Makefile b/usr/src/cmd/sendmail/cf/cf/Makefile
index b2ad71b2aa..051b10f4fa 100644
--- a/usr/src/cmd/sendmail/cf/cf/Makefile
+++ b/usr/src/cmd/sendmail/cf/cf/Makefile
@@ -26,8 +26,6 @@
 #  Use is subject to license terms.
 #
 #	@(#)Makefile	8.15 (Berkeley) 3/29/98
-#	%W% (Sun) %G%
-#	ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 #
@@ -54,7 +52,7 @@ ALL=	sendmail.cf submit.cf
 all: $(ALL)
 
 clean cleandir:
-	$(RM) $(ALL) core
+	$(RM) $(ALL)
 
 depend install: 
 
diff --git a/usr/src/cmd/sgs/libelf/Makefile.com b/usr/src/cmd/sgs/libelf/Makefile.com
index 28d4e5fff8..394860af7a 100644
--- a/usr/src/cmd/sgs/libelf/Makefile.com
+++ b/usr/src/cmd/sgs/libelf/Makefile.com
@@ -62,8 +62,6 @@ WARLOCKFILES=	$(OBJECTS:%.o=wlocks/%.ll)
 
 MAPFILES =	../common/mapfile-vers
 
-CLOBBERFILES +=
-
 DYNFLAGS +=	$(VERSREF)
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) -lc
 
diff --git a/usr/src/cmd/sgs/libelf/Makefile.targ b/usr/src/cmd/sgs/libelf/Makefile.targ
index 16830f4841..0c5f3ce0a7 100644
--- a/usr/src/cmd/sgs/libelf/Makefile.targ
+++ b/usr/src/cmd/sgs/libelf/Makefile.targ
@@ -63,6 +63,8 @@ $(LIBLINKS):
 		$(RM) $(LIBLINKS)
 		$(SYMLINK) $(DYNLIB) $(LIBLINKS)
 
+CLOBBERFILES += $(LIBLINKS)
+
 # include common library targets
 #
 include		$(SRC)/lib/Makefile.targ
diff --git a/usr/src/cmd/sgs/libelf/Makefile.targ.64 b/usr/src/cmd/sgs/libelf/Makefile.targ.64
index 23616757ef..7ea67ef177 100644
--- a/usr/src/cmd/sgs/libelf/Makefile.targ.64
+++ b/usr/src/cmd/sgs/libelf/Makefile.targ.64
@@ -59,6 +59,8 @@ $(LIBLINKS):
 		$(RM) $(LIBLINKS)
 		$(SYMLINK) $(DYNLIB) $(LIBLINKS)
 
+CLOBBERFILES += $(LIBLINKS)
+
 # include common library targets
 #
 include		$(SRC)/lib/Makefile.targ
diff --git a/usr/src/cmd/shcomp/Makefile b/usr/src/cmd/shcomp/Makefile
index d09f5945c1..03fd752784 100644
--- a/usr/src/cmd/shcomp/Makefile
+++ b/usr/src/cmd/shcomp/Makefile
@@ -88,6 +88,9 @@ $(PROG):	$(OBJECTS)
 	$(LINK.c) $(OBJECTS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
 
-clean lint:
+clean:
+	$(RM) $(OBJECTS)
+
+lint:
 
 include ../Makefile.targ
diff --git a/usr/src/cmd/ssh/Makefile b/usr/src/cmd/ssh/Makefile
index 8a537946b7..a36a9fb762 100644
--- a/usr/src/cmd/ssh/Makefile
+++ b/usr/src/cmd/ssh/Makefile
@@ -49,6 +49,8 @@ SUBDIRS= \
 MSGFILE=ssh.po
 POFILE=_messages.po
 
+CLOBBERFILES += $(MSGFILE) THIRDPARTYLICENSE
+
 .KEEP_STATE:
 
 all :=          TARGET= all
@@ -62,10 +64,10 @@ package :=      TARGET= package
 _msg :=		TARGET= _msg
 $(POFILE) :=	TARGET= $(POFILE)
 
-all clean clobber install lint $(POFILE): $(SUBDIRS)
-
-clobber: FRC
-	$(RM) THIRDPARTYLICENSE
+all clean install lint $(POFILE): $(SUBDIRS)
+clobber: $(SUBDIRS) clobber_local
+clobber_local:
+	$(RM) $(CLOBBERFILES)
 
 all install: THIRDPARTYLICENSE
 
diff --git a/usr/src/cmd/ssh/sshd/Makefile b/usr/src/cmd/ssh/sshd/Makefile
index bc5b60f584..a52e9b1cc8 100644
--- a/usr/src/cmd/ssh/sshd/Makefile
+++ b/usr/src/cmd/ssh/sshd/Makefile
@@ -60,10 +60,11 @@ OBJS	= sshd.o \
 	  serverloop.o \
 	  session.o \
 	  sshlogin.o \
-	  sshpty.o \
-	  ../sftp-server/sftp-server.o
+	  sshpty.o
 
-SRCS	= $(OBJS:.o=.c)
+EXTOBJS = sftp-server.o
+
+SRCS	= $(OBJS:.o=.c) ../sftp-server/sftp-server.c
 
 include ../../Makefile.cmd
 include ../Makefile.ssh-common
@@ -88,11 +89,15 @@ POFILE_DIR= ..
 
 all: $(PROG)
 
-$(PROG): $(OBJS) $(MAPFILES) ../libssh/$(MACH)/libssh.a \
+$(PROG): $(OBJS) $(EXTOBJS) $(MAPFILES) ../libssh/$(MACH)/libssh.a \
 	../libopenbsd-compat/$(MACH)/libopenbsd-compat.a
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(DYNFLAGS)
+	$(LINK.c) $(OBJS) $(EXTOBJS) -o $@ $(LDLIBS) $(DYNFLAGS)
 	$(POST_PROCESS)
 
+%.o : ../sftp-server/%.c
+	$(COMPILE.c) -o $@ $<
+	$(POST_PROCESS_O)
+
 install: all $(DIRS) $(ROOTLIBSSHPROG) $(ROOTLIBSSH)
 
 
@@ -103,7 +108,7 @@ $(DIRS):
 	$(INS.dir)
 
 clean:
-	$(RM) -f $(OBJS) $(PROG)
+	$(RM) $(OBJS) $(EXTOBJS)
 
 lint:	lint_SRCS
 
diff --git a/usr/src/cmd/th_tools/Makefile b/usr/src/cmd/th_tools/Makefile
index c57e71e622..28dd878fdb 100644
--- a/usr/src/cmd/th_tools/Makefile
+++ b/usr/src/cmd/th_tools/Makefile
@@ -43,7 +43,7 @@ th_manage := LDLIBS += -ldevice
 
 ROOTPROG = $(PROG:%=$(ROOTUSRSBIN)/%)
 
-CLOBBERFILES = $(PROG) $(SHFILE)
+CLOBBERFILES = $(PROG) $(SHFILES)
 
 $(ROOTPROG) := FILEMODE = 0555
 
@@ -52,13 +52,13 @@ $(ROOTPROG) := FILEMODE = 0555
 all: $(PROG) $(SHFILES)
 
 $(SHFILES): $(SHFILES).sh
-	-$(RM) $(SHFILES)
+	$(RM) $(SHFILES)
 	$(CP) $(SHFILES).sh $(SHFILES)
 
 install: all $(ROOTUSRSBINPROG) $(ROOTLIBSHFILES)
 
 clean:
-	$(RM) $(OBJECTS) core
+	$(RM) $(OBJECTS)
 
 lint:
 	$(LINT.c) th_define.c $(LDLIBS)
diff --git a/usr/src/cmd/tip/Makefile b/usr/src/cmd/tip/Makefile
index 0aaeb39d1e..f64b4e301c 100644
--- a/usr/src/cmd/tip/Makefile
+++ b/usr/src/cmd/tip/Makefile
@@ -67,6 +67,8 @@ CONFIG=	-DV831 -DVENTEL -DV3451 -DDF02 -DDF03 -DBIZ1031 -DBIZ1022 -DHAYES
 ACULIB=	aculib/aculib.a
 LDLIBS=	$(ACULIB) $(LDLIBS.cmd)
 
+CLOBBERFILES += $(ACULOG)
+
 # install rules
 $(ROOTACULOGD)/% : %
 	$(INS.file)
diff --git a/usr/src/cmd/tip/aculib/Makefile b/usr/src/cmd/tip/aculib/Makefile
index c31175daff..a8b7d408f6 100644
--- a/usr/src/cmd/tip/aculib/Makefile
+++ b/usr/src/cmd/tip/aculib/Makefile
@@ -40,7 +40,7 @@ $(ACULIB): $(OBJS)
 	$(AR) cr $(ACULIB) $(OBJS)
 
 clean:
-	$(RM) $(ACULIB) $(OBJS) core errs
+	$(RM) $(ACULIB) $(OBJS)
 
 lint:
 	$(LINT.c) $(OBJS:%.o=%.c) $(LDLIBS)
diff --git a/usr/src/cmd/troff/nroff.d/terms.d/Makefile b/usr/src/cmd/troff/nroff.d/terms.d/Makefile
index a0567923dd..5e43e6eb32 100644
--- a/usr/src/cmd/troff/nroff.d/terms.d/Makefile
+++ b/usr/src/cmd/troff/nroff.d/terms.d/Makefile
@@ -1,5 +1,4 @@
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
@@ -51,4 +50,7 @@ $(ROOTNTERM)/% :	%
 $(ROOTLNKFILES) :	$$(ROOTLNKDEST)
 			-$(RM) $@; $(LN) $(ROOTLNKDEST) $@
 
-clean clobber lint strip :
+clean lint strip :
+
+clobber:
+	$(RM) $(FILES)
diff --git a/usr/src/cmd/ypcmd/ypupdated/Makefile b/usr/src/cmd/ypcmd/ypupdated/Makefile
index 0fd7bf0e4c..ea5a7483ad 100644
--- a/usr/src/cmd/ypcmd/ypupdated/Makefile
+++ b/usr/src/cmd/ypcmd/ypupdated/Makefile
@@ -55,6 +55,8 @@ SRCS =			$(OBJS:%.o=%.c)
 CERRWARN +=		-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=		-_gcc=-Wno-unused-variable
 
+CLOBBERFILES += ypupdated_prot.h
+
 #conditional assignments
 $(INETSVC)   := FILEMODE=555
 
diff --git a/usr/src/cmd/zdb/Makefile.com b/usr/src/cmd/zdb/Makefile.com
index 353eb61018..b538d38335 100644
--- a/usr/src/cmd/zdb/Makefile.com
+++ b/usr/src/cmd/zdb/Makefile.com
@@ -60,6 +60,7 @@ $(PROG): $(OBJS)
 	$(POST_PROCESS)
 
 clean:
+	$(RM) $(OBJS)
 
 lint:	lint_SRCS
 
diff --git a/usr/src/cmd/zhack/Makefile.com b/usr/src/cmd/zhack/Makefile.com
index d691fd4929..67927083c4 100644
--- a/usr/src/cmd/zhack/Makefile.com
+++ b/usr/src/cmd/zhack/Makefile.com
@@ -57,6 +57,7 @@ $(PROG): $(OBJS)
 	$(POST_PROCESS)
 
 clean:
+	$(RM) $(OBJS)
 
 lint:	lint_SRCS
 
diff --git a/usr/src/cmd/zic/Makefile b/usr/src/cmd/zic/Makefile
index a2ffc86536..43a2db0ba0 100644
--- a/usr/src/cmd/zic/Makefile
+++ b/usr/src/cmd/zic/Makefile
@@ -50,6 +50,9 @@ POFILES3=$(TABFILES)
 TEXT_DOMAIN2=SUNW_OST_ZONEINFO
 MSGDOMAIN2=$(MSGROOT)/$(TEXT_DOMAIN2)
 
+# NB: $(POFILE2) is under SCM.
+CLOBBERFILES += $(POFILE) $(POFILE3)
+
 .KEEP_STATE:
 
 all: $(PROG) $(NPROG) $(KSHPROG)
@@ -58,7 +61,8 @@ $(PROG): $(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
 
-install: all $(DIRS) $(ROOTTZSRCD) $(ROOTTZTABD) $(ROOTUSRSBINPROG) $(ROOTLIBTZSRCFILES) $(ROOTLIBTZTABFILES) $(ROOTKSHPROG)
+install: all $(DIRS) $(ROOTTZSRCD) $(ROOTTZTABD) $(ROOTUSRSBINPROG) \
+		$(ROOTLIBTZSRCFILES) $(ROOTLIBTZTABFILES) $(ROOTKSHPROG)
 	$(NPROG) -d $(ROOTTZD) $(TZFILES)
 
 $(NPROG): $(NATIVE) $(NOBJS)
diff --git a/usr/src/cmd/zinject/Makefile.com b/usr/src/cmd/zinject/Makefile.com
index 3a094ba196..76d297937f 100644
--- a/usr/src/cmd/zinject/Makefile.com
+++ b/usr/src/cmd/zinject/Makefile.com
@@ -51,6 +51,7 @@ $(PROG): $(OBJS)
 	$(POST_PROCESS)
 
 clean:
+	$(RM) $(OBJS)
 
 lint:	lint_SRCS
 
diff --git a/usr/src/cmd/zonecfg/Makefile b/usr/src/cmd/zonecfg/Makefile
index f1de4ac512..ae8f5c11d1 100644
--- a/usr/src/cmd/zonecfg/Makefile
+++ b/usr/src/cmd/zonecfg/Makefile
@@ -46,6 +46,8 @@ CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+CLOBBERFILES += $(PROG).ln
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/ztest/Makefile.com b/usr/src/cmd/ztest/Makefile.com
index 6126853ba0..360ebb2bde 100644
--- a/usr/src/cmd/ztest/Makefile.com
+++ b/usr/src/cmd/ztest/Makefile.com
@@ -57,6 +57,7 @@ $(PROG): $(OBJS)
 	$(POST_PROCESS)
 
 clean:
+	$(RM) $(OBJS)
 
 lint:	lint_SRCS
 
diff --git a/usr/src/common/mapfiles/Makefile b/usr/src/common/mapfiles/Makefile
index 83550322c0..948d92f0b6 100644
--- a/usr/src/common/mapfiles/Makefile
+++ b/usr/src/common/mapfiles/Makefile
@@ -23,8 +23,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include		$(SRC)/Makefile.master
 
@@ -40,12 +38,14 @@ package:=	TARGET= package
 
 .KEEP_STATE:
 
-clean clobber lint package:
-
 all:		gen
 
 install:	$(SUBDIRS)
 
+clean lint package:
+
+clobber:	gen
+
 $(SUBDIRS):	FRC
 		@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/brand/shared/brand/Makefile.com b/usr/src/lib/brand/shared/brand/Makefile.com
index de2decae37..7d9a4ee554 100644
--- a/usr/src/lib/brand/shared/brand/Makefile.com
+++ b/usr/src/lib/brand/shared/brand/Makefile.com
@@ -21,6 +21,8 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+#
 
 COBJS =		brand_util.o
 ASOBJS =	crt.o handler.o runexe.o
@@ -57,14 +59,18 @@ ASFLAGS =	-P $(ASFLAGS_$(CURTYPE)) -D_ASM -I. -I../sys
 # build the offset header before trying to compile any files.  (it's included
 # by brand_misc.h, so it's needed for all objects, not just assembly ones.)
 #
-all: $(OFFSETS_H) pics .WAIT $(PICS)
+# Note we have to build assym.h via its dependency on pics/% so that the
+# target dependent assignment of CTF_FLAGS will be there, otherwise make
+# will see two different commands to build it (endless rebuilds).
+#
+all: pics .WAIT $$(PICS)
 
 lint: lintcheck
 
 $(OBJECTS:%=pics/%): $(OFFSETS_H)
 
 $(OFFSETS_H): $(OFFSETS_SRC)
-	$(OFFSETS_CREATE) $(CTF_FLAGS) < $(OFFSETS_SRC) >$@
+	$(OFFSETS_CREATE) < $(OFFSETS_SRC) >$@
 
 pics/%.o: $(ISASRCDIR)/%.s
 	$(COMPILE.s) -o $@ $<
diff --git a/usr/src/lib/brand/shared/zone/Makefile b/usr/src/lib/brand/shared/zone/Makefile
index 9a768d62dd..cede2f17b5 100644
--- a/usr/src/lib/brand/shared/zone/Makefile
+++ b/usr/src/lib/brand/shared/zone/Makefile
@@ -25,7 +25,6 @@
 
 PROG=query
 SHARED=	common.ksh query uninstall.ksh
-CLOBBERFILES= query
 
 include $(SRC)/cmd/Makefile.cmd
 include ../../Makefile.brand
@@ -33,8 +32,6 @@ include ../../Makefile.brand
 $(ROOTSHAREDDIR)/common.ksh := FILEMODE = 0444
 $(ROOTSHAREDDIR)/uninstall.ksh := FILEMODE = 0444
 
-CLOBBERFILES=	$(ROOTSHARED) $(PROG)
-
 POFILES=	common.po query.po uninstall.po
 POFILE=		shared.po
 
@@ -47,7 +44,6 @@ all: $(PROG)
 install: $(ROOTSHARED)
 
 clean:
-	-$(RM) $(PROG) $(POFILES)
 
 lint:
 
diff --git a/usr/src/lib/brand/solaris10/s10_support/Makefile b/usr/src/lib/brand/solaris10/s10_support/Makefile
index de3402ee31..0c3015084f 100644
--- a/usr/src/lib/brand/solaris10/s10_support/Makefile
+++ b/usr/src/lib/brand/solaris10/s10_support/Makefile
@@ -34,7 +34,6 @@ include $(SRC)/cmd/Makefile.cmd
 
 # override the install directory
 ROOTBIN =	$(ROOTBRANDDIR)
-CLOBBERFILES =	$(OBJS) $(ROOTPROGS)
 
 UTSBASE =	$(SRC)/uts
 
@@ -47,7 +46,7 @@ LDLIBS +=	-lzonecfg
 install:	all $(ROOTPROGS)
 
 clean:
-		$(RM) $(PROG) $(OBJS)
+		$(RM) $(OBJS)
 
 lint:		lint_PROG
 
diff --git a/usr/src/lib/cfgadm_plugins/Makefile b/usr/src/lib/cfgadm_plugins/Makefile
index 465b417ab0..00d258b20a 100644
--- a/usr/src/lib/cfgadm_plugins/Makefile
+++ b/usr/src/lib/cfgadm_plugins/Makefile
@@ -46,11 +46,11 @@ _msg:=		TARGET= _msg
 
 .KEEP_STATE:
 
-all clean clobber lint: $(SUBDIRS)
+all clean lint: $(SUBDIRS)
 
 install: all $(SUBDIRS)
 
-_msg: $(MSGSUBDIRS)
+_msg clobber: $(MSGSUBDIRS)
 
 $(ALL_SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/cfgadm_plugins/Makefile.com b/usr/src/lib/cfgadm_plugins/Makefile.com
index 21dea666a6..d6f4bf6782 100644
--- a/usr/src/lib/cfgadm_plugins/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/Makefile.com
@@ -70,6 +70,8 @@ LINKED_CFG_DIRS		= $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/cfgadm)
 
 INS.slink6=	$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@
 
+CLOBBERFILES += $(LIBRARY:.a=.po) generic.po
+
 $(LINKED_DIRS):		$(USR_PLAT_DIR)
 	-$(INS.dir)
 
diff --git a/usr/src/lib/cfgadm_plugins/ac/Makefile b/usr/src/lib/cfgadm_plugins/ac/Makefile
index 95e242d6c6..a12d1f6b36 100644
--- a/usr/src/lib/cfgadm_plugins/ac/Makefile
+++ b/usr/src/lib/cfgadm_plugins/ac/Makefile
@@ -27,7 +27,8 @@
 
 include		$(SRC)/Makefile.master
 
-SUBDIRS=	$(MACH) $(BUILD64) $(MACH64)
+SUBDIRS=
+$(SPARC_BLD)SUBDIRS=	$(MACH) $(BUILD64) $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -49,7 +50,9 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber delete install lint catalog package: $(SUBDIRS)
+all clean delete install lint catalog package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(POFILES)
 
 $(MACH) $(MACH64):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/cfgadm_plugins/fp/Makefile b/usr/src/lib/cfgadm_plugins/fp/Makefile
index 22bf6ff9df..ad6dff9a56 100644
--- a/usr/src/lib/cfgadm_plugins/fp/Makefile
+++ b/usr/src/lib/cfgadm_plugins/fp/Makefile
@@ -49,7 +49,9 @@ CP=	cp
 
 .KEEP_STATE:
 
-all lint clean clobber delete install package: $(SUBDIRS)
+all lint clean delete install package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(POFILES)
 
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
@@ -69,5 +71,3 @@ $(POFILES):
 	$(RM) messages.po
 
 FRC:
-
-include	../../Makefile.targ
diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile b/usr/src/lib/cfgadm_plugins/ib/Makefile
index 542c3fb066..b73c5c7610 100644
--- a/usr/src/lib/cfgadm_plugins/ib/Makefile
+++ b/usr/src/lib/cfgadm_plugins/ib/Makefile
@@ -48,7 +48,9 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber delete install lint package: $(SUBDIRS)
+all clean delete install lint package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(POFILES)
 
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile b/usr/src/lib/cfgadm_plugins/pci/Makefile
index b16a8f9450..fee3e0b482 100644
--- a/usr/src/lib/cfgadm_plugins/pci/Makefile
+++ b/usr/src/lib/cfgadm_plugins/pci/Makefile
@@ -48,7 +48,9 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber delete install lint package: $(SUBDIRS)
+all clean delete install lint package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(POFILES)
 
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile b/usr/src/lib/cfgadm_plugins/sata/Makefile
index 5f9f32c9e8..bf06374ab2 100644
--- a/usr/src/lib/cfgadm_plugins/sata/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sata/Makefile
@@ -48,7 +48,9 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber delete install lint package: $(SUBDIRS)
+all clean delete install lint package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(POFILES)
 
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile b/usr/src/lib/cfgadm_plugins/sbd/Makefile
index 2862630511..bd7c451e96 100644
--- a/usr/src/lib/cfgadm_plugins/sbd/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile
@@ -49,7 +49,9 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber delete install lint package: $(SUBDIRS)
+all clean delete install lint package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(POFILES)
 
 $(MACH) $(MACH64):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
index b3d7040f9c..8e6083ac46 100644
--- a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
@@ -84,6 +84,8 @@ $(USR_PSM_LIB_CFG_DIR)/%: % $(USR_PSM_LIB_CFG_DIR)
 $(USR_PSM_LIB_CFG_DIR_64)/%: % $(USR_PSM_LIB_CFG_DIR_64)
 	-$(INS.file)
 
+CLOBBERFILES += ../common/ap_err.c sbdgenerr $(GENERR)
+
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile b/usr/src/lib/cfgadm_plugins/scsi/Makefile
index cb93c53c20..9b832a5972 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile
@@ -49,7 +49,9 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber delete install lint package: $(SUBDIRS)
+all clean delete install lint package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(POFILES)
 
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/cfgadm_plugins/shp/Makefile b/usr/src/lib/cfgadm_plugins/shp/Makefile
index dfb0481783..416ab9dfcf 100644
--- a/usr/src/lib/cfgadm_plugins/shp/Makefile
+++ b/usr/src/lib/cfgadm_plugins/shp/Makefile
@@ -48,7 +48,9 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber delete install lint package: $(SUBDIRS)
+all clean delete install lint package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(POFILES)
 
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile
index 7be087cc2e..a71d4d781b 100644
--- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile
@@ -27,7 +27,8 @@
 
 include		$(SRC)/Makefile.master
 
-SUBDIRS=	$(MACH) $(BUILD64) $(MACH64)
+SUBDIRS=
+$(SPARC_BLD)SUBDIRS=	$(MACH) $(BUILD64) $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -48,7 +49,9 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber delete install lint package: $(SUBDIRS)
+all clean delete install lint package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(POFILES)
 
 $(MACH) $(MACH64):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile b/usr/src/lib/cfgadm_plugins/usb/Makefile
index 981437b77e..2e0731182d 100644
--- a/usr/src/lib/cfgadm_plugins/usb/Makefile
+++ b/usr/src/lib/cfgadm_plugins/usb/Makefile
@@ -48,7 +48,9 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber delete install lint package: $(SUBDIRS)
+all clean delete install lint package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(POFILES)
 
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/fm/topo/maps/Makefile.map b/usr/src/lib/fm/topo/maps/Makefile.map
index b72cd29d74..adfff59002 100644
--- a/usr/src/lib/fm/topo/maps/Makefile.map
+++ b/usr/src/lib/fm/topo/maps/Makefile.map
@@ -23,7 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 .KEEP_STATE:
 .SUFFIXES:
@@ -68,6 +67,7 @@ clean:
 	$(RM) $(TEMPTOPOFILE)
 
 clobber: clean
+	$(RM) $(CLOBBERFILES)
 
 check: $(CHECKHDRS)
 
diff --git a/usr/src/lib/fm/topo/maps/SUNW,Netra-X4200-M2/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Netra-X4200-M2/Makefile
index 1a84db38f4..63030527e4 100644
--- a/usr/src/lib/fm/topo/maps/SUNW,Netra-X4200-M2/Makefile
+++ b/usr/src/lib/fm/topo/maps/SUNW,Netra-X4200-M2/Makefile
@@ -37,4 +37,6 @@ SRCDIR = ../SUNW,Netra-X4200-M2
 PLATFORM = Netra-X4200-M2
 TOPOBASE = ../i86pc/i86pc-hc-topology.xml
 
+CLOBBERFILES = $(TOPOFILE)
+
 include ../Makefile.map
diff --git a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-M2/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-M2/Makefile
index 5c46801512..072d396f4f 100644
--- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-M2/Makefile
+++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-M2/Makefile
@@ -23,7 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 # NOTE: The name of the xml file we are building is 'platform'
 # specific, but its build is structured as 'arch' specific since
@@ -38,4 +37,6 @@ SRCDIR = ../SUNW,Sun-Fire-X4200-M2
 PLATFORM = Sun-Fire-X4200-M2
 TOPOBASE = ../i86pc/i86pc-hc-topology.xml
 
+CLOBBERFILES = $(TOPOFILE)
+
 include ../Makefile.map
diff --git a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-Server/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-Server/Makefile
index 0bfb5dc315..3d0548b57b 100644
--- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-Server/Makefile
+++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-Server/Makefile
@@ -23,7 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 # NOTE: The name of the xml file we are building is 'platform'
 # specific, but its build is structured as 'arch' specific since
@@ -38,4 +37,6 @@ SRCDIR = ../SUNW,Sun-Fire-X4200-Server
 PLATFORM = Sun-Fire-X4200
 TOPOBASE = ../i86pc/i86pc-hc-topology.xml
 
+CLOBBERFILES = $(TOPOFILE)
+
 include ../Makefile.map
diff --git a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4500/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4500/Makefile
index bdf763ffdb..5a21f4d313 100644
--- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4500/Makefile
+++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4500/Makefile
@@ -23,7 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 # NOTE: The name of the xml file we are building is 'platform'
 # specific, but its build is structured as 'arch' specific since
@@ -38,4 +37,6 @@ SRCDIR = ../SUNW,Sun-Fire-X4500
 PLATFORM = Sun-Fire-X4500
 TOPOBASE = ../i86pc/i86pc-hc-topology.xml
 
+CLOBBERFILES = $(TOPOFILE)
+
 include ../Makefile.map
diff --git a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile
index bb8668635a..6a8255e366 100644
--- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile
+++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile
@@ -23,7 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 # NOTE: The name of the xml file we are building is 'platform'
 # specific, but its build is structured as 'arch' specific since
@@ -38,4 +37,6 @@ SRCDIR = ../SUNW,Sun-Fire-X4540
 PLATFORM = Sun-Fire-X4540
 TOPOBASE = ../i86pc/i86pc-hc-topology.xml
 
+CLOBBERFILES = $(TOPOFILE)
+
 include ../Makefile.map
diff --git a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4600-M2/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4600-M2/Makefile
index dae8fed240..e7b09b9631 100644
--- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4600-M2/Makefile
+++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4600-M2/Makefile
@@ -37,4 +37,6 @@ SRCDIR = ../SUNW,Sun-Fire-X4600-M2
 PLATFORM = Sun-Fire-X4600-M2
 TOPOBASE = ../i86pc/i86pc-hc-topology.xml
 
+CLOBBERFILES = $(TOPOFILE)
+
 include ../Makefile.map
diff --git a/usr/src/lib/fm/topo/maps/i86pc/Makefile b/usr/src/lib/fm/topo/maps/i86pc/Makefile
index 4e9475b546..742c4ac9e7 100644
--- a/usr/src/lib/fm/topo/maps/i86pc/Makefile
+++ b/usr/src/lib/fm/topo/maps/i86pc/Makefile
@@ -34,4 +34,6 @@ SRCDIR = ../i86pc
 PLATFORM = unused
 TOPOBASE = i86pc-hc-topology.xml
 
+CLOBBERFILES = fan-hc-topology.xml
+
 include ../Makefile.map
diff --git a/usr/src/lib/fm/topo/modules/Makefile.plugin b/usr/src/lib/fm/topo/modules/Makefile.plugin
index d67acbfe7d..7eef744f46 100644
--- a/usr/src/lib/fm/topo/modules/Makefile.plugin
+++ b/usr/src/lib/fm/topo/modules/Makefile.plugin
@@ -100,7 +100,7 @@ clean:
 	$(RM) $(OBJS) $(LINTFILES) $(CLEANFILES)
 
 clobber: clean
-	$(RM) $(PROG)
+	$(RM) $(PROG) $(CLOBBERFILES)
 
 %.ln: ../../common/$(MODULE)/%.c
 	$(LINT.c) -c $<
diff --git a/usr/src/lib/fm/topo/modules/common/ses/Makefile b/usr/src/lib/fm/topo/modules/common/ses/Makefile
index 49f23b770a..578b5bf493 100644
--- a/usr/src/lib/fm/topo/modules/common/ses/Makefile
+++ b/usr/src/lib/fm/topo/modules/common/ses/Makefile
@@ -35,3 +35,5 @@ CPPFLAGS += -I../disk
 
 LDLIBS += -L$(ROOTLIBDIR)/scsi -R/usr/lib/scsi -lses
 LDLIBS += -ldevinfo -ldevid -ldiskstatus -lcontract -lsysevent
+
+CLOBBERFILES += disk_common.ln
diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
index 05961e3a1e..3d41bd6a10 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
@@ -564,6 +564,9 @@ kwarnd_handle.c: $(SRC)/cmd/krb5/kwarn/kwarnd_handle.c
 	$(RM) $@
 	$(CP) $(SRC)/cmd/krb5/kwarn/kwarnd_handle.c $@
 
+CLOBBERFILES += kwarnd.h \
+	kwarnd_clnt.c kwarnd_clnt_stubs.c kwarnd_handle.c kwarnd_xdr.c
+
 # So lint.out won't be needlessly recreated
 lint: $(LINTOUT)
 
diff --git a/usr/src/lib/krb5/kadm5/clnt/Makefile b/usr/src/lib/krb5/kadm5/clnt/Makefile
index 33fba4fea2..ee930293f6 100644
--- a/usr/src/lib/krb5/kadm5/clnt/Makefile
+++ b/usr/src/lib/krb5/kadm5/clnt/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include		../../Makefile.lib
 
@@ -42,7 +40,9 @@ POFILES=	generic.po
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
+all clean install lint: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(CLOBBERFILES)
 
 _msg: $(MSGDOMAIN) .WAIT $(POFILE)
 	$(RM) $(MSGDOMAIN)/$(POFILE)
diff --git a/usr/src/lib/krb5/ss/Makefile b/usr/src/lib/krb5/ss/Makefile
index ce3bb2203d..06dbca35d3 100644
--- a/usr/src/lib/krb5/ss/Makefile
+++ b/usr/src/lib/krb5/ss/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include		../Makefile.lib
 
@@ -42,7 +40,9 @@ POFILES = generic.po
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
+all clean install lint: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(CLOBBERFILES)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libbe/Makefile.com b/usr/src/lib/libbe/Makefile.com
index 013d2bdc37..b71a0f85b5 100644
--- a/usr/src/lib/libbe/Makefile.com
+++ b/usr/src/lib/libbe/Makefile.com
@@ -56,6 +56,8 @@ CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-address
 
+CLOBBERFILES += $(LIBRARY)
+
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile
index 93934954dd..75a6406779 100644
--- a/usr/src/lib/libc/Makefile
+++ b/usr/src/lib/libc/Makefile
@@ -108,6 +108,8 @@ BASEHDRS=	getxby_door.h
 CHECKHDRS=	$(BASEHDRS:%.h=port/gen/%.check)
 HDRS=		$(BASEHDRS)
 
+CLOBBERFILES += THIRDPARTYLICENSE extract-copyright
+
 # install rules for install_h target
 $(ROOTHDRDIR)/%: port/gen/%
 	$(INS.file)
@@ -237,7 +239,10 @@ lint	:=	TARGET= lint
 $(SUBDIRS): FRC
 	@cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET)
 
-clean clobber: $(SUBDIRS)
+clean: $(SUBDIRS)
+clobber: $(SUBDIRS) etc clobber_local
+clobber_local:
+	$(RM) $(CLOBBERFILES)
 
 lint: $(SUBDIRS)
 
diff --git a/usr/src/lib/libcurses/Makefile b/usr/src/lib/libcurses/Makefile
index a1b04c3e9f..9e88e23114 100644
--- a/usr/src/lib/libcurses/Makefile
+++ b/usr/src/lib/libcurses/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include	../Makefile.lib
 
@@ -115,6 +113,11 @@ screen/tmp:
 	rm -rf $@
 	mkdir $@
 
+CLEANFILES += \
+	screen/tmp/keycaps \
+	screen/tmp/term.h.new1 \
+	screen/tmp/term.h.new2
+
 _msg:	$(MSGDOMAIN) .WAIT $(POFILE)
 	$(RM) $(MSGDOMAIN)/$(POFILE)
 	$(CP) $(POFILE) $(MSGDOMAIN)
diff --git a/usr/src/lib/libdns_sd/Makefile b/usr/src/lib/libdns_sd/Makefile
index 21a4e1aa1d..5e33bde9f9 100644
--- a/usr/src/lib/libdns_sd/Makefile
+++ b/usr/src/lib/libdns_sd/Makefile
@@ -21,7 +21,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 include ../Makefile.lib
 
@@ -40,7 +39,7 @@ lint	:= 	TARGET = lint
 
 all install: install_h $(SUBDIRS) .WAIT java
 
-clean clobber: $(SUBDIRS)
+clean clobber: $(SUBDIRS) java
 
 ROOTHDRDIR=	$(ROOT)/usr/include
 ROOTHDRS=	$(HDR:%=$(ROOTHDRDIR)/%)
diff --git a/usr/src/lib/libdtrace/Makefile.com b/usr/src/lib/libdtrace/Makefile.com
index 8952f8db06..071e9f22b8 100644
--- a/usr/src/lib/libdtrace/Makefile.com
+++ b/usr/src/lib/libdtrace/Makefile.com
@@ -117,8 +117,9 @@ CLEANFILES += ../common/dt_errtags.c ../common/dt_names.c
 CLEANFILES += ../common/sysevent.sed ../common/sysevent.d
 CLEANFILES += ../common/tcp.sed ../common/tcp.d
 CLEANFILES += ../common/udp.sed ../common/udp.d
+CLEANFILES += $(LIBDAUDITOBJS) $(DRTIOBJS)
 
-CLOBBERFILES += drti.o
+CLOBBERFILES += $(LIBDAUDIT) drti.o
 
 CPPFLAGS += -I../common -I.
 CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
diff --git a/usr/src/lib/libfsmgt/Makefile.com b/usr/src/lib/libfsmgt/Makefile.com
index c265c052dd..c9143741ac 100644
--- a/usr/src/lib/libfsmgt/Makefile.com
+++ b/usr/src/lib/libfsmgt/Makefile.com
@@ -54,6 +54,10 @@ CPPFLAGS +=	-D_REENTRANT -I$(SRC)/lib/libfsmgt/common \
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
+CLOBBERFILES	+= $(SRCDIR)/nfs_sec.c
+CLOBBERFILES	+= $(SRCDIR)/replica.c
+CLOBBERFILES	+= $(SRCDIR)/sharetab.c
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libldap5/Makefile b/usr/src/lib/libldap5/Makefile
index 096d63a199..e5de491a1f 100644
--- a/usr/src/lib/libldap5/Makefile
+++ b/usr/src/lib/libldap5/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include			../Makefile.lib
 
@@ -45,7 +43,9 @@ POFILES=        generic.po
 
 .KEEP_STATE:
 
-all clean clobber install: $(SUBDIRS)
+all clean install: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(CLOBBERFILES)
 
 lint:
 	@ $(ECHO) "usr/src/lib/libldap5 is third-party code that"
diff --git a/usr/src/lib/libntfs/Makefile b/usr/src/lib/libntfs/Makefile
index bf44b58cb9..67cdafcfff 100644
--- a/usr/src/lib/libntfs/Makefile
+++ b/usr/src/lib/libntfs/Makefile
@@ -46,7 +46,9 @@ GREP=	grep
 
 .KEEP_STATE:
 
-all clean clobber delete install package: $(SUBDIRS)
+all clean delete install package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(CLOBBERFILES)
 
 all install: THIRDPARTYLICENSE
 
diff --git a/usr/src/lib/libresolv2/include/Makefile b/usr/src/lib/libresolv2/include/Makefile
index 8bff3c3188..b7271c0617 100644
--- a/usr/src/lib/libresolv2/include/Makefile
+++ b/usr/src/lib/libresolv2/include/Makefile
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include		../../../Makefile.master
 
@@ -46,6 +44,7 @@ clean:
 	$(RM) $(HDRS) $(TMPHDRS)
 
 clobber: clean
+	$(RM) make_os_version probe_ipv6
 
 # os_version.h and port_ipv6.h should be rebuilt when you change OS
 # revision. Since that's not easily expressed as a dependency, we
diff --git a/usr/src/lib/libsec/Makefile.com b/usr/src/lib/libsec/Makefile.com
index 1f83f66516..6a30ddf56a 100644
--- a/usr/src/lib/libsec/Makefile.com
+++ b/usr/src/lib/libsec/Makefile.com
@@ -51,6 +51,8 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-unused-variable
 
+CLOBBERFILES += acl.output
+
 # install this library in the root filesystem
 include ../../Makefile.rootfs
 
diff --git a/usr/src/lib/libshell/Makefile.doc b/usr/src/lib/libshell/Makefile.doc
index 07118f7459..c822b0bf5c 100644
--- a/usr/src/lib/libshell/Makefile.doc
+++ b/usr/src/lib/libshell/Makefile.doc
@@ -78,6 +78,8 @@ $(ROOTDOCDIRBASE)/%.html: misc/%.docbook
 	$(INS) -s -m $(FILEMODE) -f "$(@D)" "$(@F)"
 	$(RM) "$(@F)"
 
+CLOBBERFILES += xsltproc.log
+
 # Generic documentation rules
 DOCFILESRCDIR=         common
 ROOTDOCFILES=  $(DOCFILES:%=$(ROOTDOCDIRBASE)/%)
diff --git a/usr/src/lib/libsldap/Makefile b/usr/src/lib/libsldap/Makefile
index 3447306dd1..64525df111 100644
--- a/usr/src/lib/libsldap/Makefile
+++ b/usr/src/lib/libsldap/Makefile
@@ -46,7 +46,9 @@ POFILES=	generic.po
 
 .KEEP_STATE:
 
-all clean clobber delete install lint catalog package: $(SUBDIRS)
+all clean delete install lint catalog package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(POFILES)
 
 # install rule for install_h target
 $(ROOTHDRDIR)/%: %
diff --git a/usr/src/lib/libuutil/Makefile b/usr/src/lib/libuutil/Makefile
index 9f9e3c2f06..b8421c51f5 100644
--- a/usr/src/lib/libuutil/Makefile
+++ b/usr/src/lib/libuutil/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # We build a native version of libuutil.so.1 in the "native" subdirectory.
@@ -67,7 +65,7 @@ check:		$(CHECKHDRS)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-naive $(SUBDIRS): FRC
+native $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libuutil/Makefile.com b/usr/src/lib/libuutil/Makefile.com
index ce20a81894..73b1dcddb9 100644
--- a/usr/src/lib/libuutil/Makefile.com
+++ b/usr/src/lib/libuutil/Makefile.com
@@ -60,6 +60,7 @@ SRCS =	\
 	../common/uu_strtoint.c
 
 LINTS =		$(OBJECTS:%.o=%.ln)
+CLOBBERFILES += $(LINTS)
 
 SRCDIR =	../common
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/libuutil/native/Makefile b/usr/src/lib/libuutil/native/Makefile
index c74d06cd9f..8f30530f51 100644
--- a/usr/src/lib/libuutil/native/Makefile
+++ b/usr/src/lib/libuutil/native/Makefile
@@ -23,8 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 NOT_NATIVE = $(POUND_SIGN)		# tell Makefile.com we're native
 
@@ -41,7 +39,7 @@ LDLIBS =	$(MY_NATIVE_LDLIBS)
 # We must use the build's avl headers, to match the common avl.c
 #
 AVLHEADERS = sys/avl.h sys/avl_impl.h
-CLOBBERFILES += $(AVLHEADERS)
+CLOBBERFILES += $(AVLHEADERS) $(LIBS)
 
 all: $(LIBS)
 
diff --git a/usr/src/lib/libwanbootutil/Makefile b/usr/src/lib/libwanbootutil/Makefile
index 235b47827d..2899af6623 100644
--- a/usr/src/lib/libwanbootutil/Makefile
+++ b/usr/src/lib/libwanbootutil/Makefile
@@ -94,6 +94,8 @@ common/key_xdr.c:	common/key_xdr.x
 common/key_xdr.h:	common/key_xdr.x
 		cd common; $(RPCGEN) -h -o key_xdr.h key_xdr.x; cd ..
 
+CLOBBERFILES += common/key_xdr.c common/key_xdr.h
+
 include $(SRC)/Makefile.msg.targ
 include $(SRC)/lib/Makefile.targ
 
diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com
index cf6b1e4017..da5da5d936 100644
--- a/usr/src/lib/libzpool/Makefile.com
+++ b/usr/src/lib/libzpool/Makefile.com
@@ -54,6 +54,7 @@ INCS += -I../../../common/zfs
 INCS += -I../../../common
 
 CLEANFILES += ../common/zfs.h
+CLEANFILES += $(EXTPICS)
 
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 $(LINTLIB): ../common/zfs.h
diff --git a/usr/src/lib/madv/Makefile b/usr/src/lib/madv/Makefile
index 1eca4099b0..06e5b257bb 100644
--- a/usr/src/lib/madv/Makefile
+++ b/usr/src/lib/madv/Makefile
@@ -23,8 +23,6 @@
 # Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include	../Makefile.lib
 
@@ -41,7 +39,9 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean lint: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE)
 
 $(POFILE):	pofile_MSGFILES
 
diff --git a/usr/src/lib/mpss/Makefile b/usr/src/lib/mpss/Makefile
index 960b35a481..013fdb01e6 100644
--- a/usr/src/lib/mpss/Makefile
+++ b/usr/src/lib/mpss/Makefile
@@ -23,8 +23,6 @@
 # Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include	../Makefile.lib
 
@@ -41,7 +39,9 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean lint: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE)
 
 $(POFILE):	pofile_MSGFILES
 
diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
index 323f311dec..020051c977 100644
--- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
@@ -87,6 +87,8 @@ LINTSRC= $(OBJECTS:%.o=$(SRCDIR)/%.c)
 $(LINTLIB):=	SRCS	=	$(SRCDIR)/$(LINTSRC)
 LINTSRC= $(SRCS)
 
+CLOBBERFILES += C.ln
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/print/libpapi-lpd/Makefile.com b/usr/src/lib/print/libpapi-lpd/Makefile.com
index c50fd8b223..9c0a8af8df 100644
--- a/usr/src/lib/print/libpapi-lpd/Makefile.com
+++ b/usr/src/lib/print/libpapi-lpd/Makefile.com
@@ -55,6 +55,8 @@ MAPFILES =	$(SRCDIR)/mapfile
 
 LDLIBS +=	-lc
 
+CLOBBERFILES += $(PROG)
+
 .KEEP_STATE:
 
 all:	$(LIBS) $(PROG)
diff --git a/usr/src/lib/pysolaris/Makefile b/usr/src/lib/pysolaris/Makefile
index f0c18328ce..7c018260b7 100644
--- a/usr/src/lib/pysolaris/Makefile
+++ b/usr/src/lib/pysolaris/Makefile
@@ -35,12 +35,17 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 lint :=		TARGET= lint
 
-MSGFILES =	`$(FIND) . -name '*.py' -o -name '*.c'`
+MSGFIND =	$(FIND) . -name '*.py' -o -name '*.c'
+MSGFILES =	$(MSGFIND:sh)
+PYCFIND =	$(FIND) . -name '*.pyc'
+PYCFILES = 	$(PYCFIND:sh)
 POFILE =	pysolaris.po
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean lint: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(PYCFILES)
 
 $(POFILE):	pofile_MSGFILES
 
diff --git a/usr/src/lib/pyzfs/Makefile b/usr/src/lib/pyzfs/Makefile
index c39ef5b9c7..c69270f58f 100644
--- a/usr/src/lib/pyzfs/Makefile
+++ b/usr/src/lib/pyzfs/Makefile
@@ -35,12 +35,17 @@ clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 lint :=		TARGET= lint
 
-MSGFILES =	`$(FIND) . -name '*.py' -o -name '*.c'`
+MSGFIND =	$(FIND) . -name '*.py' -o -name '*.c'
+MSGFILES =	$(MSGFIND:sh)
+PYCFIND =	$(FIND) . -name '*.pyc'
+PYCFILES = 	$(PYCFIND:sh)
 POFILE =	pyzfs.po
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean lint: $(SUBDIRS)
+clobber: $(SUBDIRS)
+	$(RM) $(POFILE) $(PYCFILES)
 
 $(POFILE):	pofile_MSGFILES
 
diff --git a/usr/src/msg/Makefile b/usr/src/msg/Makefile
index e605ef0f97..03e42fc344 100644
--- a/usr/src/msg/Makefile
+++ b/usr/src/msg/Makefile
@@ -64,6 +64,9 @@ all: $(MSGDIRFILES)
 
 install: all _msg
 
+clobber:
+	$(RM) $(MSGDIRFILES_REMOTE)
+
 #
 # The _msg target gathers the output of the top-level _msg target into
 # text-domain-specific message files under the ROOTMSGDIR for packaging.
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index 3dc5b74de4..3514e03cb3 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -205,7 +205,8 @@ PKGDEP_INCORP= \
 # All packaging build products should go into $(PDIR), so they don't
 # need to be included separately in CLOBBERFILES.
 #
-CLOBBERFILES= $(PDIR) proto_list_$(PKGMACH)
+CLOBBERFILES= $(PDIR) proto_list_$(PKGMACH) install-$(PKGMACH).out \
+	license-list
 
 #
 # By default, PKGS will list all manifests.  To build and/or publish a
diff --git a/usr/src/psm/stand/lib/boot/sparc/Makefile.com b/usr/src/psm/stand/lib/boot/sparc/Makefile.com
index d7b224b644..054c02d051 100644
--- a/usr/src/psm/stand/lib/boot/sparc/Makefile.com
+++ b/usr/src/psm/stand/lib/boot/sparc/Makefile.com
@@ -22,7 +22,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # psm/stand/lib/boot/sparc/Makefile.com
 #
@@ -79,7 +78,7 @@ clean:
 	$(RM) $(OBJS) $(L_OBJS)
 
 clobber: clean
-	$(RM) $(LIBBOOT) $(LINTLIBBOOT) a.out core
+	$(RM) $(LIBBOOT) $(LINTLIBBOOT)
 
 $(LIBBOOT): $(OBJSDIR) .WAIT $(OBJS)
 	$(BUILD.AR) $(OBJS)
diff --git a/usr/src/psm/stand/lib/boot/sparcv9/Makefile.com b/usr/src/psm/stand/lib/boot/sparcv9/Makefile.com
index 7f8dcdd49f..28a5e4cdd8 100644
--- a/usr/src/psm/stand/lib/boot/sparcv9/Makefile.com
+++ b/usr/src/psm/stand/lib/boot/sparcv9/Makefile.com
@@ -19,8 +19,6 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -79,7 +77,7 @@ clean:
 	$(RM) $(OBJS) $(L_OBJS)
 
 clobber: clean
-	$(RM) $(LIBBOOT) $(LINTLIBBOOT) a.out core
+	$(RM) $(LIBBOOT) $(LINTLIBBOOT)
 
 $(LIBBOOT): $(OBJSDIR) .WAIT $(OBJS)
 	$(BUILD.AR) $(OBJS)
diff --git a/usr/src/psm/stand/lib/names/sparcv9/Makefile.com b/usr/src/psm/stand/lib/names/sparcv9/Makefile.com
index ca39db2192..3ffd9ea40b 100644
--- a/usr/src/psm/stand/lib/names/sparcv9/Makefile.com
+++ b/usr/src/psm/stand/lib/names/sparcv9/Makefile.com
@@ -23,7 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # psm/stand/lib/names/sparcv9/Makefile.com
 #
@@ -84,7 +83,7 @@ clean:
 	$(RM) $(OBJS) $(L_OBJS)
 
 clobber: clean
-	$(RM) $(LIBNAMES) $(LINTLIBNAMES) a.out core
+	$(RM) $(LIBNAMES) $(LINTLIBNAMES)
 
 $(LIBNAMES): $(OBJSDIR) .WAIT $(OBJS)
 	$(BUILD.AR) $(OBJS)
diff --git a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/common/Makefile b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/common/Makefile
index e9b9ba1721..5623021573 100644
--- a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/common/Makefile
+++ b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/common/Makefile
@@ -113,7 +113,7 @@ clean:
 	$(RM) $(OBJS) $(L_OBJS)
 
 clobber: clean
-	$(RM) $(LIBPROM) $(LINTLIBPROM) a.out core
+	$(RM) $(LIBPROM) $(LINTLIBPROM)
 
 $(LIBPROM): $(OBJSDIR) .WAIT $(OBJS)
 	$(BUILD.AR) $(OBJS)
diff --git a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4/Makefile b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4/Makefile
index 08a9660262..436edb7048 100644
--- a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4/Makefile
+++ b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4/Makefile
@@ -92,7 +92,7 @@ clean:
 	$(RM) $(OBJS) $(L_OBJS)
 
 clobber: clean
-	$(RM) $(LIBPLAT) $(LINTLIBPLAT) a.out core
+	$(RM) $(LIBPLAT) $(LINTLIBPLAT)
 
 $(LIBPLAT): $(OBJSDIR) .WAIT $(OBJS)
 	$(BUILD.AR) $(OBJS)
diff --git a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4u/Makefile b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4u/Makefile
index 9948ded75d..71d0c68b97 100644
--- a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4u/Makefile
+++ b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4u/Makefile
@@ -96,7 +96,7 @@ clean:
 	$(RM) $(OBJS) $(L_OBJS)
 
 clobber: clean
-	$(RM) $(LIBPLAT) $(LINTLIBPLAT) a.out core
+	$(RM) $(LIBPLAT) $(LINTLIBPLAT)
 
 $(LIBPLAT): $(OBJSDIR) .WAIT $(OBJS)
 	$(BUILD.AR) $(OBJS)
diff --git a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4v/Makefile b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4v/Makefile
index f40f1651da..ac6f64326a 100644
--- a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4v/Makefile
+++ b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4v/Makefile
@@ -94,7 +94,7 @@ clean:
 	$(RM) $(OBJS) $(L_OBJS)
 
 clobber: clean
-	$(RM) $(LIBPLAT) $(LINTLIBPLAT) a.out core
+	$(RM) $(LIBPLAT) $(LINTLIBPLAT)
 
 $(LIBPLAT): $(OBJSDIR) .WAIT $(OBJS)
 	$(BUILD.AR) $(OBJS)
diff --git a/usr/src/uts/Makefile b/usr/src/uts/Makefile
index 9197d3c8e6..47ada80eb4 100644
--- a/usr/src/uts/Makefile
+++ b/usr/src/uts/Makefile
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2012 Nexenta Systems, Inc. All rights reserved.
 #
 # include global definitions
 include ../Makefile.master
@@ -74,6 +75,7 @@ install		:=	TARGET= install
 install_h	:=	TARGET= install_h
 clean		:=	TARGET= clean
 clobber		:=	TARGET= clobber
+clobber_h	:=	TARGET= clobber
 lint		:=	TARGET= lint
 clean.lint	:=	TARGET= clean.lint
 check		:=	TARGET= check
@@ -142,6 +144,8 @@ COMMON_HDRDIRS= common/avs \
 		common/inet/nca \
 		common/inet/sockmods/netpacket \
 		common/io/bpf/net \
+		common/io/fibre-channel/fca/qlc \
+		common/io/lvm/md \
 		common/ipp \
 		common/net \
 		common/netinet \
@@ -166,8 +170,13 @@ $(CLOSED_BUILD)COMMON_HDRDIRS += $(CLOSED)/uts/common/sys
 # Other directories should be included here, but do not yet have the
 # necessary Makefile support (make clean).  See 6414855.
 #
-DYNHDRDIRS =	common/idmap \
+DYNHDRDIRS =	common/avs \
+		common/gssapi \
+		common/idmap \
+		common/io/fibre-channel/fca/qlc \
+		common/io/lvm/md \
 		common/klm \
+		common/rpc \
 		common/rpcsvc \
 		common/sys
 
@@ -197,9 +206,8 @@ clean clobber: $($(MACH)_ARCHITECTURES) $(DYNHDRDIRS)
 		$(RM) $(PMTMO_FILE) ; \
 	fi
 
-EXTRA_CLOBBER_TARGETS= common/avs/ns/rdc
-clobber: $(EXTRA_CLOBBER_TARGETS)
-
+# testing convenience
+clobber_h: $(DYNHDRDIRS)
 
 clean.lint modlist: $($(MACH)_ARCHITECTURES)
 
diff --git a/usr/src/uts/common/Makefile.rules b/usr/src/uts/common/Makefile.rules
index b7e8aa2ea3..2d52f0031e 100644
--- a/usr/src/uts/common/Makefile.rules
+++ b/usr/src/uts/common/Makefile.rules
@@ -1574,24 +1574,6 @@ $(LINTS_DIR)/bz2%.ln:		$(COMMONBASE)/bzip2/%.c
 	 @($(LHEAD) $(LINT.c) -C $(LINTS_DIR)/`basename $@ .ln` $(BZ2LINT) $< $(LTAIL))
 
 #
-# SVM
-#
-
-MD_XDR_CSRC	=	$(UTSBASE)/common/io/lvm/md
-MD_XDR_XSRC	=	$(UTSBASE)/common/sys/lvm
-RPCGENFLAGS	+=	-C -M -D_KERNEL -DSYSV
-
-$(MD_XDR_CSRC)/meta_basic_xdr.c:	$(MD_XDR_XSRC)/meta_basic.x
-	$(RPCGEN) $(RPCGENFLAGS) -c -i 100 $(MD_XDR_XSRC)/meta_basic.x | \
-	nawk '{sub(/^#include "(\.\.\/\.\.\/)/,"#include \"\.\.\/\.\.\/\.\.\/\.\.\/"); print $$0}'  | \
-	nawk '{sub(/meta_basic.h/, "md_basic.h"); print $$0}' >$@
-
-$(MD_XDR_CSRC)/metamed_xdr.c:	$(MD_XDR_XSRC)/metamed.x
-	$(RPCGEN) $(RPCGENFLAGS) -c -i 100 $(MD_XDR_XSRC)/metamed.x |  \
-	nawk '{sub(/^#include "(\.\.\/\.\.\/)/,"#include \"\.\.\/\.\.\/\.\.\/\.\.\/"); print $$0}' | \
-	nawk '{sub(/metamed.h/, "mdmed.h"); print $$0}' >$@
-
-#
 #	Section 1b:	Lint `objects'
 #
 $(LINTS_DIR)/%.ln:		$(COMMONBASE)/crypto/aes/%.c
diff --git a/usr/src/uts/common/avs/Makefile b/usr/src/uts/common/avs/Makefile
index 55d19a30a3..71826d0f21 100644
--- a/usr/src/uts/common/avs/Makefile
+++ b/usr/src/uts/common/avs/Makefile
@@ -36,11 +36,14 @@ AVS_SUBDIRS = ncall \
 # install rules
 install_h:= TARGET= install_h
 check:=	    TARGET= check
+clobber:=   TARGET= clobber
 
 # standards checking rules
 
 install_h check: $(AVS_SUBDIRS)
 
+clobber: ns/rdc
+
 $(AVS_SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/uts/common/gssapi/Makefile b/usr/src/uts/common/gssapi/Makefile
index 736ac8da68..82ec96631d 100644
--- a/usr/src/uts/common/gssapi/Makefile
+++ b/usr/src/uts/common/gssapi/Makefile
@@ -88,3 +88,5 @@ check:	$(CHECKHDRS)
 
 clean:
 	$(RM) $(DERIVED_FILES)
+
+clobber: clean
diff --git a/usr/src/uts/common/io/fibre-channel/fca/qlc/Makefile b/usr/src/uts/common/io/fibre-channel/fca/qlc/Makefile
new file mode 100644
index 0000000000..01f2c36a73
--- /dev/null
+++ b/usr/src/uts/common/io/fibre-channel/fca/qlc/Makefile
@@ -0,0 +1,69 @@
+#
+# 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.
+#
+# Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+#
+
+# Path to the base of the uts directory tree (usually /usr/src/uts).
+UTSBASE	= ../../../../..
+
+#
+#	Include common rules.
+#
+include $(SRC)/Makefile.master
+
+FWTABLE          = ql_fw_table.c
+FWIMAGES         = 2200
+FWIMAGES        += 2300
+FWIMAGES        += 2400
+FWIMAGES        += 2500
+FWIMAGES        += 6322
+FWIMAGES        += 8100
+
+FWMODULES_SRC    = $(FWIMAGES:%=ql_fw_%.c)
+
+all_h install_h : $(FWTABLE)
+
+check:
+
+clean:
+	$(RM) $(FWTABLE)
+
+clobber: clean
+
+$(FWTABLE): $(FWMODULES_SRC)
+	$(RM) $@
+	echo '#include <ql_apps.h>'             >> $@
+	echo '#include <ql_api.h>'              >> $@
+	echo 'struct fw_table fw_table[] = {'   >> $@
+	grep FW_VERSION_STRING $(FWMODULES_SRC) |\
+	grep '#define'                          |\
+	sed 's/[0-9]"/& },/'                    |\
+	sed 's/.*ql_fw_/{ 0x/'                  |\
+	sed 's/.c:#define/,/'                   |\
+	sed 's/FW_VERSION_STRING//'             >> $@
+	echo '{ 0, NULL }'                      >> $@
+	echo '};'                               >> $@
+
+.KEEP_STATE:
diff --git a/usr/src/uts/common/io/lvm/md/Makefile b/usr/src/uts/common/io/lvm/md/Makefile
new file mode 100644
index 0000000000..355b1881d3
--- /dev/null
+++ b/usr/src/uts/common/io/lvm/md/Makefile
@@ -0,0 +1,60 @@
+#
+# 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.
+#
+# Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+#
+
+# Path to the base of the uts directory tree (usually /usr/src/uts).
+UTSBASE	= ../../../..
+
+#
+#	Include common rules.
+#
+include $(SRC)/Makefile.master
+
+MD_XDR_CSRC	=	$(UTSBASE)/common/io/lvm/md
+MD_XDR_XSRC	=	$(UTSBASE)/common/sys/lvm
+RPCGENFLAGS	+=	-C -M -D_KERNEL -DSYSV
+
+DERIVED_FILES	=	meta_basic_xdr.c metamed_xdr.c
+
+all_h install_h : $(DERIVED_FILES)
+
+check:
+
+clean:
+	$(RM) $(DERIVED_FILES)
+
+clobber: clean
+
+%_xdr.c:	$(MD_XDR_XSRC)/%.x
+	$(RPCGEN) $(RPCGENFLAGS) -c -i 100 $(MD_XDR_XSRC)/$*.x | \
+$(NAWK) '/^#include/ {\
+    sub(/(\.\.\/)*common\//,"");\
+    sub(/meta_basic.h/, "md_basic.h");\
+    sub(/metamed.h/, "mdmed.h");\
+}\
+{   print $0; }' > $@
+
+.KEEP_STATE:
diff --git a/usr/src/uts/common/rpc/Makefile b/usr/src/uts/common/rpc/Makefile
index 2c5ed640b0..03a327eef3 100644
--- a/usr/src/uts/common/rpc/Makefile
+++ b/usr/src/uts/common/rpc/Makefile
@@ -89,6 +89,8 @@ all_h: $(DERIVED_FILES)
 clean:
 	$(RM) $(DERIVED_FILES)
 
+clobber: clean
+
 $(RPCDIRS):
 	$(INS.dir)
 
diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile
index 42df7b77e0..a24490bf15 100644
--- a/usr/src/uts/common/sys/Makefile
+++ b/usr/src/uts/common/sys/Makefile
@@ -1373,12 +1373,13 @@ usb/usbdevs.h: $(USBDEVS_AWK) $(USBDEVS_DATA)
 	$(NAWK) -f $(USBDEVS_AWK) $(USBDEVS_DATA) -H > $@
 
 LVMDERIVED_H:
-	cd $(SRC)/uts/common/sys/lvm; pwd; $(MAKE)
+	cd $(SRC)/uts/common/sys/lvm; pwd; $(MAKE) all_h
 
 clean:
 	$(RM) $(GENHDRS)
 
-clobber:	clean
+clobber: clean
+	cd $(SRC)/uts/common/sys/lvm; pwd; $(MAKE) clobber
 
 check:	$(CHECKHDRS)
 
diff --git a/usr/src/uts/common/sys/lvm/Makefile b/usr/src/uts/common/sys/lvm/Makefile
index bf7a9ac509..dd7fe5ab4d 100644
--- a/usr/src/uts/common/sys/lvm/Makefile
+++ b/usr/src/uts/common/sys/lvm/Makefile
@@ -20,11 +20,11 @@
 # CDDL HEADER END
 #
 #
-# uts/common/sys/lvm/Makefile
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# uts/common/sys/lvm/Makefile
 #
 #       This makefile derive some .h files via rpcgen
 #
@@ -48,10 +48,13 @@ RPCGENFLAGS	+=	-C -M -D_KERNEL -DSYSV
 
 
 def all install lint modlintlib clean.lint:	$(DERIVED_FILES)
+all_h install_h: $(DERIVED_FILES)
 
-clean clobber:
+clean:
 	$(RM) $(DERIVED_FILES)
 
+clobber: clean
+
 md_basic.h:	meta_basic.x
 	$(RPCGEN) $(RPCGENFLAGS) -h meta_basic.x  | \
 	awk '/<synch.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \
diff --git a/usr/src/uts/i86pc/Makefile b/usr/src/uts/i86pc/Makefile
index 09754bc3b2..6dba4f5732 100644
--- a/usr/src/uts/i86pc/Makefile
+++ b/usr/src/uts/i86pc/Makefile
@@ -40,12 +40,14 @@ INTEL_LIB_DIR	 = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR)
 
 INTEL_LINTS	 = genunix
 
-LINT_LIBS	 = $(LINT_LIB) \
+LINT_LIBS	 = \
 		   $(GENUNIX_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(CLOSED_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(INTEL_LINTS:%=$(INTEL_LIB_DIR)/llib-l%.ln)
 
+I86PC_LINTS =	dr drmach_acpi
+
 #
 #
 #
@@ -79,6 +81,9 @@ def all clean clobber clean.lint: setup genassym unix .WAIT \
 install: install_platforms setup genassym unix .WAIT \
 	$(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) $(IMPLEMENTATIONS)
 
+# Need to clean in here too because of lint.
+clean: $(I86PC_LINTS)
+
 # list the modules under i86pc.
 modlist: unix $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
 	$(IMPLEMENTATIONS)
@@ -149,7 +154,7 @@ globallint := LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2
 
 globallint:
 	@-$(ECHO) "\nFULL KERNEL: global crosschecks:"
-	@-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2)
+	@-$(LINT) $(LINTFLAGS) $(LINT_LIB) $(LINT_LIBS) 2>&1 | $(LGREP.2)
 
 lint:	lintlib .WAIT modlintlib .WAIT $(INTEL_LINTS) $(LINT_DEPS) \
 	$(IMPLEMENTATIONS)
diff --git a/usr/src/uts/i86pc/dr/Makefile b/usr/src/uts/i86pc/dr/Makefile
index f29362ef14..18c2770bb8 100644
--- a/usr/src/uts/i86pc/dr/Makefile
+++ b/usr/src/uts/i86pc/dr/Makefile
@@ -76,7 +76,7 @@ CERRWARN += -_gcc=-Wno-empty-body
 # module dependencies
 #
 LDFLAGS += -dy -Nmisc/drmach_acpi
-
+ 
 CLEANFILES +=	$(DR_GENERR)
 CLEANFILES +=	$(DR_IO)/dr_err.c
 
@@ -89,9 +89,11 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-clean:		$(CLEAN_DEPS)
+# This build only 64-bit, but the lint32 below
+# needs corresponding clean/clobber deps.
+clean:		$(CLEAN_DEPS) clean.debug32
 
-clobber:	$(CLOBBER_DEPS)
+clobber:	$(CLOBBER_DEPS) clobber.debug32
 
 lint:		$(LINT_DEPS)
 
@@ -105,4 +107,3 @@ install:	$(INSTALL_DEPS) $(CONF_INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/i86pc/Makefile.targ
-
diff --git a/usr/src/uts/i86pc/drmach_acpi/Makefile b/usr/src/uts/i86pc/drmach_acpi/Makefile
index 24f9197b32..c803d07f77 100644
--- a/usr/src/uts/i86pc/drmach_acpi/Makefile
+++ b/usr/src/uts/i86pc/drmach_acpi/Makefile
@@ -83,9 +83,11 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-clean:		$(CLEAN_DEPS)
+# This build only 64-bit, but the lint32 below
+# needs corresponding clean/clobber deps.
+clean:		$(CLEAN_DEPS) clean.debug32
 
-clobber:	$(CLOBBER_DEPS)
+clobber:	$(CLOBBER_DEPS) clobber.debug32
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/i86pc/genassym/Makefile b/usr/src/uts/i86pc/genassym/Makefile
index 4d164a896d..dc11bddde7 100644
--- a/usr/src/uts/i86pc/genassym/Makefile
+++ b/usr/src/uts/i86pc/genassym/Makefile
@@ -22,7 +22,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 #	This makefile drives the production of assym.h through
 #	compile time intialized data.
@@ -59,7 +58,7 @@ DSF_DIR		= .
 #	Overrides
 #
 CLEANFILES	= $(GENASSYM) Nothing_to_remove
-CLOBBERFILES	= $(ASSYM_H) $(KDI_ASSYM.H) $(CLEANFILES) Nothing_to_remove
+CLOBBERFILES	= $(ASSYM_H) $(KDI_ASSYM_H) $(CLEANFILES) Nothing_to_remove
 
 #
 #	Default build targets.
diff --git a/usr/src/uts/i86pc/gfx_private/Makefile b/usr/src/uts/i86pc/gfx_private/Makefile
index b8156af9e2..53001f9321 100644
--- a/usr/src/uts/i86pc/gfx_private/Makefile
+++ b/usr/src/uts/i86pc/gfx_private/Makefile
@@ -74,6 +74,8 @@ LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-parentheses
 
+CLOBBERFILES	+= $(OBJS_DIR)/$(VGATEXT_FONT).c
+
 #
 #	Default build targets.
 #
diff --git a/usr/src/uts/i86pc/unix/Makefile b/usr/src/uts/i86pc/unix/Makefile
index 0a83e6c4cc..27389eea17 100644
--- a/usr/src/uts/i86pc/unix/Makefile
+++ b/usr/src/uts/i86pc/unix/Makefile
@@ -98,6 +98,7 @@ UNIX_DIR	= .
 CLEANFILES	+=		\
 	$(UNIX_O) $(MODSTUBS_O)	\
 	$(OBJS_DIR)/vers.c $(OBJS_DIR)/vers.o \
+	$(OBJS_DIR)/dtracestubs.s \
 	$(DTRACESTUBS_O) $(DTRACESTUBS)
 
 CLEANFILES	+=		\
@@ -113,6 +114,10 @@ CLEANFILES	+=		\
 	$(OBJS_DIR)/fb_swtch_src \
 	$(OBJS_DIR)/fb_swtch.s
 
+CLEANFILES	+= \
+	$(ZLIB_OBJS:%.o=$(OBJS_DIR)/%.o) \
+	$(ZLIB_OBJS:%.o=$(OBJS_DIR)/%.ln)
+
 CLOBBERFILES	= $(CLEANFILES) $(UNIX_BIN) $(MULTIBOOT)
 CLEANLINTFILES	+= $(LINT_LIB) $(DBOOT_LINT_LIB) $(DBOOT_LINTS)
 
diff --git a/usr/src/uts/i86xpv/Makefile b/usr/src/uts/i86xpv/Makefile
index cb0cd9611a..4586d8c659 100644
--- a/usr/src/uts/i86xpv/Makefile
+++ b/usr/src/uts/i86xpv/Makefile
@@ -42,12 +42,14 @@ INTEL_LIB_DIR	 = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR)
 
 INTEL_LINTS	 = genunix
 
-LINT_LIBS	 = $(LINT_LIB) \
+LINT_LIBS	 = \
 		   $(GENUNIX_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(CLOSED_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
 		   $(INTEL_LINTS:%=$(INTEL_LIB_DIR)/llib-l%.ln)
 
+I86XPV_LINTS =	xdb xnb xnbe xnbo xnbu xpvtap
+
 #
 #
 #
@@ -80,6 +82,9 @@ def all clean clobber clean.lint: setup genassym unix .WAIT \
 install: install_platforms setup genassym unix .WAIT \
 	$(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS)
 
+# Need to clean in here too because of lint.
+clean: $(I86XPV_LINTS)
+
 # list the modules under i86xpv.
 modlist: unix $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS)
 
@@ -146,7 +151,7 @@ globallint := LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2
 
 globallint:
 	@-$(ECHO) "\nFULL KERNEL: global crosschecks:"
-	@-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2)
+	@-$(LINT) $(LINTFLAGS) $(LINT_LIB) $(LINT_LIBS) 2>&1 | $(LGREP.2)
 
 lint:	lintlib .WAIT modlintlib .WAIT $(INTEL_LINTS) $(LINT_DEPS)
 
diff --git a/usr/src/uts/i86xpv/gfx_private/Makefile b/usr/src/uts/i86xpv/gfx_private/Makefile
index 7184d1091f..f103eb9a04 100644
--- a/usr/src/uts/i86xpv/gfx_private/Makefile
+++ b/usr/src/uts/i86xpv/gfx_private/Makefile
@@ -70,6 +70,8 @@ LINTTAGS +=	-erroff=E_STATIC_UNUSED
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-parentheses
 
+CLOBBERFILES	+= $(OBJS_DIR)/$(VGATEXT_FONT).c
+
 #
 #	Default build targets.
 #
diff --git a/usr/src/uts/i86xpv/unix/Makefile b/usr/src/uts/i86xpv/unix/Makefile
index 7969a8dd44..989e79399d 100644
--- a/usr/src/uts/i86xpv/unix/Makefile
+++ b/usr/src/uts/i86xpv/unix/Makefile
@@ -95,6 +95,7 @@ UNIX_DIR	= .
 CLEANFILES	+=		\
 	$(UNIX_O) $(MODSTUBS_O)	\
 	$(OBJS_DIR)/vers.c $(OBJS_DIR)/vers.o \
+	$(OBJS_DIR)/dtracestubs.s \
 	$(DTRACESTUBS_O) $(DTRACESTUBS)
 
 CLEANFILES	+=		\
@@ -102,6 +103,15 @@ CLEANFILES	+=		\
 	$(DBOOT_OBJECTS)	\
 	$(DBOOT_BIN)
 
+CLEANFILES	+=		\
+	$(OBJS_DIR)/fb_swtch_src.o \
+	$(OBJS_DIR)/fb_swtch_src \
+	$(OBJS_DIR)/fb_swtch.s
+
+CLEANFILES	+= \
+	$(ZLIB_OBJS:%.o=$(OBJS_DIR)/%.o) \
+	$(ZLIB_OBJS:%.o=$(OBJS_DIR)/%.ln)
+
 CLOBBERFILES	= $(CLEANFILES) $(UNIX_BIN)
 CLEANLINTFILES	+= $(LINT_LIB) $(DBOOT_LINT_LIB) $(DBOOT_LINTS)
 
diff --git a/usr/src/uts/i86xpv/xdb/Makefile b/usr/src/uts/i86xpv/xdb/Makefile
index bc5628fd5c..d221748e1c 100644
--- a/usr/src/uts/i86xpv/xdb/Makefile
+++ b/usr/src/uts/i86xpv/xdb/Makefile
@@ -72,9 +72,11 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-clean:		$(CLEAN_DEPS)
+# This build only 64-bit, but the lint32 below
+# needs corresponding clean/clobber deps.
+clean:		$(CLEAN_DEPS) clean.debug32
 
-clobber:	$(CLOBBER_DEPS)
+clobber:	$(CLOBBER_DEPS) clobber.debug32
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/i86xpv/xnb/Makefile b/usr/src/uts/i86xpv/xnb/Makefile
index 336b225836..22e11b44cd 100644
--- a/usr/src/uts/i86xpv/xnb/Makefile
+++ b/usr/src/uts/i86xpv/xnb/Makefile
@@ -87,9 +87,11 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-clean:		$(CLEAN_DEPS)
+# This build only 64-bit, but the lint32 below
+# needs corresponding clean/clobber deps.
+clean:		$(CLEAN_DEPS) clean.debug32
 
-clobber:	$(CLOBBER_DEPS)
+clobber:	$(CLOBBER_DEPS) clobber.debug32
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/i86xpv/xnbe/Makefile b/usr/src/uts/i86xpv/xnbe/Makefile
index 784ef2af93..c45af07dd8 100644
--- a/usr/src/uts/i86xpv/xnbe/Makefile
+++ b/usr/src/uts/i86xpv/xnbe/Makefile
@@ -81,9 +81,11 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-clean:		$(CLEAN_DEPS)
+# This build only 64-bit, but the lint32 below
+# needs corresponding clean/clobber deps.
+clean:		$(CLEAN_DEPS) clean.debug32
 
-clobber:	$(CLOBBER_DEPS)
+clobber:	$(CLOBBER_DEPS) clobber.debug32
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/i86xpv/xnbo/Makefile b/usr/src/uts/i86xpv/xnbo/Makefile
index c635e516c8..43c53b275e 100644
--- a/usr/src/uts/i86xpv/xnbo/Makefile
+++ b/usr/src/uts/i86xpv/xnbo/Makefile
@@ -81,9 +81,11 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-clean:		$(CLEAN_DEPS)
+# This build only 64-bit, but the lint32 below
+# needs corresponding clean/clobber deps.
+clean:		$(CLEAN_DEPS) clean.debug32
 
-clobber:	$(CLOBBER_DEPS)
+clobber:	$(CLOBBER_DEPS) clobber.debug32
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/i86xpv/xnbu/Makefile b/usr/src/uts/i86xpv/xnbu/Makefile
index 34d10f155e..e60f05db23 100644
--- a/usr/src/uts/i86xpv/xnbu/Makefile
+++ b/usr/src/uts/i86xpv/xnbu/Makefile
@@ -81,9 +81,11 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-clean:		$(CLEAN_DEPS)
+# This build only 64-bit, but the lint32 below
+# needs corresponding clean/clobber deps.
+clean:		$(CLEAN_DEPS) clean.debug32
 
-clobber:	$(CLOBBER_DEPS)
+clobber:	$(CLOBBER_DEPS) clobber.debug32
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/i86xpv/xpvtap/Makefile b/usr/src/uts/i86xpv/xpvtap/Makefile
index 80778dfe66..a921762700 100644
--- a/usr/src/uts/i86xpv/xpvtap/Makefile
+++ b/usr/src/uts/i86xpv/xpvtap/Makefile
@@ -86,9 +86,11 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-clean:		$(CLEAN_DEPS)
+# This build only 64-bit, but the lint32 below
+# needs corresponding clean/clobber deps.
+clean:		$(CLEAN_DEPS) clean.debug32
 
-clobber:	$(CLOBBER_DEPS)
+clobber:	$(CLOBBER_DEPS) clobber.debug32
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/intel/Makefile b/usr/src/uts/intel/Makefile
index a981a3717d..46b2368ec9 100644
--- a/usr/src/uts/intel/Makefile
+++ b/usr/src/uts/intel/Makefile
@@ -76,6 +76,7 @@ install_h.prereq	:=	TARGET= install_h
 def all install clean clobber modlist: $(KMODS) $(CLOSED_KMODS) \
 	$(SVVS) $(XMODS) $(CLOSED_XMODS) config
 
+clobber: clobber.targ
 
 #
 # Privilege constants
@@ -89,6 +90,8 @@ PRIVS_C = $(SRC)/uts/common/os/priv_const.c
 $(PRIVS_C): $(PRIVS_AWK) $(PRIVS_DEF)
 	$(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@
 
+CLOBBERFILES += $(PRIVS_C)
+
 #
 # Prerequisites
 #
diff --git a/usr/src/uts/intel/audioemu10k/Makefile b/usr/src/uts/intel/audioemu10k/Makefile
index ff855e75f4..e1d1e2e832 100644
--- a/usr/src/uts/intel/audioemu10k/Makefile
+++ b/usr/src/uts/intel/audioemu10k/Makefile
@@ -100,6 +100,8 @@ $(DSP_HDRS): $(ASM10K) $(DSP_SRCS)
 	$(CPP) -D$(MODEL10K) -I$(DSP_SRCDIR) $(DSP_SRCDIR)/emu10k.dsp | \
 	$(OBJS_DIR)/asm10k $(ASM10KFLAGS) -h $@
 
+CLOBBERFILES += $(ASM10K) $(DSP_HDRS)
+
 #
 #	Include common targets.
 #
diff --git a/usr/src/uts/intel/config/Makefile b/usr/src/uts/intel/config/Makefile
index 24011ac853..c2c79f8697 100644
--- a/usr/src/uts/intel/config/Makefile
+++ b/usr/src/uts/intel/config/Makefile
@@ -116,14 +116,15 @@ $(BOOTDEVICEDB)/%: $(BOOTDEVICEDB) $(SRCDIR)/%
 $(SRCDIR)/priv_names: $(PRIVS_DEF) $(PRIVS_AWK)
 	$(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v pnamesfile=$@
 
-clean clobber lint:
+clean lint:
+clobber: clobber.targ
 
 # 
 #	No lints, so keep the clobber and clean targets reasonable. 
 # 
 CLEANLINTFILES	= Nothing_to_remove
 CLEANFILES	= Nothing_to_remove
-CLOBBERFILES	= Nothing_to_remove
+CLOBBERFILES	= $(SRCDIR)/priv_names
 
 #
 #	Include common targets.
diff --git a/usr/src/uts/intel/genunix/Makefile b/usr/src/uts/intel/genunix/Makefile
index 3c96c10d49..d1ae9be8bf 100644
--- a/usr/src/uts/intel/genunix/Makefile
+++ b/usr/src/uts/intel/genunix/Makefile
@@ -68,6 +68,7 @@ INSTALL_TARGET	= $(GENUNIX) $(ROOTMODULE)
 #
 #	Overrides
 #
+CLOBBERFILES	+= $(GENUNIX)
 CLEANFILES	+= $(LIBSTUBS) $(LIBGEN)
 BINARY		=
 
diff --git a/usr/src/uts/intel/hwa1480_fw/Makefile b/usr/src/uts/intel/hwa1480_fw/Makefile
index cc5dd3ef27..ace371f7a6 100644
--- a/usr/src/uts/intel/hwa1480_fw/Makefile
+++ b/usr/src/uts/intel/hwa1480_fw/Makefile
@@ -68,6 +68,9 @@ LINTTAGS	+= -erroff=E_PTRDIFF_OVERFLOW
 LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
 LINTTAGS	+= -erroff=E_STATIC_UNUSED
 
+CLEANFILES	+= $(WARLOCK_OUT) $(WARLOCK_OK)
+CLOBBERFILES	+= $(BINSRC)/$(MODULE)
+
 #
 #	Default build targets.
 #
@@ -78,10 +81,8 @@ def:		$(DEF_DEPS) $(FWOBJ)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
-		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/intel/ip/Makefile b/usr/src/uts/intel/ip/Makefile
index 18036a47a7..9df2e66f26 100644
--- a/usr/src/uts/intel/ip/Makefile
+++ b/usr/src/uts/intel/ip/Makefile
@@ -103,7 +103,10 @@ all:		$(ALL_DEPS) $(SISCHECK_DEPS)
 
 clean:		$(CLEAN_DEPS) $(SISCLEAN_DEPS)
 
-clobber:	$(CLOBBER_DEPS) $(SISCLEAN_DEPS)
+# Need to clobber all build types due to ipctf.a
+clobber:	$(CLOBBER_DEPS) $(SISCLEAN_DEPS) \
+		clobber.obj32 clobber.obj64 \
+		clobber.debug32 clobber.debug64
 
 lint:		$(LINT_DEPS)
 
diff --git a/usr/src/uts/intel/mwlfw/Makefile b/usr/src/uts/intel/mwlfw/Makefile
index 960cb30b06..5885c6fc98 100644
--- a/usr/src/uts/intel/mwlfw/Makefile
+++ b/usr/src/uts/intel/mwlfw/Makefile
@@ -75,8 +75,6 @@ def:		$(DEF_DEPS) $(FWOBJ)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(BINDEST)/$(FWBINCOPY)
-		$(RM) $(BINDEST)/$(BOOTBINCOPY)
 
 clobber:	$(CLOBBER_DEPS)
 
@@ -109,6 +107,9 @@ $(FWOBJ):
 	cp $(BINSRC)/$(ORIGIN_BOOTBIN) $(BINDEST)/$(BOOTBINCOPY)
 	$(ELFWRAP) $(WRAPOPT) -o $@ $(BINDEST)/$(FWBINCOPY) $(BINDEST)/$(BOOTBINCOPY)
 
+CLOBBERFILES	+= $(BINDEST)/$(FWBINCOPY)
+CLOBBERFILES	+= $(BINDEST)/$(BOOTBINCOPY)
+
 #
 #	Include common targets.
 #
diff --git a/usr/src/uts/intel/qlc/Makefile b/usr/src/uts/intel/qlc/Makefile
index 4363c69dcd..c9071abe6a 100644
--- a/usr/src/uts/intel/qlc/Makefile
+++ b/usr/src/uts/intel/qlc/Makefile
@@ -67,7 +67,6 @@ LDFLAGS		+= -dy -Nmisc/fctl
 LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
 LINTTAGS	+= -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
 
-FWTABLE          = ql_fw_table.c
 FWIMAGES         = 2200
 FWIMAGES        += 2300
 FWIMAGES        += 2400
@@ -76,7 +75,7 @@ FWIMAGES        += 6322
 FWIMAGES        += 8100
 
 FWMODULES        = $(FWIMAGES:%=$(MODULE)_fw_%)
-FWMODULES_SRC    = $(FWIMAGES:%=$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_%.c)
+FWMODULES_SRC    = $(FWIMAGES:%=$(CONF_SRCDIR)/ql_fw_%.c)
 
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-type-limits
@@ -87,35 +86,21 @@ CERRWARN	+= -_gcc=-Wno-parentheses
 #
 .KEEP_STATE:
 
-all:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(ALL_DEPS)
+all:		$(ALL_DEPS)
 
-def:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(DEF_DEPS)
+def:		$(DEF_DEPS)
 
-clean:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_DEPS)
+clean:		$(CLEAN_DEPS)
 
-clobber:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLOBBER_DEPS)
+clobber:	$(CLOBBER_DEPS)
 
-lint:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(LINT_DEPS)
+lint:		$(LINT_DEPS)
 
-modlintlib:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(MODLINTLIB_DEPS)
+modlintlib:	$(MODLINTLIB_DEPS)
 
-clean.lint:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_LINT_DEPS)
+clean.lint:	$(CLEAN_LINT_DEPS)
 
-install:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(INSTALL_DEPS)
-
-$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c: $(FWMODULES_SRC)
-	/usr/bin/rm -f $@
-	echo '#include <ql_apps.h>'             >> $@
-	echo '#include <ql_api.h>'              >> $@
-	echo 'struct fw_table fw_table[] = {'   >> $@
-	grep FW_VERSION_STRING $(FWMODULES_SRC) |\
-	grep '#define'                          |\
-	sed 's/[0-9]"/& },/'                    |\
-	sed 's/.*ql_fw_/{ 0x/'                  |\
-	sed 's/.c:#define/,/'                   |\
-	sed 's/FW_VERSION_STRING//'             >> $@
-	echo '{ 0, NULL }'                      >> $@
-	echo '};'                               >> $@
+install:	$(INSTALL_DEPS)
 
 #
 #	Include common targets.
diff --git a/usr/src/uts/intel/uathfw/Makefile b/usr/src/uts/intel/uathfw/Makefile
index 00ab72c996..27791c3004 100644
--- a/usr/src/uts/intel/uathfw/Makefile
+++ b/usr/src/uts/intel/uathfw/Makefile
@@ -75,7 +75,6 @@ def:		$(DEF_DEPS) $(FWOBJ)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
-		$(RM) $(BINDEST)/$(BINCOPY)
 
 clobber:	$(CLOBBER_DEPS)
 
@@ -105,6 +104,8 @@ $(FWOBJ):
 	cp $(BINSRC)/$(ORIGIN_SRC) $(BINDEST)/$(BINCOPY)
 	$(ELFWRAP) $(WRAPOPT) -o $@ $(BINDEST)/$(BINCOPY)
 
+CLOBBERFILES += $(BINDEST)/$(BINCOPY)
+
 #
 #	Include common targets.
 #
diff --git a/usr/src/uts/sparc/config/Makefile b/usr/src/uts/sparc/config/Makefile
index 767ed0b41a..8f5c587049 100644
--- a/usr/src/uts/sparc/config/Makefile
+++ b/usr/src/uts/sparc/config/Makefile
@@ -79,14 +79,15 @@ $(ROOTETCSEC)/%: $(SRCDIR)/%
 $(SRCDIR)/priv_names: $(PRIVS_DEF) $(PRIVS_AWK)
 	$(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v pnamesfile=$@
 
-clean clobber lint:
+clean lint:
+clobber: clobber.targ
 
 # 
 #	No lints, so keep the clobber and clean targets reasonable. 
 # 
 CLEANLINTFILES	= Nothing_to_remove
 CLEANFILES	= Nothing_to_remove
-CLOBBERFILES	= Nothing_to_remove
+CLOBBERFILES	= $(SRCDIR)/priv_names
 
 #
 #	Include common targets.
diff --git a/usr/src/uts/sparc/qlc/Makefile b/usr/src/uts/sparc/qlc/Makefile
index c4482bb21f..92494ed283 100644
--- a/usr/src/uts/sparc/qlc/Makefile
+++ b/usr/src/uts/sparc/qlc/Makefile
@@ -67,7 +67,6 @@ LDFLAGS		+= -dy -Nmisc/fctl
 LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
 LINTTAGS	+= -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
 
-FWTABLE          = ql_fw_table.c
 FWIMAGES         = 2200
 FWIMAGES        += 2300
 FWIMAGES        += 2400
@@ -76,7 +75,7 @@ FWIMAGES        += 6322
 FWIMAGES        += 8100
 
 FWMODULES        = $(FWIMAGES:%=$(MODULE)_fw_%)
-FWMODULES_SRC    = $(FWIMAGES:%=$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_%.c)
+FWMODULES_SRC    = $(FWIMAGES:%=$(CONF_SRCDIR)/ql_fw_%.c)
 
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-type-limits
@@ -87,35 +86,21 @@ CERRWARN	+= -_gcc=-Wno-parentheses
 #
 .KEEP_STATE:
 
-all:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(ALL_DEPS)
+all:		$(ALL_DEPS)
 
-def:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(DEF_DEPS)
+def:		$(DEF_DEPS)
 
-clean:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_DEPS)
+clean:		$(CLEAN_DEPS)
 
-clobber:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLOBBER_DEPS)
+clobber:	$(CLOBBER_DEPS)
 
-lint:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(LINT_DEPS)
+lint:		$(LINT_DEPS)
 
-modlintlib:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(MODLINTLIB_DEPS)
+modlintlib:	$(MODLINTLIB_DEPS)
 
-clean.lint:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_LINT_DEPS)
+clean.lint:	$(CLEAN_LINT_DEPS)
 
-install:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(INSTALL_DEPS)
-
-$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c: $(FWMODULES_SRC)
-	/usr/bin/rm -f $@
-	echo '#include <ql_apps.h>'             >> $@
-	echo '#include <ql_api.h>'              >> $@
-	echo 'struct fw_table fw_table[] = {'   >> $@
-	grep FW_VERSION_STRING $(FWMODULES_SRC) |\
-	grep '#define'                          |\
-	sed 's/[0-9]"/& },/'                    |\
-	sed 's/.*ql_fw_/{ 0x/'                  |\
-	sed 's/.c:#define/,/'                   |\
-	sed 's/FW_VERSION_STRING//'             >> $@
-	echo '{ 0, NULL }'                      >> $@
-	echo '};'                               >> $@
+install:	$(INSTALL_DEPS)
 
 #
 #	Include common targets.
diff --git a/usr/src/uts/sun4u/Makefile b/usr/src/uts/sun4u/Makefile
index f54be0bccd..d08775e68e 100644
--- a/usr/src/uts/sun4u/Makefile
+++ b/usr/src/uts/sun4u/Makefile
@@ -83,6 +83,8 @@ def all clean clobber clean.lint: genassym unix .WAIT \
 	$(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
 	$(IMPLEMENTATIONS) $(CLOSED_IMPLEMENTATIONS)
 
+clobber: clobber.targ
+
 # list the modules under sun4u.
 modlist: unix $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
 	$(IMPLEMENTATIONS:.WAIT=) $(CLOSED_IMPLEMENTATIONS)
@@ -115,6 +117,7 @@ PRIVS_C = $(UTSBASE)/common/os/priv_const.c
 $(PRIVS_C): $(PRIVS_AWK) $(PRIVS_DEF)
 	$(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@
 
+CLOBBERFILES += $(PRIVS_C)
 
 #
 # Prerequisites
author	Gordon Ross <gwr@nexenta.com>	2013-08-23 18:31:03 -0400
committer	Gordon Ross <gwr@nexenta.com>	2013-08-30 14:41:32 -0400
commit	b6805bf78d2bbbeeaea8909a05623587b42d58b3 (patch)
tree	1ed4f5376932228adba6378d95bbea467bdea834 /usr/src
parent	a9478106a12424322498e53cf7cd75bd8a4d6004 (diff)
download	illumos-gate-b6805bf78d2bbbeeaea8909a05623587b42d58b3.tar.gz