--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.gitignore Fri Aug 23 18:31:03 2013 -0400
@@ -0,0 +1,20 @@
+# .gitignore for illumos checkouts.
+# Note: this does not try to ignore all files in a fully built workspace.
+# Rather, you are expected to "make clobber" before running "git status".
+.make.state*
+/log
+/packages
+/proto
+/webrev
+/usr/src/.build.tstamp
+/usr/src/ELF-data.*
+/usr/src/check-*.out
+/usr/src/clobber-*.out
+/usr/src/install-*.out
+/usr/src/lint-*.out
+/usr/src/lint-noise-*.out
+/usr/src/lint-noise-*.ref
+/usr/src/noise-*.out
+/usr/src/noise-*.ref
+/usr/src/tools/clobber-*.out
+/usr/src/tools/install-*.out
--- a/usr/src/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -118,7 +118,7 @@
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 @@
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}"; \
--- a/usr/src/cmd/Adm/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/Adm/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -80,8 +80,6 @@
FRC:
-clean:
+clean clobber: $(SUBDIRS)
lint:
-
-clobber:
--- a/usr/src/cmd/abi/spectrans/parser/Makefile.targ Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/abi/spectrans/parser/Makefile.targ Fri Aug 23 18:31:03 2013 -0400
@@ -39,7 +39,7 @@
LINTFLAGS += -xsuF -errtags=yes
CLEANFILES += $(LINTOUT)
-CLOBBERFILES += $(LINTLIB)
+CLOBBERFILES += $(LINTLIB) $(LIBRARY)
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-unused-label
--- a/usr/src/cmd/addbadsec/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/addbadsec/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -45,6 +45,7 @@
install: all $(ROOTPROG)
clean:
+ $(RM) $(OBJECTS)
lint: lint_SRCS
--- a/usr/src/cmd/audio/audioconvert/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/audio/audioconvert/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(POST_PROCESS)
clean:
+ $(RM) $(OBJS)
-clobber:
+clobber: clean
$(RM) $(PROG) $(CLOBBERFILES)
lint:
--- a/usr/src/cmd/audio/audiotest/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/audio/audiotest/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -44,6 +44,7 @@
install: all $(ROOTPROG)
clean:
+ $(RM) $(OBJS)
lint: lint_SRCS
--- a/usr/src/cmd/audio/utilities/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/audio/utilities/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -96,6 +96,7 @@
$(RM) $(COBJS) $(CCOBJS)
clobber: clean
+ $(RM) $(libaudio)
lint:
$(LINT.c) $(LIBCSRCS) $(LDLIBS)
--- a/usr/src/cmd/avs/errgen/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/avs/errgen/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -33,6 +33,7 @@
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-switch
LINTFLAGS += -erroff=E_SEC_SPRINTF_UNBOUNDED_COPY
+CLOBBERFILES += $(DYNPROG)
.KEEP_STATE:
@@ -45,7 +46,7 @@
lint: lint_PROG
clean:
- $(RM) *.o $(POFILE)
+ $(RM) $(OBJS)
$(PROG): $(OBJS)
$(NATIVECC) $(CFLAGS) $(OBJS) -o $@
--- a/usr/src/cmd/backup/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/backup/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(COMMONPRODSUBDIRS) $(UFSPRODSUBDIRS): $(LIBSUBDIRS) FRC
$(DO_SUBDIR)
+$(LIBSUBDIRS): FRC
+ $(DO_SUBDIR)
+
FRC:
--- a/usr/src/cmd/backup/dump/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/backup/dump/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -59,7 +59,7 @@
../include/memutils.h \
../include/rmt.h dump.h dumpusg.h
-CLOBBERFILES= $(PRODUCT) $(DEBUGPRODUCTS) dumpdates *.ln $(POFILES)
+CLOBBERFILES += $(PRODUCT) $(DEBUGPRODUCTS) dumpdates
LOCAL= .
GENERAL= ../include
--- a/usr/src/cmd/backup/lib/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/backup/lib/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -52,7 +52,7 @@
YFILE= getdate.y
YSRC= getdate.c
-CLOBBERFILES= $(YSRC) $(GLIB) *.ln
+CLOBBERFILES += $(LIBS) $(GLIB)
LOBJS= rmtlib.o myrcmd.o \
$(YSRC:%.c=%.o) \
--- a/usr/src/cmd/backup/restore/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/backup/restore/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -35,7 +35,7 @@
../include/byteorder.h ../include/memutils.h \
../include/rmt.h restore.h
-CLOBBERFILES= $(PRODUCT) $(DEBUGPRODUCTS) *.ln $(POFILES)
+CLOBBERFILES += $(PRODUCT) $(DEBUGPRODUCTS)
LOCAL= .
GENERAL= ../include
--- a/usr/src/cmd/bnu/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/bnu/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -49,6 +49,10 @@
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
--- a/usr/src/cmd/bnu/Makefile.inc Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/bnu/Makefile.inc Fri Aug 23 18:31:03 2013 -0400
@@ -37,8 +37,7 @@
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
--- a/usr/src/cmd/boot/mbr/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/boot/mbr/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -31,6 +31,7 @@
include ../Makefile.com
CERRWARN += -_gcc=-Wno-parentheses
+CLOBBERFILES = $(BOOTPROG)
.KEEP_STATE:
--- a/usr/src/cmd/boot/symdef/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/boot/symdef/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
# behavior, which causes us to take SIGSEGV on such a write.
CFLAGS += $(XSTRCONST)
+CLOBBERFILES= $(BOOTPROG)
+
all: $(BOOTPROG)
install: all $(ROOTBOOTSOLARISBINPROG)
--- a/usr/src/cmd/calendar/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/calendar/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -25,11 +25,11 @@
PROG= calprog
SHFILES= calendar
-CLOBBERFILES = $(SHFILE)
include ../Makefile.cmd
CERRWARN += -_gcc=-Wno-implicit-function-declaration
+CLOBBERFILES = $(SHFILES)
.KEEP_STATE:
--- a/usr/src/cmd/cdrw/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/cdrw/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -63,6 +63,7 @@
$(RM) $@
$(COMPILE.cpp) $(SRCS) | $(XGETTEXT) $(XGETFLAGS) -
$(SED) -e '/^domain/d' messages.po > $@
+ $(RM) messages.po
sb: $(SRCS)
$(COMPILE.c) -xsbfast $(SRCS)
--- a/usr/src/cmd/cmd-crypto/tpmadm/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/cmd-crypto/tpmadm/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -38,6 +38,8 @@
LINTFLAGS += -XCC -L$(ADJUNCT_PROTO)/usr/lib
LDLIBS += -ltspi -luuid
+CLOBBERFILES = C.ln $(POFILE) $(POFILES)
+
.KEEP_STATE:
all : $(PROG)
--- a/usr/src/cmd/cmd-inet/usr.bin/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/cmd-inet/usr.bin/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -56,6 +56,9 @@
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 @@
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-%)
--- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -124,7 +124,8 @@
_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 @@
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
--- a/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -35,6 +35,7 @@
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
--- a/usr/src/cmd/dcs/sparc/sun4u/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/dcs/sparc/sun4u/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -124,7 +124,7 @@
$(LINT) $(LINT_FLAGS) $(CPPFLAGS) $(LINT_SRCS)
clean:
- $(RM) $(PROG) $(OBJS) $(LINT_FILES) $(POFILES) $(POFILE) core
+ $(RM) $(PROG) $(OBJS) $(LINT_FILES)
$(POFILE): $(POFILES)
$(RM) $(POFILE)
--- a/usr/src/cmd/devfsadm/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/devfsadm/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -50,6 +50,7 @@
DEVFSADM_DIR = devfsadm
CLOBBERFILES = $(MODS) $(DEVLINKTAB) $(DEVFSCOMPATLINKS) $(DEVFSADM_DAEMON)
+CLOBBERFILES += $(POFILE) $(POFILES) ../plcysubr.c
LINK_OBJS_CMN = \
disk_link.o \
--- a/usr/src/cmd/dfs.cmds/sharectl/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/dfs.cmds/sharectl/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
.KEEP_STATE:
-all clean clobber lint _msg: $(SUBDIRS)
+all clean lint _msg: $(SUBDIRS)
+
+clobber: $(SUBDIRS)
+ $(RM) sharectl.po
install: $(SUBDIRS) $(ROOTETCDEFAULTFILES)
--- a/usr/src/cmd/dfs.cmds/sharectl/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/dfs.cmds/sharectl/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -46,7 +46,7 @@
OBJS = $(SHARECTL_OBJ)
MODS = $(SHARECTL_MOD)
-CLOBBERFILES = $(MODS)
+CLOBBERFILES = $(MODS) $(POFILE) $(POFILES) shareutil.c
POFILES = $(SHARECTL_SRC:.c=.po)
POFILE = sharectl.po
--- a/usr/src/cmd/dtrace/demo/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/dtrace/demo/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -135,14 +135,18 @@
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:
--- a/usr/src/cmd/dtrace/test/tst/common/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/dtrace/test/tst/common/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -40,6 +40,7 @@
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
--- a/usr/src/cmd/expand/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/expand/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
POFILES= expand_cmd.po unexpand.po
POFILE= expand.po
-CLEANFILES += expand_cmd.c
+CLOBBERFILES += expand_cmd.c
.KEEP_STATE:
--- a/usr/src/cmd/find/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/find/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -69,7 +69,7 @@
$(POST_PROCESS_O)
clean:
- $(RM) $(FINDOBJS)
+ $(RM) $(FINDOBJS) $(XPG4FINDOBJS)
lint: lint_SRCS
--- a/usr/src/cmd/fm/eversholt/eftinfo/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fm/eversholt/eftinfo/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(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)
--- a/usr/src/cmd/fm/eversholt/esc/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fm/eversholt/esc/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(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)
--- a/usr/src/cmd/fs.d/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -44,6 +44,8 @@
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 @@
-$(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)
--- a/usr/src/cmd/fs.d/Makefile.mount Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/Makefile.mount Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
POFILE= $(LIBPROG).po
CPPFLAGS += -I$(FSCOMMONDIR)
+
+# not $(OBJS) due to ../fslib.o
+CLEANFILES += $(LIBPROG).o
+CLOBBERFILES += $(LIBPROG) $(POFILE) $(FSTYPE).po
--- a/usr/src/cmd/fs.d/Makefile.mount.targ Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/Makefile.mount.targ Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(COMPILE.c) -o $@ $<
$(POST_PROCESS_O)
+clean:
+ $(RM) $(CLEANFILES)
+
lint: lint_SRCS
catalog: $(POFILE)
--- a/usr/src/cmd/fs.d/cachefs/cfsd/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/cachefs/cfsd/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
MDBUGLIB= ../mdbug/libdbug.a
CPPFLAGS += -I.. -D_REENTRANT
RPCGENFLAGS= -M -C -T
-CLOBBERFILES += $(LIBPROG_C)
+CLOBBERFILES += $(LIBPROG_C) cachefsd_tbl.i
all : $(LIBPROG_C)
--- a/usr/src/cmd/fs.d/nfs/umount/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/nfs/umount/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
lint: lint_SRCS
clean:
- $(RM) $(OBJS)
+ $(RM) $(LIBPROG).o replica.o
replica.o: ../lib/replica.c
$(COMPILE.c) ../lib/replica.c
--- a/usr/src/cmd/fs.d/pcfs/mkfs/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/pcfs/mkfs/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -43,12 +43,10 @@
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)
--- a/usr/src/cmd/fs.d/smbclnt/umount/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/smbclnt/umount/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -36,33 +36,30 @@
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
--- a/usr/src/cmd/fs.d/udfs/fsdb/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/udfs/fsdb/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -60,14 +60,18 @@
$(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 @@
$(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 :
--- a/usr/src/cmd/fs.d/udfs/fstyp/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/udfs/fstyp/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -49,6 +49,9 @@
#
PMAP=
+# No msg catalog here.
+POFILE=
+
OBJS= fstyp.o ud_lib.o
SRCS= $(OBJS:%.o=%.c)
@@ -78,6 +81,4 @@
$(CSTYLE) $(SRCS)
clean:
- $(RM) $(LIBPROG)
-
-clobber: clean
+ $(RM) $(OBJS)
--- a/usr/src/cmd/fs.d/ufs/clri/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/ufs/clri/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
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 @@
$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
$(POST_PROCESS)
+clean:
+ $(RM) $(LIBPROG).o
+
lint := PROG=$(LIBPROG)
lint: lint_PROG
--- a/usr/src/cmd/fs.d/ufs/df/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/ufs/df/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -53,4 +53,7 @@
$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
$(POST_PROCESS)
+clean:
+ $(RM) $(LIBPROG).o
+
lint: lint_SRCS
--- a/usr/src/cmd/fs.d/ufs/ff/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/ufs/ff/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -34,6 +34,9 @@
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 @@
$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
$(POST_PROCESS)
+clean:
+ $(RM) $(LIBPROG).o
+
lint: lint_SRCS
--- a/usr/src/cmd/fs.d/ufs/ncheck/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/ufs/ncheck/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
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
--- a/usr/src/cmd/fs.d/ufs/roll_log/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/fs.d/ufs/roll_log/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -29,11 +29,10 @@
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 @@
lint: lint_SRCS
-clean clobber:
+clean:
--- a/usr/src/cmd/geniconvtbl/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/geniconvtbl/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -79,7 +79,7 @@
CHECKHDRS = $(HDRS%.h=%.check)
-CLOBBERFILES= $(ITM)
+CLOBBERFILES= $(ITM) $(SRCYC)
CLEANFILES = $(OBJS) $(YTABC) $(YTABH) $(LEXYY) $(YOUT) \
$(POFILES) $(POFILE)
--- a/usr/src/cmd/hal/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/hal/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -47,7 +47,7 @@
all: $(SUBDIRS) $(HAL_CONF)
-clean: $(SUBDIRS)
+clean clobber: $(SUBDIRS)
install: $(SUBDIRS) $(ROOT_HAL_CONF)
--- a/usr/src/cmd/hal/hald/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/hal/hald/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -48,6 +48,8 @@
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 @@
install: all $(ROOTCMD) $(SUBDIRS)
clean: $(SUBDIRS)
- $(RM) $(OBJS) hald_marshal.c hald_marshal.h
+ $(RM) $(OBJS) $(OBJS_SOL)
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
--- a/usr/src/cmd/hal/tools/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/hal/tools/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
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
--- a/usr/src/cmd/hotplug/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/hotplug/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -51,6 +51,7 @@
$(CSTYLE) -pP $(SRCS:%=%)
clean:
+ $(RM) $(OBJS)
lint: lint_SRCS
--- a/usr/src/cmd/ipf/examples/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/ipf/examples/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -38,6 +38,8 @@
include ../../Makefile.cmd
+CLOBBERFILES = $(SHPROG)
+
SHAREIPF= $(ROOT)/usr/share/ipfilter
SHAREIPFX= $(SHAREIPF)/examples
@@ -63,8 +65,6 @@
clean:
-clobber:
-
install: all $(SHAREIPF) $(SHAREIPFX) \
$(IPFEXAMPLES) $(IPFEXSHPROG)
--- a/usr/src/cmd/ipf/tools/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/ipf/tools/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -54,17 +54,13 @@
.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
--- a/usr/src/cmd/ipf/tools/Makefile.tools Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/ipf/tools/Makefile.tools Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
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 @@
ippool := LDLIBS += -lsocket -lnsl -lkvm -lelf
CLEANFILES += $(OBJS)
+CLOBBERFILES += $(IPFPROG)
ROOTIPF= $(ROOTLIB)/ipf
ROOTIPF32= $(ROOTIPF)/$(MACH32)
@@ -80,6 +83,8 @@
ROOTIPFLINKS= $(IPFPROG:%=$(ROOTIPF)/%)
ROOTUSRSBINLINKS= $(PROG:%=$(ROOTUSRSBIN)/%)
+all:
+
$(ROOTIPF32):
$(INS.dir)
@@ -118,6 +123,9 @@
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.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 @@
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.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 @@
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.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 @@
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.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)
--- a/usr/src/cmd/isalist/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/isalist/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -29,6 +29,8 @@
include ../Makefile.cmd
+CLOBBERFILES += $(SHFILES)
+
FILEMODE= 0555
.KEEP_STATE:
--- a/usr/src/cmd/isns/isnsd/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/isns/isnsd/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -63,6 +63,8 @@
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
--- a/usr/src/cmd/keyserv/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/keyserv/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -119,7 +119,7 @@
$(ROOTMANIFEST)
clean:
- $(RM) $(OBJS)
+ $(RM) $(OBJS) $(OUTSIDE_UTIL_OBJS)
lint: lint_SRCS
--- a/usr/src/cmd/krb5/kadmin/kclient/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/krb5/kadmin/kclient/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -32,7 +32,7 @@
SECFILES= pam_krb5_first \
pam_krb5_only \
pam_krb5_optional
-CLOBBERFILES= $(SHFILES)
+CLOBBERFILES += $(SHFILES)
KRB5SBINSHFILES=$(SHFILES:%=$(KRB5SBIN)/%)
@@ -103,7 +103,7 @@
$(INS.file)
clean:
- $(RM) $(PROG) $(SHFILES)
+ $(RM) $(OBJS)
lint: lint_SRCS
--- a/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -39,6 +39,8 @@
LDLIBS += -lresolv -lnsl
+CLOBBERFILES += $(KLPROG)
+
.KEEP_STATE:
all: $(PROG) $(KLPROG)
@@ -55,6 +57,6 @@
$(LINT.c) $(CSRCS) $(LDLIBS)
clean:
- $(RM) $(PROG) $(KLPROG)
+ $(RM) $(OBJS)
include ../../../Makefile.targ
--- a/usr/src/cmd/ldapcachemgr/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/ldapcachemgr/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -102,7 +102,7 @@
check: $(CHKMANIFEST)
clean:
- ${RM} ${OBJS} ${POFILE} ${POFILES}
+ $(RM) $(OBJS) $(LINTOUT)
$(POFILE): $(POFILES)
$(RM) $@
--- a/usr/src/cmd/loadkeys/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/loadkeys/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -42,6 +42,8 @@
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-uninitialized
+CLOBBERFILES = $(PROG) loadkeys.c
+
.KEEP_STATE:
.PARALLEL: $(SUBDIRS)
@@ -74,7 +76,6 @@
$(RM) $(CLOBBERFILES)
clean: $(SUBDIRS)
- $(RM) loadkeys.c
lint:
$(LINT.c) dumpkeys.c $(LDLIBS)
--- a/usr/src/cmd/localedef/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/localedef/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -42,7 +42,9 @@
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 @@
$(RM) $(CLEANFILES)
$(RM) $(STAMPFILES)
+clobber: clean
+ $(RM) $(CLOBBERFILES)
+ $(RM) -r $(LOCDIRS)
+
$(POFILE): $(PIFILES)
$(RM) $@
$(RM) messages.po
@@ -258,7 +264,8 @@
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
--- a/usr/src/cmd/lp/filter/postscript/postreverse/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lp/filter/postscript/postreverse/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
install : all $(ROOTLIBLPPOSTPROG)
clean :
- $(RM) $(OBJS) core *~ *#
+ $(RM) $(OBJS)
strip :
$(STRIP) $(PROG)
--- a/usr/src/cmd/lvm/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
.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)
--- a/usr/src/cmd/lvm/md_monitord/i386/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/md_monitord/i386/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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.c} $(LINTFLAGS) ${SRCS}
clean:
- ${RM} ${OBJS} *.o a.out core
+ ${RM} ${OBJS} *.o
include $(SRC)/cmd/Makefile.targ
--- a/usr/src/cmd/lvm/md_monitord/sparc/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/md_monitord/sparc/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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.c} $(LINTFLAGS) ${SRCS}
clean:
- ${RM} ${OBJS} *.o a.out core
+ ${RM} ${OBJS} *.o
include $(SRC)/cmd/Makefile.targ
--- a/usr/src/cmd/lvm/metassist/Makefile.targ Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/metassist/Makefile.targ Fri Aug 23 18:31:03 2013 -0400
@@ -94,8 +94,7 @@
clobber: ${SUBDIRS}
clean: ${SUBDIRS}
- -${RM} *.o *.ln *.i *~ core a.out $(CLEANFILES) \
- *$(SUFFIX_LINT)
+ $(RM) *.o *.ln *.i *.lint $(CLEANFILES)
catalog: $(POFILE)
--- a/usr/src/cmd/lvm/rpc.mdcommd/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/rpc.mdcommd/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(RM) $@
cat $(POFILES) > $(POFILE)
-clean: $(SUBDIRS)
- $(RM) *.po
-
-lint: $(SUBDIRS)
+clean clobber lint: $(SUBDIRS)
install: $(SUBDIRS) $(ROOTMANIFEST)
--- a/usr/src/cmd/lvm/rpc.mdcommd/i386/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/rpc.mdcommd/i386/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
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 $@
--- a/usr/src/cmd/lvm/rpc.mdcommd/sparc/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/rpc.mdcommd/sparc/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
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 $@
--- a/usr/src/cmd/lvm/rpc.metad/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/rpc.metad/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(RM) $@
cat $(POFILES) > $(POFILE)
-clean: $(SUBDIRS)
- $(RM) metad_svc.c *.po
+CLOBBERFILES += metad_svc.c
-lint: $(SUBDIRS)
+clean clobber lint: $(SUBDIRS)
install: $(SUBDIRS) $(ROOTMANIFEST)
--- a/usr/src/cmd/lvm/rpc.metad/i386/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/rpc.metad/i386/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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.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 .
--- a/usr/src/cmd/lvm/rpc.metad/sparc/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/rpc.metad/sparc/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
metad_init.o \
metad_svc_subr.o
-
OBJECTS += $(DERIVED_FILES:.c=.o)
SRCS = $(OBJECTS:%.o=../%.c)
@@ -85,10 +83,10 @@
${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 .
--- a/usr/src/cmd/lvm/rpc.metamhd/i386/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/rpc.metamhd/i386/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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.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 .
--- a/usr/src/cmd/lvm/rpc.metamhd/sparc/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/rpc.metamhd/sparc/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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.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 .
--- a/usr/src/cmd/lvm/util/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/util/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
SCRIPTS = \
$(GROWFSSCRIPT)
-CLOBBERFILES = growfs
+CLOBBERFILES += growfs
SRCS = $(PROGS:%=%.c)
@@ -96,14 +95,17 @@
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)
--- a/usr/src/cmd/lvm/util/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/lvm/util/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
ROOTLIBSVM = $(ROOTLIB)/lvm
-CLOBBERFILES += $(ROOTFS_PROG)
+CLOBBERFILES += $(ROOTFS_PROG) $(METACLUST)
ROOTUSRSBINPROG = $(PROG:%=$(ROOTUSRSBIN)/%)
--- a/usr/src/cmd/mailx/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/mailx/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -70,6 +70,8 @@
LDLIBS += -lmail
LDFLAGS += $(MAPFILE.NGB:%=-M%)
+CLOBBERFILES += $(MAILXHELP)
+
# install rules
$(ROOTMAILXD)/% : %
$(INS.file)
--- a/usr/src/cmd/mdb/Makefile.module Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/mdb/Makefile.module Fri Aug 23 18:31:03 2013 -0400
@@ -134,7 +134,7 @@
dmods: install
clean.lint:
- $(RM) $(LINTFILES)
+ $(RM) $(LINTFILES) $(MODSRCS:.c=.ln)
clean:
$(RM) $(MODOBJS) $(KMODOBJS) $(CLEANFILES)
--- a/usr/src/cmd/modload/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/modload/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -105,7 +105,7 @@
$(POST_PROCESS)
clean:
- $(RM) $(OBJECTS) core
+ $(RM) $(OBJECTS)
lint_%.c:
$(LINT.c) $(@:lint_%.c=../%.c) $(COMMONSRC) $(LDLIBS)
--- a/usr/src/cmd/netadm/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/netadm/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -52,6 +52,8 @@
FILEMODE= 0644
+CLOBBERFILES += $(PMLOG)
+
$(ETCSAFD)/% : %
$(INS.file)
--- a/usr/src/cmd/oamuser/lib/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/oamuser/lib/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -73,6 +73,8 @@
ROOTUSRSADM= $(ROOT)/usr/sadm
ROOTUSRSADMFILE=$(DATEFILE:%=$(ROOTUSRSADM)/%)
+CLOBBERFILES += $(LIBRARY)
+
.KEEP_STATE:
all: $(PRODUCT) $(TXT)
--- a/usr/src/cmd/picl/plugins/common/memcfg/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/picl/plugins/common/memcfg/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
-R/usr/platform/sun4u/lib/picl/plugins
LDLIBS += -R/usr/lib/picl/plugins
+CLOBBERFILES += $(LIBLINKS)
+
.KEEP_STATE:
SUBDIRS=
--- a/usr/src/cmd/pools/poold/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/pools/poold/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -100,8 +100,13 @@
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)
--- a/usr/src/cmd/projadd/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/projadd/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -30,9 +30,11 @@
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 @@
$(INS.dir)
clobber: clean
- -$(RM) $(PROG) $(CLOBBERFILES)
+ $(RM) $(PROG) $(CLOBBERFILES)
$(ROOTUSRSBIN)/% : %
$(INS.file)
--- a/usr/src/cmd/ptools/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/ptools/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -80,7 +80,10 @@
.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)
--- a/usr/src/cmd/rcm_daemon/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/rcm_daemon/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -112,7 +112,7 @@
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)
--- a/usr/src/cmd/refer/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/refer/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -50,6 +50,8 @@
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-uninitialized
+CLOBBERFILES += $(PROG3)
+
addbib.po := XGETFLAGS += -a -x addbib.xcl
--- a/usr/src/cmd/sckmd/sparc/sun4u/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/sckmd/sparc/sun4u/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -78,7 +78,7 @@
$(LINT) $(LINT_FLAGS) $(CPPFLAGS) $(LINT_SRCS)
clean:
- $(RM) $(PROG) $(OBJS) *.po $(LINT_FILES) core
+ $(RM) $(PROG) $(OBJS) *.po $(LINT_FILES)
include ../../../Makefile.targ
--- a/usr/src/cmd/sendmail/cf/cf/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/sendmail/cf/cf/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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: $(ALL)
clean cleandir:
- $(RM) $(ALL) core
+ $(RM) $(ALL)
depend install:
--- a/usr/src/cmd/sgs/libelf/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/sgs/libelf/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -62,8 +62,6 @@
MAPFILES = ../common/mapfile-vers
-CLOBBERFILES +=
-
DYNFLAGS += $(VERSREF)
LDLIBS += $(CONVLIBDIR) $(CONV_LIB) -lc
--- a/usr/src/cmd/sgs/libelf/Makefile.targ Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/sgs/libelf/Makefile.targ Fri Aug 23 18:31:03 2013 -0400
@@ -63,6 +63,8 @@
$(RM) $(LIBLINKS)
$(SYMLINK) $(DYNLIB) $(LIBLINKS)
+CLOBBERFILES += $(LIBLINKS)
+
# include common library targets
#
include $(SRC)/lib/Makefile.targ
--- a/usr/src/cmd/sgs/libelf/Makefile.targ.64 Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/sgs/libelf/Makefile.targ.64 Fri Aug 23 18:31:03 2013 -0400
@@ -59,6 +59,8 @@
$(RM) $(LIBLINKS)
$(SYMLINK) $(DYNLIB) $(LIBLINKS)
+CLOBBERFILES += $(LIBLINKS)
+
# include common library targets
#
include $(SRC)/lib/Makefile.targ
--- a/usr/src/cmd/shcomp/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/shcomp/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -88,6 +88,9 @@
$(LINK.c) $(OBJECTS) -o $@ $(LDLIBS)
$(POST_PROCESS)
-clean lint:
+clean:
+ $(RM) $(OBJECTS)
+
+lint:
include ../Makefile.targ
--- a/usr/src/cmd/ssh/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/ssh/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -49,6 +49,8 @@
MSGFILE=ssh.po
POFILE=_messages.po
+CLOBBERFILES += $(MSGFILE) THIRDPARTYLICENSE
+
.KEEP_STATE:
all := TARGET= all
@@ -62,10 +64,10 @@
_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
--- a/usr/src/cmd/ssh/sshd/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/ssh/sshd/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -60,10 +60,11 @@
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 @@
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 @@
$(INS.dir)
clean:
- $(RM) -f $(OBJS) $(PROG)
+ $(RM) $(OBJS) $(EXTOBJS)
lint: lint_SRCS
--- a/usr/src/cmd/th_tools/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/th_tools/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -43,7 +43,7 @@
ROOTPROG = $(PROG:%=$(ROOTUSRSBIN)/%)
-CLOBBERFILES = $(PROG) $(SHFILE)
+CLOBBERFILES = $(PROG) $(SHFILES)
$(ROOTPROG) := FILEMODE = 0555
@@ -52,13 +52,13 @@
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)
--- a/usr/src/cmd/tip/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/tip/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -67,6 +67,8 @@
ACULIB= aculib/aculib.a
LDLIBS= $(ACULIB) $(LDLIBS.cmd)
+CLOBBERFILES += $(ACULOG)
+
# install rules
$(ROOTACULOGD)/% : %
$(INS.file)
--- a/usr/src/cmd/tip/aculib/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/tip/aculib/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -40,7 +40,7 @@
$(AR) cr $(ACULIB) $(OBJS)
clean:
- $(RM) $(ACULIB) $(OBJS) core errs
+ $(RM) $(ACULIB) $(OBJS)
lint:
$(LINT.c) $(OBJS:%.o=%.c) $(LDLIBS)
--- a/usr/src/cmd/troff/nroff.d/terms.d/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/troff/nroff.d/terms.d/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -1,5 +1,4 @@
#
-# ident "%Z%%M% %I% %E% SMI"
#
# Copyright (c) 1989 by Sun Microsystems, Inc.
#
@@ -51,4 +50,7 @@
$(ROOTLNKFILES) : $$(ROOTLNKDEST)
-$(RM) $@; $(LN) $(ROOTLNKDEST) $@
-clean clobber lint strip :
+clean lint strip :
+
+clobber:
+ $(RM) $(FILES)
--- a/usr/src/cmd/ypcmd/ypupdated/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/ypcmd/ypupdated/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -55,6 +55,8 @@
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc=-Wno-unused-variable
+CLOBBERFILES += ypupdated_prot.h
+
#conditional assignments
$(INETSVC) := FILEMODE=555
--- a/usr/src/cmd/zdb/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/zdb/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -60,6 +60,7 @@
$(POST_PROCESS)
clean:
+ $(RM) $(OBJS)
lint: lint_SRCS
--- a/usr/src/cmd/zhack/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/zhack/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -57,6 +57,7 @@
$(POST_PROCESS)
clean:
+ $(RM) $(OBJS)
lint: lint_SRCS
--- a/usr/src/cmd/zic/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/zic/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -50,6 +50,9 @@
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 @@
$(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)
--- a/usr/src/cmd/zinject/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/zinject/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -51,6 +51,7 @@
$(POST_PROCESS)
clean:
+ $(RM) $(OBJS)
lint: lint_SRCS
--- a/usr/src/cmd/zonecfg/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/zonecfg/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -46,6 +46,8 @@
CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-implicit-function-declaration
+CLOBBERFILES += $(PROG).ln
+
.KEEP_STATE:
all: $(PROG)
--- a/usr/src/cmd/ztest/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/cmd/ztest/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -57,6 +57,7 @@
$(POST_PROCESS)
clean:
+ $(RM) $(OBJS)
lint: lint_SRCS
--- a/usr/src/common/mapfiles/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/common/mapfiles/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
.KEEP_STATE:
-clean clobber lint package:
-
all: gen
install: $(SUBDIRS)
+clean lint package:
+
+clobber: gen
+
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
--- a/usr/src/lib/brand/shared/brand/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/brand/shared/brand/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
# 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 $@ $<
--- a/usr/src/lib/brand/shared/zone/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/brand/shared/zone/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(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 @@
install: $(ROOTSHARED)
clean:
- -$(RM) $(PROG) $(POFILES)
lint:
--- a/usr/src/lib/brand/solaris10/s10_support/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/brand/solaris10/s10_support/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -34,7 +34,6 @@
# override the install directory
ROOTBIN = $(ROOTBRANDDIR)
-CLOBBERFILES = $(OBJS) $(ROOTPROGS)
UTSBASE = $(SRC)/uts
@@ -47,7 +46,7 @@
install: all $(ROOTPROGS)
clean:
- $(RM) $(PROG) $(OBJS)
+ $(RM) $(OBJS)
lint: lint_PROG
--- a/usr/src/lib/cfgadm_plugins/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -46,11 +46,11 @@
.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)
--- a/usr/src/lib/cfgadm_plugins/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -70,6 +70,8 @@
INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@
+CLOBBERFILES += $(LIBRARY:.a=.po) generic.po
+
$(LINKED_DIRS): $(USR_PLAT_DIR)
-$(INS.dir)
--- a/usr/src/lib/cfgadm_plugins/ac/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/ac/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
.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)
--- a/usr/src/lib/cfgadm_plugins/fp/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/fp/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -49,7 +49,9 @@
.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 @@
$(RM) messages.po
FRC:
-
-include ../../Makefile.targ
--- a/usr/src/lib/cfgadm_plugins/ib/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/ib/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -48,7 +48,9 @@
.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)
--- a/usr/src/lib/cfgadm_plugins/pci/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/pci/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -48,7 +48,9 @@
.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)
--- a/usr/src/lib/cfgadm_plugins/sata/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/sata/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -48,7 +48,9 @@
.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)
--- a/usr/src/lib/cfgadm_plugins/sbd/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -49,7 +49,9 @@
.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)
--- a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -84,6 +84,8 @@
$(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
--- a/usr/src/lib/cfgadm_plugins/scsi/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -49,7 +49,9 @@
.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)
--- a/usr/src/lib/cfgadm_plugins/shp/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/shp/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -48,7 +48,9 @@
.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)
--- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
.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)
--- a/usr/src/lib/cfgadm_plugins/usb/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/cfgadm_plugins/usb/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -48,7 +48,9 @@
.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)
--- a/usr/src/lib/fm/topo/maps/Makefile.map Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/fm/topo/maps/Makefile.map Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(RM) $(TEMPTOPOFILE)
clobber: clean
+ $(RM) $(CLOBBERFILES)
check: $(CHECKHDRS)
--- a/usr/src/lib/fm/topo/maps/SUNW,Netra-X4200-M2/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/fm/topo/maps/SUNW,Netra-X4200-M2/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -37,4 +37,6 @@
PLATFORM = Netra-X4200-M2
TOPOBASE = ../i86pc/i86pc-hc-topology.xml
+CLOBBERFILES = $(TOPOFILE)
+
include ../Makefile.map
--- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-M2/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-M2/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
PLATFORM = Sun-Fire-X4200-M2
TOPOBASE = ../i86pc/i86pc-hc-topology.xml
+CLOBBERFILES = $(TOPOFILE)
+
include ../Makefile.map
--- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-Server/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-Server/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
PLATFORM = Sun-Fire-X4200
TOPOBASE = ../i86pc/i86pc-hc-topology.xml
+CLOBBERFILES = $(TOPOFILE)
+
include ../Makefile.map
--- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4500/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4500/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
PLATFORM = Sun-Fire-X4500
TOPOBASE = ../i86pc/i86pc-hc-topology.xml
+CLOBBERFILES = $(TOPOFILE)
+
include ../Makefile.map
--- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
PLATFORM = Sun-Fire-X4540
TOPOBASE = ../i86pc/i86pc-hc-topology.xml
+CLOBBERFILES = $(TOPOFILE)
+
include ../Makefile.map
--- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4600-M2/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4600-M2/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -37,4 +37,6 @@
PLATFORM = Sun-Fire-X4600-M2
TOPOBASE = ../i86pc/i86pc-hc-topology.xml
+CLOBBERFILES = $(TOPOFILE)
+
include ../Makefile.map
--- a/usr/src/lib/fm/topo/maps/i86pc/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/fm/topo/maps/i86pc/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -34,4 +34,6 @@
PLATFORM = unused
TOPOBASE = i86pc-hc-topology.xml
+CLOBBERFILES = fan-hc-topology.xml
+
include ../Makefile.map
--- a/usr/src/lib/fm/topo/modules/Makefile.plugin Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/fm/topo/modules/Makefile.plugin Fri Aug 23 18:31:03 2013 -0400
@@ -100,7 +100,7 @@
$(RM) $(OBJS) $(LINTFILES) $(CLEANFILES)
clobber: clean
- $(RM) $(PROG)
+ $(RM) $(PROG) $(CLOBBERFILES)
%.ln: ../../common/$(MODULE)/%.c
$(LINT.c) -c $<
--- a/usr/src/lib/fm/topo/modules/common/ses/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/fm/topo/modules/common/ses/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -35,3 +35,5 @@
LDLIBS += -L$(ROOTLIBDIR)/scsi -R/usr/lib/scsi -lses
LDLIBS += -ldevinfo -ldevid -ldiskstatus -lcontract -lsysevent
+
+CLOBBERFILES += disk_common.ln
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -564,6 +564,9 @@
$(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)
--- a/usr/src/lib/krb5/kadm5/clnt/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/krb5/kadm5/clnt/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
.KEEP_STATE:
-all clean clobber install lint: $(SUBDIRS)
+all clean install lint: $(SUBDIRS)
+clobber: $(SUBDIRS)
+ $(RM) $(CLOBBERFILES)
_msg: $(MSGDOMAIN) .WAIT $(POFILE)
$(RM) $(MSGDOMAIN)/$(POFILE)
--- a/usr/src/lib/krb5/ss/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/krb5/ss/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
.KEEP_STATE:
-all clean clobber install lint: $(SUBDIRS)
+all clean install lint: $(SUBDIRS)
+clobber: $(SUBDIRS)
+ $(RM) $(CLOBBERFILES)
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
--- a/usr/src/lib/libbe/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libbe/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -56,6 +56,8 @@
CERRWARN += -_gcc=-Wno-uninitialized
CERRWARN += -_gcc=-Wno-address
+CLOBBERFILES += $(LIBRARY)
+
$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC)
.KEEP_STATE:
--- a/usr/src/lib/libc/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libc/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -108,6 +108,8 @@
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 @@
$(SUBDIRS): FRC
@cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET)
-clean clobber: $(SUBDIRS)
+clean: $(SUBDIRS)
+clobber: $(SUBDIRS) etc clobber_local
+clobber_local:
+ $(RM) $(CLOBBERFILES)
lint: $(SUBDIRS)
--- a/usr/src/lib/libcurses/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libcurses/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
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)
--- a/usr/src/lib/libdns_sd/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libdns_sd/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
all install: install_h $(SUBDIRS) .WAIT java
-clean clobber: $(SUBDIRS)
+clean clobber: $(SUBDIRS) java
ROOTHDRDIR= $(ROOT)/usr/include
ROOTHDRS= $(HDR:%=$(ROOTHDRDIR)/%)
--- a/usr/src/lib/libdtrace/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libdtrace/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -117,8 +117,9 @@
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)
--- a/usr/src/lib/libfsmgt/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libfsmgt/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -54,6 +54,10 @@
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)
--- a/usr/src/lib/libldap5/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libldap5/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
.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"
--- a/usr/src/lib/libntfs/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libntfs/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -46,7 +46,9 @@
.KEEP_STATE:
-all clean clobber delete install package: $(SUBDIRS)
+all clean delete install package: $(SUBDIRS)
+clobber: $(SUBDIRS)
+ $(RM) $(CLOBBERFILES)
all install: THIRDPARTYLICENSE
--- a/usr/src/lib/libresolv2/include/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libresolv2/include/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(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
--- a/usr/src/lib/libsec/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libsec/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -51,6 +51,8 @@
CERRWARN += -_gcc=-Wno-unused-label
CERRWARN += -_gcc=-Wno-unused-variable
+CLOBBERFILES += acl.output
+
# install this library in the root filesystem
include ../../Makefile.rootfs
--- a/usr/src/lib/libshell/Makefile.doc Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libshell/Makefile.doc Fri Aug 23 18:31:03 2013 -0400
@@ -78,6 +78,8 @@
$(INS) -s -m $(FILEMODE) -f "$(@D)" "$(@F)"
$(RM) "$(@F)"
+CLOBBERFILES += xsltproc.log
+
# Generic documentation rules
DOCFILESRCDIR= common
ROOTDOCFILES= $(DOCFILES:%=$(ROOTDOCDIRBASE)/%)
--- a/usr/src/lib/libsldap/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libsldap/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -46,7 +46,9 @@
.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)/%: %
--- a/usr/src/lib/libuutil/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libuutil/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
_msg: $(MSGDOMAINPOFILE)
-naive $(SUBDIRS): FRC
+native $(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
FRC:
--- a/usr/src/lib/libuutil/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libuutil/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -60,6 +60,7 @@
../common/uu_strtoint.c
LINTS = $(OBJECTS:%.o=%.ln)
+CLOBBERFILES += $(LINTS)
SRCDIR = ../common
$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC)
--- a/usr/src/lib/libuutil/native/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libuutil/native/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
# 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)
--- a/usr/src/lib/libwanbootutil/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libwanbootutil/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -94,6 +94,8 @@
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
--- a/usr/src/lib/libzpool/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/libzpool/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -54,6 +54,7 @@
INCS += -I../../../common
CLEANFILES += ../common/zfs.h
+CLEANFILES += $(EXTPICS)
$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC)
$(LINTLIB): ../common/zfs.h
--- a/usr/src/lib/madv/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/madv/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
.KEEP_STATE:
-all install clean clobber lint: $(SUBDIRS)
+all install clean lint: $(SUBDIRS)
+clobber: $(SUBDIRS)
+ $(RM) $(POFILE)
$(POFILE): pofile_MSGFILES
--- a/usr/src/lib/mpss/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/mpss/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
.KEEP_STATE:
-all install clean clobber lint: $(SUBDIRS)
+all install clean lint: $(SUBDIRS)
+clobber: $(SUBDIRS)
+ $(RM) $(POFILE)
$(POFILE): pofile_MSGFILES
--- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -87,6 +87,8 @@
$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC)
LINTSRC= $(SRCS)
+CLOBBERFILES += C.ln
+
.KEEP_STATE:
all: $(LIBS)
--- a/usr/src/lib/print/libpapi-lpd/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/print/libpapi-lpd/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -55,6 +55,8 @@
LDLIBS += -lc
+CLOBBERFILES += $(PROG)
+
.KEEP_STATE:
all: $(LIBS) $(PROG)
--- a/usr/src/lib/pysolaris/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/pysolaris/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -35,12 +35,17 @@
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
--- a/usr/src/lib/pyzfs/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/lib/pyzfs/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -35,12 +35,17 @@
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
--- a/usr/src/msg/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/msg/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -64,6 +64,9 @@
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.
--- a/usr/src/pkg/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/pkg/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -205,7 +205,8 @@
# 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
--- a/usr/src/psm/stand/lib/boot/sparc/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/psm/stand/lib/boot/sparc/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(RM) $(OBJS) $(L_OBJS)
clobber: clean
- $(RM) $(LIBBOOT) $(LINTLIBBOOT) a.out core
+ $(RM) $(LIBBOOT) $(LINTLIBBOOT)
$(LIBBOOT): $(OBJSDIR) .WAIT $(OBJS)
$(BUILD.AR) $(OBJS)
--- a/usr/src/psm/stand/lib/boot/sparcv9/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/psm/stand/lib/boot/sparcv9/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(RM) $(OBJS) $(L_OBJS)
clobber: clean
- $(RM) $(LIBBOOT) $(LINTLIBBOOT) a.out core
+ $(RM) $(LIBBOOT) $(LINTLIBBOOT)
$(LIBBOOT): $(OBJSDIR) .WAIT $(OBJS)
$(BUILD.AR) $(OBJS)
--- a/usr/src/psm/stand/lib/names/sparcv9/Makefile.com Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/psm/stand/lib/names/sparcv9/Makefile.com Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
$(RM) $(OBJS) $(L_OBJS)
clobber: clean
- $(RM) $(LIBNAMES) $(LINTLIBNAMES) a.out core
+ $(RM) $(LIBNAMES) $(LINTLIBNAMES)
$(LIBNAMES): $(OBJSDIR) .WAIT $(OBJS)
$(BUILD.AR) $(OBJS)
--- a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/common/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/common/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -113,7 +113,7 @@
$(RM) $(OBJS) $(L_OBJS)
clobber: clean
- $(RM) $(LIBPROM) $(LINTLIBPROM) a.out core
+ $(RM) $(LIBPROM) $(LINTLIBPROM)
$(LIBPROM): $(OBJSDIR) .WAIT $(OBJS)
$(BUILD.AR) $(OBJS)
--- a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -92,7 +92,7 @@
$(RM) $(OBJS) $(L_OBJS)
clobber: clean
- $(RM) $(LIBPLAT) $(LINTLIBPLAT) a.out core
+ $(RM) $(LIBPLAT) $(LINTLIBPLAT)
$(LIBPLAT): $(OBJSDIR) .WAIT $(OBJS)
$(BUILD.AR) $(OBJS)
--- a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4u/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4u/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -96,7 +96,7 @@
$(RM) $(OBJS) $(L_OBJS)
clobber: clean
- $(RM) $(LIBPLAT) $(LINTLIBPLAT) a.out core
+ $(RM) $(LIBPLAT) $(LINTLIBPLAT)
$(LIBPLAT): $(OBJSDIR) .WAIT $(OBJS)
$(BUILD.AR) $(OBJS)
--- a/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4v/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4v/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -94,7 +94,7 @@
$(RM) $(OBJS) $(L_OBJS)
clobber: clean
- $(RM) $(LIBPLAT) $(LINTLIBPLAT) a.out core
+ $(RM) $(LIBPLAT) $(LINTLIBPLAT)
$(LIBPLAT): $(OBJSDIR) .WAIT $(OBJS)
$(BUILD.AR) $(OBJS)
--- a/usr/src/uts/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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_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/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 @@
# 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 @@
$(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)
--- a/usr/src/uts/common/Makefile.rules Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/common/Makefile.rules Fri Aug 23 18:31:03 2013 -0400
@@ -1574,24 +1574,6 @@
@($(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
--- a/usr/src/uts/common/avs/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/common/avs/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -36,11 +36,14 @@
# 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)
--- a/usr/src/uts/common/gssapi/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/common/gssapi/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -88,3 +88,5 @@
clean:
$(RM) $(DERIVED_FILES)
+
+clobber: clean
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/common/io/fibre-channel/fca/qlc/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/common/io/lvm/md/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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:
--- a/usr/src/uts/common/rpc/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/common/rpc/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -89,6 +89,8 @@
clean:
$(RM) $(DERIVED_FILES)
+clobber: clean
+
$(RPCDIRS):
$(INS.dir)
--- a/usr/src/uts/common/sys/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/common/sys/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -1373,12 +1373,13 @@
$(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)
--- a/usr/src/uts/common/sys/lvm/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/common/sys/lvm/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
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 } \
--- a/usr/src/uts/i86pc/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86pc/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -40,12 +40,14 @@
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 @@
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:
@-$(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)
--- a/usr/src/uts/i86pc/dr/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86pc/dr/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -76,7 +76,7 @@
# module dependencies
#
LDFLAGS += -dy -Nmisc/drmach_acpi
-
+
CLEANFILES += $(DR_GENERR)
CLEANFILES += $(DR_IO)/dr_err.c
@@ -89,9 +89,11 @@
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 @@
# Include common targets.
#
include $(UTSBASE)/i86pc/Makefile.targ
-
--- a/usr/src/uts/i86pc/drmach_acpi/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86pc/drmach_acpi/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -83,9 +83,11 @@
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)
--- a/usr/src/uts/i86pc/genassym/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86pc/genassym/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -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 @@
# 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.
--- a/usr/src/uts/i86pc/gfx_private/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86pc/gfx_private/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -74,6 +74,8 @@
CERRWARN += -_gcc=-Wno-uninitialized
CERRWARN += -_gcc=-Wno-parentheses
+CLOBBERFILES += $(OBJS_DIR)/$(VGATEXT_FONT).c
+
#
# Default build targets.
#
--- a/usr/src/uts/i86pc/unix/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86pc/unix/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -98,6 +98,7 @@
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 @@
$(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)
--- a/usr/src/uts/i86xpv/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86xpv/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -42,12 +42,14 @@
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 @@
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:
@-$(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)
--- a/usr/src/uts/i86xpv/gfx_private/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86xpv/gfx_private/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -70,6 +70,8 @@
CERRWARN += -_gcc=-Wno-uninitialized
CERRWARN += -_gcc=-Wno-parentheses
+CLOBBERFILES += $(OBJS_DIR)/$(VGATEXT_FONT).c
+
#
# Default build targets.
#
--- a/usr/src/uts/i86xpv/unix/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86xpv/unix/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -95,6 +95,7 @@
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 @@
$(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)
--- a/usr/src/uts/i86xpv/xdb/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86xpv/xdb/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -72,9 +72,11 @@
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)
--- a/usr/src/uts/i86xpv/xnb/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86xpv/xnb/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -87,9 +87,11 @@
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)
--- a/usr/src/uts/i86xpv/xnbe/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86xpv/xnbe/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -81,9 +81,11 @@
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)
--- a/usr/src/uts/i86xpv/xnbo/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86xpv/xnbo/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -81,9 +81,11 @@
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)
--- a/usr/src/uts/i86xpv/xnbu/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86xpv/xnbu/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -81,9 +81,11 @@
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)
--- a/usr/src/uts/i86xpv/xpvtap/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/i86xpv/xpvtap/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -86,9 +86,11 @@
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)
--- a/usr/src/uts/intel/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/intel/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -76,6 +76,7 @@
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): $(PRIVS_AWK) $(PRIVS_DEF)
$(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@
+CLOBBERFILES += $(PRIVS_C)
+
#
# Prerequisites
#
--- a/usr/src/uts/intel/audioemu10k/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/intel/audioemu10k/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -100,6 +100,8 @@
$(CPP) -D$(MODEL10K) -I$(DSP_SRCDIR) $(DSP_SRCDIR)/emu10k.dsp | \
$(OBJS_DIR)/asm10k $(ASM10KFLAGS) -h $@
+CLOBBERFILES += $(ASM10K) $(DSP_HDRS)
+
#
# Include common targets.
#
--- a/usr/src/uts/intel/config/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/intel/config/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -116,14 +116,15 @@
$(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.
--- a/usr/src/uts/intel/genunix/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/intel/genunix/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -68,6 +68,7 @@
#
# Overrides
#
+CLOBBERFILES += $(GENUNIX)
CLEANFILES += $(LIBSTUBS) $(LIBGEN)
BINARY =
--- a/usr/src/uts/intel/hwa1480_fw/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/intel/hwa1480_fw/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -68,6 +68,9 @@
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 @@
all: $(ALL_DEPS)
clean: $(CLEAN_DEPS)
- $(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
clobber: $(CLOBBER_DEPS)
- $(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
lint: $(LINT_DEPS)
--- a/usr/src/uts/intel/ip/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/intel/ip/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -103,7 +103,10 @@
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)
--- a/usr/src/uts/intel/mwlfw/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/intel/mwlfw/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -75,8 +75,6 @@
all: $(ALL_DEPS)
clean: $(CLEAN_DEPS)
- $(RM) $(BINDEST)/$(FWBINCOPY)
- $(RM) $(BINDEST)/$(BOOTBINCOPY)
clobber: $(CLOBBER_DEPS)
@@ -109,6 +107,9 @@
cp $(BINSRC)/$(ORIGIN_BOOTBIN) $(BINDEST)/$(BOOTBINCOPY)
$(ELFWRAP) $(WRAPOPT) -o $@ $(BINDEST)/$(FWBINCOPY) $(BINDEST)/$(BOOTBINCOPY)
+CLOBBERFILES += $(BINDEST)/$(FWBINCOPY)
+CLOBBERFILES += $(BINDEST)/$(BOOTBINCOPY)
+
#
# Include common targets.
#
--- a/usr/src/uts/intel/qlc/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/intel/qlc/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -67,7 +67,6 @@
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 += 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 @@
#
.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)
-
-clean: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_DEPS)
+def: $(DEF_DEPS)
-clobber: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLOBBER_DEPS)
-
-lint: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(LINT_DEPS)
+clean: $(CLEAN_DEPS)
-modlintlib: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(MODLINTLIB_DEPS)
-
-clean.lint: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_LINT_DEPS)
+clobber: $(CLOBBER_DEPS)
-install: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(INSTALL_DEPS)
+lint: $(LINT_DEPS)
+
+modlintlib: $(MODLINTLIB_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 '};' >> $@
+clean.lint: $(CLEAN_LINT_DEPS)
+
+install: $(INSTALL_DEPS)
#
# Include common targets.
--- a/usr/src/uts/intel/uathfw/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/intel/uathfw/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -75,7 +75,6 @@
all: $(ALL_DEPS)
clean: $(CLEAN_DEPS)
- $(RM) $(BINDEST)/$(BINCOPY)
clobber: $(CLOBBER_DEPS)
@@ -105,6 +104,8 @@
cp $(BINSRC)/$(ORIGIN_SRC) $(BINDEST)/$(BINCOPY)
$(ELFWRAP) $(WRAPOPT) -o $@ $(BINDEST)/$(BINCOPY)
+CLOBBERFILES += $(BINDEST)/$(BINCOPY)
+
#
# Include common targets.
#
--- a/usr/src/uts/sparc/config/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/sparc/config/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -79,14 +79,15 @@
$(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.
--- a/usr/src/uts/sparc/qlc/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/sparc/qlc/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -67,7 +67,6 @@
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 += 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 @@
#
.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)
-
-clean: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_DEPS)
+def: $(DEF_DEPS)
-clobber: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLOBBER_DEPS)
-
-lint: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(LINT_DEPS)
+clean: $(CLEAN_DEPS)
-modlintlib: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(MODLINTLIB_DEPS)
-
-clean.lint: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_LINT_DEPS)
+clobber: $(CLOBBER_DEPS)
-install: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(INSTALL_DEPS)
+lint: $(LINT_DEPS)
+
+modlintlib: $(MODLINTLIB_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 '};' >> $@
+clean.lint: $(CLEAN_LINT_DEPS)
+
+install: $(INSTALL_DEPS)
#
# Include common targets.
--- a/usr/src/uts/sun4u/Makefile Thu Aug 29 02:33:28 2013 +0400
+++ b/usr/src/uts/sun4u/Makefile Fri Aug 23 18:31:03 2013 -0400
@@ -83,6 +83,8 @@
$(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): $(PRIVS_AWK) $(PRIVS_DEF)
$(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@
+CLOBBERFILES += $(PRIVS_C)
#
# Prerequisites