diff options
Diffstat (limited to 'usr/src/lib')
52 files changed, 140 insertions, 65 deletions
diff --git a/usr/src/lib/brand/shared/brand/Makefile.com b/usr/src/lib/brand/shared/brand/Makefile.com index de2decae37..7d9a4ee554 100644 --- a/usr/src/lib/brand/shared/brand/Makefile.com +++ b/usr/src/lib/brand/shared/brand/Makefile.com @@ -21,6 +21,8 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# Copyright 2013 Nexenta Systems, Inc. All rights reserved. +# COBJS = brand_util.o ASOBJS = crt.o handler.o runexe.o @@ -57,14 +59,18 @@ ASFLAGS = -P $(ASFLAGS_$(CURTYPE)) -D_ASM -I. -I../sys # build the offset header before trying to compile any files. (it's included # by brand_misc.h, so it's needed for all objects, not just assembly ones.) # -all: $(OFFSETS_H) pics .WAIT $(PICS) +# Note we have to build assym.h via its dependency on pics/% so that the +# target dependent assignment of CTF_FLAGS will be there, otherwise make +# will see two different commands to build it (endless rebuilds). +# +all: pics .WAIT $$(PICS) lint: lintcheck $(OBJECTS:%=pics/%): $(OFFSETS_H) $(OFFSETS_H): $(OFFSETS_SRC) - $(OFFSETS_CREATE) $(CTF_FLAGS) < $(OFFSETS_SRC) >$@ + $(OFFSETS_CREATE) < $(OFFSETS_SRC) >$@ pics/%.o: $(ISASRCDIR)/%.s $(COMPILE.s) -o $@ $< diff --git a/usr/src/lib/brand/shared/zone/Makefile b/usr/src/lib/brand/shared/zone/Makefile index 9a768d62dd..cede2f17b5 100644 --- a/usr/src/lib/brand/shared/zone/Makefile +++ b/usr/src/lib/brand/shared/zone/Makefile @@ -25,7 +25,6 @@ PROG=query SHARED= common.ksh query uninstall.ksh -CLOBBERFILES= query include $(SRC)/cmd/Makefile.cmd include ../../Makefile.brand @@ -33,8 +32,6 @@ include ../../Makefile.brand $(ROOTSHAREDDIR)/common.ksh := FILEMODE = 0444 $(ROOTSHAREDDIR)/uninstall.ksh := FILEMODE = 0444 -CLOBBERFILES= $(ROOTSHARED) $(PROG) - POFILES= common.po query.po uninstall.po POFILE= shared.po @@ -47,7 +44,6 @@ all: $(PROG) install: $(ROOTSHARED) clean: - -$(RM) $(PROG) $(POFILES) lint: diff --git a/usr/src/lib/brand/solaris10/s10_support/Makefile b/usr/src/lib/brand/solaris10/s10_support/Makefile index de3402ee31..0c3015084f 100644 --- a/usr/src/lib/brand/solaris10/s10_support/Makefile +++ b/usr/src/lib/brand/solaris10/s10_support/Makefile @@ -34,7 +34,6 @@ include $(SRC)/cmd/Makefile.cmd # override the install directory ROOTBIN = $(ROOTBRANDDIR) -CLOBBERFILES = $(OBJS) $(ROOTPROGS) UTSBASE = $(SRC)/uts @@ -47,7 +46,7 @@ LDLIBS += -lzonecfg install: all $(ROOTPROGS) clean: - $(RM) $(PROG) $(OBJS) + $(RM) $(OBJS) lint: lint_PROG diff --git a/usr/src/lib/cfgadm_plugins/Makefile b/usr/src/lib/cfgadm_plugins/Makefile index 465b417ab0..00d258b20a 100644 --- a/usr/src/lib/cfgadm_plugins/Makefile +++ b/usr/src/lib/cfgadm_plugins/Makefile @@ -46,11 +46,11 @@ _msg:= TARGET= _msg .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean lint: $(SUBDIRS) install: all $(SUBDIRS) -_msg: $(MSGSUBDIRS) +_msg clobber: $(MSGSUBDIRS) $(ALL_SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/Makefile.com b/usr/src/lib/cfgadm_plugins/Makefile.com index 21dea666a6..d6f4bf6782 100644 --- a/usr/src/lib/cfgadm_plugins/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/Makefile.com @@ -70,6 +70,8 @@ LINKED_CFG_DIRS = $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/cfgadm) INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ +CLOBBERFILES += $(LIBRARY:.a=.po) generic.po + $(LINKED_DIRS): $(USR_PLAT_DIR) -$(INS.dir) diff --git a/usr/src/lib/cfgadm_plugins/ac/Makefile b/usr/src/lib/cfgadm_plugins/ac/Makefile index 95e242d6c6..a12d1f6b36 100644 --- a/usr/src/lib/cfgadm_plugins/ac/Makefile +++ b/usr/src/lib/cfgadm_plugins/ac/Makefile @@ -27,7 +27,8 @@ include $(SRC)/Makefile.master -SUBDIRS= $(MACH) $(BUILD64) $(MACH64) +SUBDIRS= +$(SPARC_BLD)SUBDIRS= $(MACH) $(BUILD64) $(MACH64) all := TARGET= all clean := TARGET= clean @@ -49,7 +50,9 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint catalog package: $(SUBDIRS) +all clean delete install lint catalog package: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILES) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/fp/Makefile b/usr/src/lib/cfgadm_plugins/fp/Makefile index 22bf6ff9df..ad6dff9a56 100644 --- a/usr/src/lib/cfgadm_plugins/fp/Makefile +++ b/usr/src/lib/cfgadm_plugins/fp/Makefile @@ -49,7 +49,9 @@ CP= cp .KEEP_STATE: -all lint clean clobber delete install package: $(SUBDIRS) +all lint clean delete install package: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILES) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) @@ -69,5 +71,3 @@ $(POFILES): $(RM) messages.po FRC: - -include ../../Makefile.targ diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile b/usr/src/lib/cfgadm_plugins/ib/Makefile index 542c3fb066..b73c5c7610 100644 --- a/usr/src/lib/cfgadm_plugins/ib/Makefile +++ b/usr/src/lib/cfgadm_plugins/ib/Makefile @@ -48,7 +48,9 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean delete install lint package: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILES) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile b/usr/src/lib/cfgadm_plugins/pci/Makefile index b16a8f9450..fee3e0b482 100644 --- a/usr/src/lib/cfgadm_plugins/pci/Makefile +++ b/usr/src/lib/cfgadm_plugins/pci/Makefile @@ -48,7 +48,9 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean delete install lint package: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILES) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile b/usr/src/lib/cfgadm_plugins/sata/Makefile index 5f9f32c9e8..bf06374ab2 100644 --- a/usr/src/lib/cfgadm_plugins/sata/Makefile +++ b/usr/src/lib/cfgadm_plugins/sata/Makefile @@ -48,7 +48,9 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean delete install lint package: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILES) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile b/usr/src/lib/cfgadm_plugins/sbd/Makefile index 2862630511..bd7c451e96 100644 --- a/usr/src/lib/cfgadm_plugins/sbd/Makefile +++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile @@ -49,7 +49,9 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean delete install lint package: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILES) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com index b3d7040f9c..8e6083ac46 100644 --- a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com +++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com @@ -84,6 +84,8 @@ $(USR_PSM_LIB_CFG_DIR)/%: % $(USR_PSM_LIB_CFG_DIR) $(USR_PSM_LIB_CFG_DIR_64)/%: % $(USR_PSM_LIB_CFG_DIR_64) -$(INS.file) +CLOBBERFILES += ../common/ap_err.c sbdgenerr $(GENERR) + # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile b/usr/src/lib/cfgadm_plugins/scsi/Makefile index cb93c53c20..9b832a5972 100644 --- a/usr/src/lib/cfgadm_plugins/scsi/Makefile +++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile @@ -49,7 +49,9 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean delete install lint package: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILES) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/shp/Makefile b/usr/src/lib/cfgadm_plugins/shp/Makefile index dfb0481783..416ab9dfcf 100644 --- a/usr/src/lib/cfgadm_plugins/shp/Makefile +++ b/usr/src/lib/cfgadm_plugins/shp/Makefile @@ -48,7 +48,9 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean delete install lint package: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILES) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile index 7be087cc2e..a71d4d781b 100644 --- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile +++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile @@ -27,7 +27,8 @@ include $(SRC)/Makefile.master -SUBDIRS= $(MACH) $(BUILD64) $(MACH64) +SUBDIRS= +$(SPARC_BLD)SUBDIRS= $(MACH) $(BUILD64) $(MACH64) all := TARGET= all clean := TARGET= clean @@ -48,7 +49,9 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean delete install lint package: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILES) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile b/usr/src/lib/cfgadm_plugins/usb/Makefile index 981437b77e..2e0731182d 100644 --- a/usr/src/lib/cfgadm_plugins/usb/Makefile +++ b/usr/src/lib/cfgadm_plugins/usb/Makefile @@ -48,7 +48,9 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install lint package: $(SUBDIRS) +all clean delete install lint package: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILES) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/fm/topo/maps/Makefile.map b/usr/src/lib/fm/topo/maps/Makefile.map index b72cd29d74..adfff59002 100644 --- a/usr/src/lib/fm/topo/maps/Makefile.map +++ b/usr/src/lib/fm/topo/maps/Makefile.map @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" .KEEP_STATE: .SUFFIXES: @@ -68,6 +67,7 @@ clean: $(RM) $(TEMPTOPOFILE) clobber: clean + $(RM) $(CLOBBERFILES) check: $(CHECKHDRS) diff --git a/usr/src/lib/fm/topo/maps/SUNW,Netra-X4200-M2/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Netra-X4200-M2/Makefile index 1a84db38f4..63030527e4 100644 --- a/usr/src/lib/fm/topo/maps/SUNW,Netra-X4200-M2/Makefile +++ b/usr/src/lib/fm/topo/maps/SUNW,Netra-X4200-M2/Makefile @@ -37,4 +37,6 @@ SRCDIR = ../SUNW,Netra-X4200-M2 PLATFORM = Netra-X4200-M2 TOPOBASE = ../i86pc/i86pc-hc-topology.xml +CLOBBERFILES = $(TOPOFILE) + include ../Makefile.map diff --git a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-M2/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-M2/Makefile index 5c46801512..072d396f4f 100644 --- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-M2/Makefile +++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-M2/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" # NOTE: The name of the xml file we are building is 'platform' # specific, but its build is structured as 'arch' specific since @@ -38,4 +37,6 @@ SRCDIR = ../SUNW,Sun-Fire-X4200-M2 PLATFORM = Sun-Fire-X4200-M2 TOPOBASE = ../i86pc/i86pc-hc-topology.xml +CLOBBERFILES = $(TOPOFILE) + include ../Makefile.map diff --git a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-Server/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-Server/Makefile index 0bfb5dc315..3d0548b57b 100644 --- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-Server/Makefile +++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-Server/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" # NOTE: The name of the xml file we are building is 'platform' # specific, but its build is structured as 'arch' specific since @@ -38,4 +37,6 @@ SRCDIR = ../SUNW,Sun-Fire-X4200-Server PLATFORM = Sun-Fire-X4200 TOPOBASE = ../i86pc/i86pc-hc-topology.xml +CLOBBERFILES = $(TOPOFILE) + include ../Makefile.map diff --git a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4500/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4500/Makefile index bdf763ffdb..5a21f4d313 100644 --- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4500/Makefile +++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4500/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" # NOTE: The name of the xml file we are building is 'platform' # specific, but its build is structured as 'arch' specific since @@ -38,4 +37,6 @@ SRCDIR = ../SUNW,Sun-Fire-X4500 PLATFORM = Sun-Fire-X4500 TOPOBASE = ../i86pc/i86pc-hc-topology.xml +CLOBBERFILES = $(TOPOFILE) + include ../Makefile.map diff --git a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile index bb8668635a..6a8255e366 100644 --- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile +++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" # NOTE: The name of the xml file we are building is 'platform' # specific, but its build is structured as 'arch' specific since @@ -38,4 +37,6 @@ SRCDIR = ../SUNW,Sun-Fire-X4540 PLATFORM = Sun-Fire-X4540 TOPOBASE = ../i86pc/i86pc-hc-topology.xml +CLOBBERFILES = $(TOPOFILE) + include ../Makefile.map diff --git a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4600-M2/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4600-M2/Makefile index dae8fed240..e7b09b9631 100644 --- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4600-M2/Makefile +++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4600-M2/Makefile @@ -37,4 +37,6 @@ SRCDIR = ../SUNW,Sun-Fire-X4600-M2 PLATFORM = Sun-Fire-X4600-M2 TOPOBASE = ../i86pc/i86pc-hc-topology.xml +CLOBBERFILES = $(TOPOFILE) + include ../Makefile.map diff --git a/usr/src/lib/fm/topo/maps/i86pc/Makefile b/usr/src/lib/fm/topo/maps/i86pc/Makefile index 4e9475b546..742c4ac9e7 100644 --- a/usr/src/lib/fm/topo/maps/i86pc/Makefile +++ b/usr/src/lib/fm/topo/maps/i86pc/Makefile @@ -34,4 +34,6 @@ SRCDIR = ../i86pc PLATFORM = unused TOPOBASE = i86pc-hc-topology.xml +CLOBBERFILES = fan-hc-topology.xml + include ../Makefile.map diff --git a/usr/src/lib/fm/topo/modules/Makefile.plugin b/usr/src/lib/fm/topo/modules/Makefile.plugin index d67acbfe7d..7eef744f46 100644 --- a/usr/src/lib/fm/topo/modules/Makefile.plugin +++ b/usr/src/lib/fm/topo/modules/Makefile.plugin @@ -100,7 +100,7 @@ clean: $(RM) $(OBJS) $(LINTFILES) $(CLEANFILES) clobber: clean - $(RM) $(PROG) + $(RM) $(PROG) $(CLOBBERFILES) %.ln: ../../common/$(MODULE)/%.c $(LINT.c) -c $< diff --git a/usr/src/lib/fm/topo/modules/common/ses/Makefile b/usr/src/lib/fm/topo/modules/common/ses/Makefile index 49f23b770a..578b5bf493 100644 --- a/usr/src/lib/fm/topo/modules/common/ses/Makefile +++ b/usr/src/lib/fm/topo/modules/common/ses/Makefile @@ -35,3 +35,5 @@ CPPFLAGS += -I../disk LDLIBS += -L$(ROOTLIBDIR)/scsi -R/usr/lib/scsi -lses LDLIBS += -ldevinfo -ldevid -ldiskstatus -lcontract -lsysevent + +CLOBBERFILES += disk_common.ln diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com index 05961e3a1e..3d41bd6a10 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com @@ -564,6 +564,9 @@ kwarnd_handle.c: $(SRC)/cmd/krb5/kwarn/kwarnd_handle.c $(RM) $@ $(CP) $(SRC)/cmd/krb5/kwarn/kwarnd_handle.c $@ +CLOBBERFILES += kwarnd.h \ + kwarnd_clnt.c kwarnd_clnt_stubs.c kwarnd_handle.c kwarnd_xdr.c + # So lint.out won't be needlessly recreated lint: $(LINTOUT) diff --git a/usr/src/lib/krb5/kadm5/clnt/Makefile b/usr/src/lib/krb5/kadm5/clnt/Makefile index 33fba4fea2..ee930293f6 100644 --- a/usr/src/lib/krb5/kadm5/clnt/Makefile +++ b/usr/src/lib/krb5/kadm5/clnt/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -42,7 +40,9 @@ POFILES= generic.po .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean install lint: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(CLOBBERFILES) _msg: $(MSGDOMAIN) .WAIT $(POFILE) $(RM) $(MSGDOMAIN)/$(POFILE) diff --git a/usr/src/lib/krb5/ss/Makefile b/usr/src/lib/krb5/ss/Makefile index ce3bb2203d..06dbca35d3 100644 --- a/usr/src/lib/krb5/ss/Makefile +++ b/usr/src/lib/krb5/ss/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -42,7 +40,9 @@ POFILES = generic.po .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean install lint: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(CLOBBERFILES) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/libbe/Makefile.com b/usr/src/lib/libbe/Makefile.com index 013d2bdc37..b71a0f85b5 100644 --- a/usr/src/lib/libbe/Makefile.com +++ b/usr/src/lib/libbe/Makefile.com @@ -56,6 +56,8 @@ CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-address +CLOBBERFILES += $(LIBRARY) + $(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile index 93934954dd..75a6406779 100644 --- a/usr/src/lib/libc/Makefile +++ b/usr/src/lib/libc/Makefile @@ -108,6 +108,8 @@ BASEHDRS= getxby_door.h CHECKHDRS= $(BASEHDRS:%.h=port/gen/%.check) HDRS= $(BASEHDRS) +CLOBBERFILES += THIRDPARTYLICENSE extract-copyright + # install rules for install_h target $(ROOTHDRDIR)/%: port/gen/% $(INS.file) @@ -237,7 +239,10 @@ lint := TARGET= lint $(SUBDIRS): FRC @cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET) -clean clobber: $(SUBDIRS) +clean: $(SUBDIRS) +clobber: $(SUBDIRS) etc clobber_local +clobber_local: + $(RM) $(CLOBBERFILES) lint: $(SUBDIRS) diff --git a/usr/src/lib/libcurses/Makefile b/usr/src/lib/libcurses/Makefile index a1b04c3e9f..9e88e23114 100644 --- a/usr/src/lib/libcurses/Makefile +++ b/usr/src/lib/libcurses/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -115,6 +113,11 @@ screen/tmp: rm -rf $@ mkdir $@ +CLEANFILES += \ + screen/tmp/keycaps \ + screen/tmp/term.h.new1 \ + screen/tmp/term.h.new2 + _msg: $(MSGDOMAIN) .WAIT $(POFILE) $(RM) $(MSGDOMAIN)/$(POFILE) $(CP) $(POFILE) $(MSGDOMAIN) diff --git a/usr/src/lib/libdns_sd/Makefile b/usr/src/lib/libdns_sd/Makefile index 21a4e1aa1d..5e33bde9f9 100644 --- a/usr/src/lib/libdns_sd/Makefile +++ b/usr/src/lib/libdns_sd/Makefile @@ -21,7 +21,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.lib @@ -40,7 +39,7 @@ lint := TARGET = lint all install: install_h $(SUBDIRS) .WAIT java -clean clobber: $(SUBDIRS) +clean clobber: $(SUBDIRS) java ROOTHDRDIR= $(ROOT)/usr/include ROOTHDRS= $(HDR:%=$(ROOTHDRDIR)/%) diff --git a/usr/src/lib/libdtrace/Makefile.com b/usr/src/lib/libdtrace/Makefile.com index 8952f8db06..071e9f22b8 100644 --- a/usr/src/lib/libdtrace/Makefile.com +++ b/usr/src/lib/libdtrace/Makefile.com @@ -117,8 +117,9 @@ CLEANFILES += ../common/dt_errtags.c ../common/dt_names.c CLEANFILES += ../common/sysevent.sed ../common/sysevent.d CLEANFILES += ../common/tcp.sed ../common/tcp.d CLEANFILES += ../common/udp.sed ../common/udp.d +CLEANFILES += $(LIBDAUDITOBJS) $(DRTIOBJS) -CLOBBERFILES += drti.o +CLOBBERFILES += $(LIBDAUDIT) drti.o CPPFLAGS += -I../common -I. CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS) diff --git a/usr/src/lib/libfsmgt/Makefile.com b/usr/src/lib/libfsmgt/Makefile.com index c265c052dd..c9143741ac 100644 --- a/usr/src/lib/libfsmgt/Makefile.com +++ b/usr/src/lib/libfsmgt/Makefile.com @@ -54,6 +54,10 @@ CPPFLAGS += -D_REENTRANT -I$(SRC)/lib/libfsmgt/common \ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized +CLOBBERFILES += $(SRCDIR)/nfs_sec.c +CLOBBERFILES += $(SRCDIR)/replica.c +CLOBBERFILES += $(SRCDIR)/sharetab.c + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/libldap5/Makefile b/usr/src/lib/libldap5/Makefile index 096d63a199..e5de491a1f 100644 --- a/usr/src/lib/libldap5/Makefile +++ b/usr/src/lib/libldap5/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -45,7 +43,9 @@ POFILES= generic.po .KEEP_STATE: -all clean clobber install: $(SUBDIRS) +all clean install: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(CLOBBERFILES) lint: @ $(ECHO) "usr/src/lib/libldap5 is third-party code that" diff --git a/usr/src/lib/libntfs/Makefile b/usr/src/lib/libntfs/Makefile index bf44b58cb9..67cdafcfff 100644 --- a/usr/src/lib/libntfs/Makefile +++ b/usr/src/lib/libntfs/Makefile @@ -46,7 +46,9 @@ GREP= grep .KEEP_STATE: -all clean clobber delete install package: $(SUBDIRS) +all clean delete install package: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(CLOBBERFILES) all install: THIRDPARTYLICENSE diff --git a/usr/src/lib/libresolv2/include/Makefile b/usr/src/lib/libresolv2/include/Makefile index 8bff3c3188..b7271c0617 100644 --- a/usr/src/lib/libresolv2/include/Makefile +++ b/usr/src/lib/libresolv2/include/Makefile @@ -23,8 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../../Makefile.master @@ -46,6 +44,7 @@ clean: $(RM) $(HDRS) $(TMPHDRS) clobber: clean + $(RM) make_os_version probe_ipv6 # os_version.h and port_ipv6.h should be rebuilt when you change OS # revision. Since that's not easily expressed as a dependency, we diff --git a/usr/src/lib/libsec/Makefile.com b/usr/src/lib/libsec/Makefile.com index 1f83f66516..6a30ddf56a 100644 --- a/usr/src/lib/libsec/Makefile.com +++ b/usr/src/lib/libsec/Makefile.com @@ -51,6 +51,8 @@ CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-unused-variable +CLOBBERFILES += acl.output + # install this library in the root filesystem include ../../Makefile.rootfs diff --git a/usr/src/lib/libshell/Makefile.doc b/usr/src/lib/libshell/Makefile.doc index 07118f7459..c822b0bf5c 100644 --- a/usr/src/lib/libshell/Makefile.doc +++ b/usr/src/lib/libshell/Makefile.doc @@ -78,6 +78,8 @@ $(ROOTDOCDIRBASE)/%.html: misc/%.docbook $(INS) -s -m $(FILEMODE) -f "$(@D)" "$(@F)" $(RM) "$(@F)" +CLOBBERFILES += xsltproc.log + # Generic documentation rules DOCFILESRCDIR= common ROOTDOCFILES= $(DOCFILES:%=$(ROOTDOCDIRBASE)/%) diff --git a/usr/src/lib/libsldap/Makefile b/usr/src/lib/libsldap/Makefile index 3447306dd1..64525df111 100644 --- a/usr/src/lib/libsldap/Makefile +++ b/usr/src/lib/libsldap/Makefile @@ -46,7 +46,9 @@ POFILES= generic.po .KEEP_STATE: -all clean clobber delete install lint catalog package: $(SUBDIRS) +all clean delete install lint catalog package: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILES) # install rule for install_h target $(ROOTHDRDIR)/%: % diff --git a/usr/src/lib/libuutil/Makefile b/usr/src/lib/libuutil/Makefile index 9f9e3c2f06..b8421c51f5 100644 --- a/usr/src/lib/libuutil/Makefile +++ b/usr/src/lib/libuutil/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # # We build a native version of libuutil.so.1 in the "native" subdirectory. @@ -67,7 +65,7 @@ check: $(CHECKHDRS) _msg: $(MSGDOMAINPOFILE) -naive $(SUBDIRS): FRC +native $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) FRC: diff --git a/usr/src/lib/libuutil/Makefile.com b/usr/src/lib/libuutil/Makefile.com index ce20a81894..73b1dcddb9 100644 --- a/usr/src/lib/libuutil/Makefile.com +++ b/usr/src/lib/libuutil/Makefile.com @@ -60,6 +60,7 @@ SRCS = \ ../common/uu_strtoint.c LINTS = $(OBJECTS:%.o=%.ln) +CLOBBERFILES += $(LINTS) SRCDIR = ../common $(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) diff --git a/usr/src/lib/libuutil/native/Makefile b/usr/src/lib/libuutil/native/Makefile index c74d06cd9f..8f30530f51 100644 --- a/usr/src/lib/libuutil/native/Makefile +++ b/usr/src/lib/libuutil/native/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# NOT_NATIVE = $(POUND_SIGN) # tell Makefile.com we're native @@ -41,7 +39,7 @@ LDLIBS = $(MY_NATIVE_LDLIBS) # We must use the build's avl headers, to match the common avl.c # AVLHEADERS = sys/avl.h sys/avl_impl.h -CLOBBERFILES += $(AVLHEADERS) +CLOBBERFILES += $(AVLHEADERS) $(LIBS) all: $(LIBS) diff --git a/usr/src/lib/libwanbootutil/Makefile b/usr/src/lib/libwanbootutil/Makefile index 235b47827d..2899af6623 100644 --- a/usr/src/lib/libwanbootutil/Makefile +++ b/usr/src/lib/libwanbootutil/Makefile @@ -94,6 +94,8 @@ common/key_xdr.c: common/key_xdr.x common/key_xdr.h: common/key_xdr.x cd common; $(RPCGEN) -h -o key_xdr.h key_xdr.x; cd .. +CLOBBERFILES += common/key_xdr.c common/key_xdr.h + include $(SRC)/Makefile.msg.targ include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com index cf6b1e4017..da5da5d936 100644 --- a/usr/src/lib/libzpool/Makefile.com +++ b/usr/src/lib/libzpool/Makefile.com @@ -54,6 +54,7 @@ INCS += -I../../../common/zfs INCS += -I../../../common CLEANFILES += ../common/zfs.h +CLEANFILES += $(EXTPICS) $(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) $(LINTLIB): ../common/zfs.h diff --git a/usr/src/lib/madv/Makefile b/usr/src/lib/madv/Makefile index 1eca4099b0..06e5b257bb 100644 --- a/usr/src/lib/madv/Makefile +++ b/usr/src/lib/madv/Makefile @@ -23,8 +23,6 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -41,7 +39,9 @@ lint := TARGET= lint .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean lint: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/mpss/Makefile b/usr/src/lib/mpss/Makefile index 960b35a481..013fdb01e6 100644 --- a/usr/src/lib/mpss/Makefile +++ b/usr/src/lib/mpss/Makefile @@ -23,8 +23,6 @@ # Copyright 2001-2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -41,7 +39,9 @@ lint := TARGET= lint .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean lint: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com index 323f311dec..020051c977 100644 --- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com +++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com @@ -87,6 +87,8 @@ LINTSRC= $(OBJECTS:%.o=$(SRCDIR)/%.c) $(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) LINTSRC= $(SRCS) +CLOBBERFILES += C.ln + .KEEP_STATE: all: $(LIBS) diff --git a/usr/src/lib/print/libpapi-lpd/Makefile.com b/usr/src/lib/print/libpapi-lpd/Makefile.com index c50fd8b223..9c0a8af8df 100644 --- a/usr/src/lib/print/libpapi-lpd/Makefile.com +++ b/usr/src/lib/print/libpapi-lpd/Makefile.com @@ -55,6 +55,8 @@ MAPFILES = $(SRCDIR)/mapfile LDLIBS += -lc +CLOBBERFILES += $(PROG) + .KEEP_STATE: all: $(LIBS) $(PROG) diff --git a/usr/src/lib/pysolaris/Makefile b/usr/src/lib/pysolaris/Makefile index f0c18328ce..7c018260b7 100644 --- a/usr/src/lib/pysolaris/Makefile +++ b/usr/src/lib/pysolaris/Makefile @@ -35,12 +35,17 @@ clean := TARGET= clean clobber := TARGET= clobber lint := TARGET= lint -MSGFILES = `$(FIND) . -name '*.py' -o -name '*.c'` +MSGFIND = $(FIND) . -name '*.py' -o -name '*.c' +MSGFILES = $(MSGFIND:sh) +PYCFIND = $(FIND) . -name '*.pyc' +PYCFILES = $(PYCFIND:sh) POFILE = pysolaris.po .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean lint: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(PYCFILES) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/pyzfs/Makefile b/usr/src/lib/pyzfs/Makefile index c39ef5b9c7..c69270f58f 100644 --- a/usr/src/lib/pyzfs/Makefile +++ b/usr/src/lib/pyzfs/Makefile @@ -35,12 +35,17 @@ clean := TARGET= clean clobber := TARGET= clobber lint := TARGET= lint -MSGFILES = `$(FIND) . -name '*.py' -o -name '*.c'` +MSGFIND = $(FIND) . -name '*.py' -o -name '*.c' +MSGFILES = $(MSGFIND:sh) +PYCFIND = $(FIND) . -name '*.pyc' +PYCFILES = $(PYCFIND:sh) POFILE = pyzfs.po .KEEP_STATE: -all install clean clobber lint: $(SUBDIRS) +all install clean lint: $(SUBDIRS) +clobber: $(SUBDIRS) + $(RM) $(POFILE) $(PYCFILES) $(POFILE): pofile_MSGFILES |