diff options
Diffstat (limited to 'usr/src/uts')
36 files changed, 269 insertions, 109 deletions
diff --git a/usr/src/uts/Makefile b/usr/src/uts/Makefile index 9197d3c8e6..47ada80eb4 100644 --- a/usr/src/uts/Makefile +++ b/usr/src/uts/Makefile @@ -20,6 +20,7 @@ # # # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 Nexenta Systems, Inc. All rights reserved. # # include global definitions include ../Makefile.master @@ -74,6 +75,7 @@ install := TARGET= install install_h := TARGET= install_h clean := TARGET= clean clobber := TARGET= clobber +clobber_h := TARGET= clobber lint := TARGET= lint clean.lint := TARGET= clean.lint check := TARGET= check @@ -142,6 +144,8 @@ COMMON_HDRDIRS= common/avs \ common/inet/nca \ common/inet/sockmods/netpacket \ common/io/bpf/net \ + common/io/fibre-channel/fca/qlc \ + common/io/lvm/md \ common/ipp \ common/net \ common/netinet \ @@ -166,8 +170,13 @@ $(CLOSED_BUILD)COMMON_HDRDIRS += $(CLOSED)/uts/common/sys # Other directories should be included here, but do not yet have the # necessary Makefile support (make clean). See 6414855. # -DYNHDRDIRS = common/idmap \ +DYNHDRDIRS = common/avs \ + common/gssapi \ + common/idmap \ + common/io/fibre-channel/fca/qlc \ + common/io/lvm/md \ common/klm \ + common/rpc \ common/rpcsvc \ common/sys @@ -197,9 +206,8 @@ clean clobber: $($(MACH)_ARCHITECTURES) $(DYNHDRDIRS) $(RM) $(PMTMO_FILE) ; \ fi -EXTRA_CLOBBER_TARGETS= common/avs/ns/rdc -clobber: $(EXTRA_CLOBBER_TARGETS) - +# testing convenience +clobber_h: $(DYNHDRDIRS) clean.lint modlist: $($(MACH)_ARCHITECTURES) diff --git a/usr/src/uts/common/Makefile.rules b/usr/src/uts/common/Makefile.rules index b7e8aa2ea3..2d52f0031e 100644 --- a/usr/src/uts/common/Makefile.rules +++ b/usr/src/uts/common/Makefile.rules @@ -1574,24 +1574,6 @@ $(LINTS_DIR)/bz2%.ln: $(COMMONBASE)/bzip2/%.c @($(LHEAD) $(LINT.c) -C $(LINTS_DIR)/`basename $@ .ln` $(BZ2LINT) $< $(LTAIL)) # -# SVM -# - -MD_XDR_CSRC = $(UTSBASE)/common/io/lvm/md -MD_XDR_XSRC = $(UTSBASE)/common/sys/lvm -RPCGENFLAGS += -C -M -D_KERNEL -DSYSV - -$(MD_XDR_CSRC)/meta_basic_xdr.c: $(MD_XDR_XSRC)/meta_basic.x - $(RPCGEN) $(RPCGENFLAGS) -c -i 100 $(MD_XDR_XSRC)/meta_basic.x | \ - nawk '{sub(/^#include "(\.\.\/\.\.\/)/,"#include \"\.\.\/\.\.\/\.\.\/\.\.\/"); print $$0}' | \ - nawk '{sub(/meta_basic.h/, "md_basic.h"); print $$0}' >$@ - -$(MD_XDR_CSRC)/metamed_xdr.c: $(MD_XDR_XSRC)/metamed.x - $(RPCGEN) $(RPCGENFLAGS) -c -i 100 $(MD_XDR_XSRC)/metamed.x | \ - nawk '{sub(/^#include "(\.\.\/\.\.\/)/,"#include \"\.\.\/\.\.\/\.\.\/\.\.\/"); print $$0}' | \ - nawk '{sub(/metamed.h/, "mdmed.h"); print $$0}' >$@ - -# # Section 1b: Lint `objects' # $(LINTS_DIR)/%.ln: $(COMMONBASE)/crypto/aes/%.c diff --git a/usr/src/uts/common/avs/Makefile b/usr/src/uts/common/avs/Makefile index 55d19a30a3..71826d0f21 100644 --- a/usr/src/uts/common/avs/Makefile +++ b/usr/src/uts/common/avs/Makefile @@ -36,11 +36,14 @@ AVS_SUBDIRS = ncall \ # install rules install_h:= TARGET= install_h check:= TARGET= check +clobber:= TARGET= clobber # standards checking rules install_h check: $(AVS_SUBDIRS) +clobber: ns/rdc + $(AVS_SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/uts/common/gssapi/Makefile b/usr/src/uts/common/gssapi/Makefile index 736ac8da68..82ec96631d 100644 --- a/usr/src/uts/common/gssapi/Makefile +++ b/usr/src/uts/common/gssapi/Makefile @@ -88,3 +88,5 @@ check: $(CHECKHDRS) clean: $(RM) $(DERIVED_FILES) + +clobber: clean diff --git a/usr/src/uts/common/io/fibre-channel/fca/qlc/Makefile b/usr/src/uts/common/io/fibre-channel/fca/qlc/Makefile new file mode 100644 index 0000000000..01f2c36a73 --- /dev/null +++ b/usr/src/uts/common/io/fibre-channel/fca/qlc/Makefile @@ -0,0 +1,69 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# Copyright 2013 Nexenta Systems, Inc. All rights reserved. +# + +# Path to the base of the uts directory tree (usually /usr/src/uts). +UTSBASE = ../../../../.. + +# +# Include common rules. +# +include $(SRC)/Makefile.master + +FWTABLE = ql_fw_table.c +FWIMAGES = 2200 +FWIMAGES += 2300 +FWIMAGES += 2400 +FWIMAGES += 2500 +FWIMAGES += 6322 +FWIMAGES += 8100 + +FWMODULES_SRC = $(FWIMAGES:%=ql_fw_%.c) + +all_h install_h : $(FWTABLE) + +check: + +clean: + $(RM) $(FWTABLE) + +clobber: clean + +$(FWTABLE): $(FWMODULES_SRC) + $(RM) $@ + echo '#include <ql_apps.h>' >> $@ + echo '#include <ql_api.h>' >> $@ + echo 'struct fw_table fw_table[] = {' >> $@ + grep FW_VERSION_STRING $(FWMODULES_SRC) |\ + grep '#define' |\ + sed 's/[0-9]"/& },/' |\ + sed 's/.*ql_fw_/{ 0x/' |\ + sed 's/.c:#define/,/' |\ + sed 's/FW_VERSION_STRING//' >> $@ + echo '{ 0, NULL }' >> $@ + echo '};' >> $@ + +.KEEP_STATE: diff --git a/usr/src/uts/common/io/lvm/md/Makefile b/usr/src/uts/common/io/lvm/md/Makefile new file mode 100644 index 0000000000..355b1881d3 --- /dev/null +++ b/usr/src/uts/common/io/lvm/md/Makefile @@ -0,0 +1,60 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# Copyright 2013 Nexenta Systems, Inc. All rights reserved. +# + +# Path to the base of the uts directory tree (usually /usr/src/uts). +UTSBASE = ../../../.. + +# +# Include common rules. +# +include $(SRC)/Makefile.master + +MD_XDR_CSRC = $(UTSBASE)/common/io/lvm/md +MD_XDR_XSRC = $(UTSBASE)/common/sys/lvm +RPCGENFLAGS += -C -M -D_KERNEL -DSYSV + +DERIVED_FILES = meta_basic_xdr.c metamed_xdr.c + +all_h install_h : $(DERIVED_FILES) + +check: + +clean: + $(RM) $(DERIVED_FILES) + +clobber: clean + +%_xdr.c: $(MD_XDR_XSRC)/%.x + $(RPCGEN) $(RPCGENFLAGS) -c -i 100 $(MD_XDR_XSRC)/$*.x | \ +$(NAWK) '/^#include/ {\ + sub(/(\.\.\/)*common\//,"");\ + sub(/meta_basic.h/, "md_basic.h");\ + sub(/metamed.h/, "mdmed.h");\ +}\ +{ print $0; }' > $@ + +.KEEP_STATE: diff --git a/usr/src/uts/common/rpc/Makefile b/usr/src/uts/common/rpc/Makefile index 2c5ed640b0..03a327eef3 100644 --- a/usr/src/uts/common/rpc/Makefile +++ b/usr/src/uts/common/rpc/Makefile @@ -89,6 +89,8 @@ all_h: $(DERIVED_FILES) clean: $(RM) $(DERIVED_FILES) +clobber: clean + $(RPCDIRS): $(INS.dir) diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile index 42df7b77e0..a24490bf15 100644 --- a/usr/src/uts/common/sys/Makefile +++ b/usr/src/uts/common/sys/Makefile @@ -1373,12 +1373,13 @@ usb/usbdevs.h: $(USBDEVS_AWK) $(USBDEVS_DATA) $(NAWK) -f $(USBDEVS_AWK) $(USBDEVS_DATA) -H > $@ LVMDERIVED_H: - cd $(SRC)/uts/common/sys/lvm; pwd; $(MAKE) + cd $(SRC)/uts/common/sys/lvm; pwd; $(MAKE) all_h clean: $(RM) $(GENHDRS) -clobber: clean +clobber: clean + cd $(SRC)/uts/common/sys/lvm; pwd; $(MAKE) clobber check: $(CHECKHDRS) diff --git a/usr/src/uts/common/sys/lvm/Makefile b/usr/src/uts/common/sys/lvm/Makefile index bf7a9ac509..dd7fe5ab4d 100644 --- a/usr/src/uts/common/sys/lvm/Makefile +++ b/usr/src/uts/common/sys/lvm/Makefile @@ -20,11 +20,11 @@ # CDDL HEADER END # # -# uts/common/sys/lvm/Makefile # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +# +# uts/common/sys/lvm/Makefile # # This makefile derive some .h files via rpcgen # @@ -48,10 +48,13 @@ RPCGENFLAGS += -C -M -D_KERNEL -DSYSV def all install lint modlintlib clean.lint: $(DERIVED_FILES) +all_h install_h: $(DERIVED_FILES) -clean clobber: +clean: $(RM) $(DERIVED_FILES) +clobber: clean + md_basic.h: meta_basic.x $(RPCGEN) $(RPCGENFLAGS) -h meta_basic.x | \ awk '/<synch.h>/ { print "#ifdef _REENTRANT"; print $$0; print "#endif\t/* _REENTRANT */"; next } \ diff --git a/usr/src/uts/i86pc/Makefile b/usr/src/uts/i86pc/Makefile index 09754bc3b2..6dba4f5732 100644 --- a/usr/src/uts/i86pc/Makefile +++ b/usr/src/uts/i86pc/Makefile @@ -40,12 +40,14 @@ INTEL_LIB_DIR = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR) INTEL_LINTS = genunix -LINT_LIBS = $(LINT_LIB) \ +LINT_LIBS = \ $(GENUNIX_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ $(PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ $(CLOSED_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ $(INTEL_LINTS:%=$(INTEL_LIB_DIR)/llib-l%.ln) +I86PC_LINTS = dr drmach_acpi + # # # @@ -79,6 +81,9 @@ def all clean clobber clean.lint: setup genassym unix .WAIT \ install: install_platforms setup genassym unix .WAIT \ $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) $(IMPLEMENTATIONS) +# Need to clean in here too because of lint. +clean: $(I86PC_LINTS) + # list the modules under i86pc. modlist: unix $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \ $(IMPLEMENTATIONS) @@ -149,7 +154,7 @@ globallint := LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2 globallint: @-$(ECHO) "\nFULL KERNEL: global crosschecks:" - @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2) + @-$(LINT) $(LINTFLAGS) $(LINT_LIB) $(LINT_LIBS) 2>&1 | $(LGREP.2) lint: lintlib .WAIT modlintlib .WAIT $(INTEL_LINTS) $(LINT_DEPS) \ $(IMPLEMENTATIONS) diff --git a/usr/src/uts/i86pc/dr/Makefile b/usr/src/uts/i86pc/dr/Makefile index f29362ef14..18c2770bb8 100644 --- a/usr/src/uts/i86pc/dr/Makefile +++ b/usr/src/uts/i86pc/dr/Makefile @@ -76,7 +76,7 @@ CERRWARN += -_gcc=-Wno-empty-body # module dependencies # LDFLAGS += -dy -Nmisc/drmach_acpi - + CLEANFILES += $(DR_GENERR) CLEANFILES += $(DR_IO)/dr_err.c @@ -89,9 +89,11 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) -clean: $(CLEAN_DEPS) +# This build only 64-bit, but the lint32 below +# needs corresponding clean/clobber deps. +clean: $(CLEAN_DEPS) clean.debug32 -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS) clobber.debug32 lint: $(LINT_DEPS) @@ -105,4 +107,3 @@ install: $(INSTALL_DEPS) $(CONF_INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/i86pc/Makefile.targ - diff --git a/usr/src/uts/i86pc/drmach_acpi/Makefile b/usr/src/uts/i86pc/drmach_acpi/Makefile index 24f9197b32..c803d07f77 100644 --- a/usr/src/uts/i86pc/drmach_acpi/Makefile +++ b/usr/src/uts/i86pc/drmach_acpi/Makefile @@ -83,9 +83,11 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) -clean: $(CLEAN_DEPS) +# This build only 64-bit, but the lint32 below +# needs corresponding clean/clobber deps. +clean: $(CLEAN_DEPS) clean.debug32 -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS) clobber.debug32 lint: $(LINT_DEPS) diff --git a/usr/src/uts/i86pc/genassym/Makefile b/usr/src/uts/i86pc/genassym/Makefile index 4d164a896d..dc11bddde7 100644 --- a/usr/src/uts/i86pc/genassym/Makefile +++ b/usr/src/uts/i86pc/genassym/Makefile @@ -22,7 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # This makefile drives the production of assym.h through # compile time intialized data. @@ -59,7 +58,7 @@ DSF_DIR = . # Overrides # CLEANFILES = $(GENASSYM) Nothing_to_remove -CLOBBERFILES = $(ASSYM_H) $(KDI_ASSYM.H) $(CLEANFILES) Nothing_to_remove +CLOBBERFILES = $(ASSYM_H) $(KDI_ASSYM_H) $(CLEANFILES) Nothing_to_remove # # Default build targets. diff --git a/usr/src/uts/i86pc/gfx_private/Makefile b/usr/src/uts/i86pc/gfx_private/Makefile index b8156af9e2..53001f9321 100644 --- a/usr/src/uts/i86pc/gfx_private/Makefile +++ b/usr/src/uts/i86pc/gfx_private/Makefile @@ -74,6 +74,8 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses +CLOBBERFILES += $(OBJS_DIR)/$(VGATEXT_FONT).c + # # Default build targets. # diff --git a/usr/src/uts/i86pc/unix/Makefile b/usr/src/uts/i86pc/unix/Makefile index 0a83e6c4cc..27389eea17 100644 --- a/usr/src/uts/i86pc/unix/Makefile +++ b/usr/src/uts/i86pc/unix/Makefile @@ -98,6 +98,7 @@ UNIX_DIR = . CLEANFILES += \ $(UNIX_O) $(MODSTUBS_O) \ $(OBJS_DIR)/vers.c $(OBJS_DIR)/vers.o \ + $(OBJS_DIR)/dtracestubs.s \ $(DTRACESTUBS_O) $(DTRACESTUBS) CLEANFILES += \ @@ -113,6 +114,10 @@ CLEANFILES += \ $(OBJS_DIR)/fb_swtch_src \ $(OBJS_DIR)/fb_swtch.s +CLEANFILES += \ + $(ZLIB_OBJS:%.o=$(OBJS_DIR)/%.o) \ + $(ZLIB_OBJS:%.o=$(OBJS_DIR)/%.ln) + CLOBBERFILES = $(CLEANFILES) $(UNIX_BIN) $(MULTIBOOT) CLEANLINTFILES += $(LINT_LIB) $(DBOOT_LINT_LIB) $(DBOOT_LINTS) diff --git a/usr/src/uts/i86xpv/Makefile b/usr/src/uts/i86xpv/Makefile index cb0cd9611a..4586d8c659 100644 --- a/usr/src/uts/i86xpv/Makefile +++ b/usr/src/uts/i86xpv/Makefile @@ -42,12 +42,14 @@ INTEL_LIB_DIR = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR) INTEL_LINTS = genunix -LINT_LIBS = $(LINT_LIB) \ +LINT_LIBS = \ $(GENUNIX_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ $(PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ $(CLOSED_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ $(INTEL_LINTS:%=$(INTEL_LIB_DIR)/llib-l%.ln) +I86XPV_LINTS = xdb xnb xnbe xnbo xnbu xpvtap + # # # @@ -80,6 +82,9 @@ def all clean clobber clean.lint: setup genassym unix .WAIT \ install: install_platforms setup genassym unix .WAIT \ $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) +# Need to clean in here too because of lint. +clean: $(I86XPV_LINTS) + # list the modules under i86xpv. modlist: unix $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) @@ -146,7 +151,7 @@ globallint := LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2 globallint: @-$(ECHO) "\nFULL KERNEL: global crosschecks:" - @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2) + @-$(LINT) $(LINTFLAGS) $(LINT_LIB) $(LINT_LIBS) 2>&1 | $(LGREP.2) lint: lintlib .WAIT modlintlib .WAIT $(INTEL_LINTS) $(LINT_DEPS) diff --git a/usr/src/uts/i86xpv/gfx_private/Makefile b/usr/src/uts/i86xpv/gfx_private/Makefile index 7184d1091f..f103eb9a04 100644 --- a/usr/src/uts/i86xpv/gfx_private/Makefile +++ b/usr/src/uts/i86xpv/gfx_private/Makefile @@ -70,6 +70,8 @@ LINTTAGS += -erroff=E_STATIC_UNUSED CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses +CLOBBERFILES += $(OBJS_DIR)/$(VGATEXT_FONT).c + # # Default build targets. # diff --git a/usr/src/uts/i86xpv/unix/Makefile b/usr/src/uts/i86xpv/unix/Makefile index 7969a8dd44..989e79399d 100644 --- a/usr/src/uts/i86xpv/unix/Makefile +++ b/usr/src/uts/i86xpv/unix/Makefile @@ -95,6 +95,7 @@ UNIX_DIR = . CLEANFILES += \ $(UNIX_O) $(MODSTUBS_O) \ $(OBJS_DIR)/vers.c $(OBJS_DIR)/vers.o \ + $(OBJS_DIR)/dtracestubs.s \ $(DTRACESTUBS_O) $(DTRACESTUBS) CLEANFILES += \ @@ -102,6 +103,15 @@ CLEANFILES += \ $(DBOOT_OBJECTS) \ $(DBOOT_BIN) +CLEANFILES += \ + $(OBJS_DIR)/fb_swtch_src.o \ + $(OBJS_DIR)/fb_swtch_src \ + $(OBJS_DIR)/fb_swtch.s + +CLEANFILES += \ + $(ZLIB_OBJS:%.o=$(OBJS_DIR)/%.o) \ + $(ZLIB_OBJS:%.o=$(OBJS_DIR)/%.ln) + CLOBBERFILES = $(CLEANFILES) $(UNIX_BIN) CLEANLINTFILES += $(LINT_LIB) $(DBOOT_LINT_LIB) $(DBOOT_LINTS) diff --git a/usr/src/uts/i86xpv/xdb/Makefile b/usr/src/uts/i86xpv/xdb/Makefile index bc5628fd5c..d221748e1c 100644 --- a/usr/src/uts/i86xpv/xdb/Makefile +++ b/usr/src/uts/i86xpv/xdb/Makefile @@ -72,9 +72,11 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) -clean: $(CLEAN_DEPS) +# This build only 64-bit, but the lint32 below +# needs corresponding clean/clobber deps. +clean: $(CLEAN_DEPS) clean.debug32 -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS) clobber.debug32 lint: $(LINT_DEPS) diff --git a/usr/src/uts/i86xpv/xnb/Makefile b/usr/src/uts/i86xpv/xnb/Makefile index 336b225836..22e11b44cd 100644 --- a/usr/src/uts/i86xpv/xnb/Makefile +++ b/usr/src/uts/i86xpv/xnb/Makefile @@ -87,9 +87,11 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) -clean: $(CLEAN_DEPS) +# This build only 64-bit, but the lint32 below +# needs corresponding clean/clobber deps. +clean: $(CLEAN_DEPS) clean.debug32 -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS) clobber.debug32 lint: $(LINT_DEPS) diff --git a/usr/src/uts/i86xpv/xnbe/Makefile b/usr/src/uts/i86xpv/xnbe/Makefile index 784ef2af93..c45af07dd8 100644 --- a/usr/src/uts/i86xpv/xnbe/Makefile +++ b/usr/src/uts/i86xpv/xnbe/Makefile @@ -81,9 +81,11 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) -clean: $(CLEAN_DEPS) +# This build only 64-bit, but the lint32 below +# needs corresponding clean/clobber deps. +clean: $(CLEAN_DEPS) clean.debug32 -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS) clobber.debug32 lint: $(LINT_DEPS) diff --git a/usr/src/uts/i86xpv/xnbo/Makefile b/usr/src/uts/i86xpv/xnbo/Makefile index c635e516c8..43c53b275e 100644 --- a/usr/src/uts/i86xpv/xnbo/Makefile +++ b/usr/src/uts/i86xpv/xnbo/Makefile @@ -81,9 +81,11 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) -clean: $(CLEAN_DEPS) +# This build only 64-bit, but the lint32 below +# needs corresponding clean/clobber deps. +clean: $(CLEAN_DEPS) clean.debug32 -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS) clobber.debug32 lint: $(LINT_DEPS) diff --git a/usr/src/uts/i86xpv/xnbu/Makefile b/usr/src/uts/i86xpv/xnbu/Makefile index 34d10f155e..e60f05db23 100644 --- a/usr/src/uts/i86xpv/xnbu/Makefile +++ b/usr/src/uts/i86xpv/xnbu/Makefile @@ -81,9 +81,11 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) -clean: $(CLEAN_DEPS) +# This build only 64-bit, but the lint32 below +# needs corresponding clean/clobber deps. +clean: $(CLEAN_DEPS) clean.debug32 -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS) clobber.debug32 lint: $(LINT_DEPS) diff --git a/usr/src/uts/i86xpv/xpvtap/Makefile b/usr/src/uts/i86xpv/xpvtap/Makefile index 80778dfe66..a921762700 100644 --- a/usr/src/uts/i86xpv/xpvtap/Makefile +++ b/usr/src/uts/i86xpv/xpvtap/Makefile @@ -86,9 +86,11 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) -clean: $(CLEAN_DEPS) +# This build only 64-bit, but the lint32 below +# needs corresponding clean/clobber deps. +clean: $(CLEAN_DEPS) clean.debug32 -clobber: $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS) clobber.debug32 lint: $(LINT_DEPS) diff --git a/usr/src/uts/intel/Makefile b/usr/src/uts/intel/Makefile index a981a3717d..46b2368ec9 100644 --- a/usr/src/uts/intel/Makefile +++ b/usr/src/uts/intel/Makefile @@ -76,6 +76,7 @@ install_h.prereq := TARGET= install_h def all install clean clobber modlist: $(KMODS) $(CLOSED_KMODS) \ $(SVVS) $(XMODS) $(CLOSED_XMODS) config +clobber: clobber.targ # # Privilege constants @@ -89,6 +90,8 @@ PRIVS_C = $(SRC)/uts/common/os/priv_const.c $(PRIVS_C): $(PRIVS_AWK) $(PRIVS_DEF) $(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@ +CLOBBERFILES += $(PRIVS_C) + # # Prerequisites # diff --git a/usr/src/uts/intel/audioemu10k/Makefile b/usr/src/uts/intel/audioemu10k/Makefile index ff855e75f4..e1d1e2e832 100644 --- a/usr/src/uts/intel/audioemu10k/Makefile +++ b/usr/src/uts/intel/audioemu10k/Makefile @@ -100,6 +100,8 @@ $(DSP_HDRS): $(ASM10K) $(DSP_SRCS) $(CPP) -D$(MODEL10K) -I$(DSP_SRCDIR) $(DSP_SRCDIR)/emu10k.dsp | \ $(OBJS_DIR)/asm10k $(ASM10KFLAGS) -h $@ +CLOBBERFILES += $(ASM10K) $(DSP_HDRS) + # # Include common targets. # diff --git a/usr/src/uts/intel/config/Makefile b/usr/src/uts/intel/config/Makefile index 24011ac853..c2c79f8697 100644 --- a/usr/src/uts/intel/config/Makefile +++ b/usr/src/uts/intel/config/Makefile @@ -116,14 +116,15 @@ $(BOOTDEVICEDB)/%: $(BOOTDEVICEDB) $(SRCDIR)/% $(SRCDIR)/priv_names: $(PRIVS_DEF) $(PRIVS_AWK) $(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v pnamesfile=$@ -clean clobber lint: +clean lint: +clobber: clobber.targ # # No lints, so keep the clobber and clean targets reasonable. # CLEANLINTFILES = Nothing_to_remove CLEANFILES = Nothing_to_remove -CLOBBERFILES = Nothing_to_remove +CLOBBERFILES = $(SRCDIR)/priv_names # # Include common targets. diff --git a/usr/src/uts/intel/genunix/Makefile b/usr/src/uts/intel/genunix/Makefile index 3c96c10d49..d1ae9be8bf 100644 --- a/usr/src/uts/intel/genunix/Makefile +++ b/usr/src/uts/intel/genunix/Makefile @@ -68,6 +68,7 @@ INSTALL_TARGET = $(GENUNIX) $(ROOTMODULE) # # Overrides # +CLOBBERFILES += $(GENUNIX) CLEANFILES += $(LIBSTUBS) $(LIBGEN) BINARY = diff --git a/usr/src/uts/intel/hwa1480_fw/Makefile b/usr/src/uts/intel/hwa1480_fw/Makefile index cc5dd3ef27..ace371f7a6 100644 --- a/usr/src/uts/intel/hwa1480_fw/Makefile +++ b/usr/src/uts/intel/hwa1480_fw/Makefile @@ -68,6 +68,9 @@ LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV LINTTAGS += -erroff=E_STATIC_UNUSED +CLEANFILES += $(WARLOCK_OUT) $(WARLOCK_OK) +CLOBBERFILES += $(BINSRC)/$(MODULE) + # # Default build targets. # @@ -78,10 +81,8 @@ def: $(DEF_DEPS) $(FWOBJ) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) diff --git a/usr/src/uts/intel/ip/Makefile b/usr/src/uts/intel/ip/Makefile index 18036a47a7..9df2e66f26 100644 --- a/usr/src/uts/intel/ip/Makefile +++ b/usr/src/uts/intel/ip/Makefile @@ -103,7 +103,10 @@ all: $(ALL_DEPS) $(SISCHECK_DEPS) clean: $(CLEAN_DEPS) $(SISCLEAN_DEPS) -clobber: $(CLOBBER_DEPS) $(SISCLEAN_DEPS) +# Need to clobber all build types due to ipctf.a +clobber: $(CLOBBER_DEPS) $(SISCLEAN_DEPS) \ + clobber.obj32 clobber.obj64 \ + clobber.debug32 clobber.debug64 lint: $(LINT_DEPS) diff --git a/usr/src/uts/intel/mwlfw/Makefile b/usr/src/uts/intel/mwlfw/Makefile index 960cb30b06..5885c6fc98 100644 --- a/usr/src/uts/intel/mwlfw/Makefile +++ b/usr/src/uts/intel/mwlfw/Makefile @@ -75,8 +75,6 @@ def: $(DEF_DEPS) $(FWOBJ) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(BINDEST)/$(FWBINCOPY) - $(RM) $(BINDEST)/$(BOOTBINCOPY) clobber: $(CLOBBER_DEPS) @@ -109,6 +107,9 @@ $(FWOBJ): cp $(BINSRC)/$(ORIGIN_BOOTBIN) $(BINDEST)/$(BOOTBINCOPY) $(ELFWRAP) $(WRAPOPT) -o $@ $(BINDEST)/$(FWBINCOPY) $(BINDEST)/$(BOOTBINCOPY) +CLOBBERFILES += $(BINDEST)/$(FWBINCOPY) +CLOBBERFILES += $(BINDEST)/$(BOOTBINCOPY) + # # Include common targets. # diff --git a/usr/src/uts/intel/qlc/Makefile b/usr/src/uts/intel/qlc/Makefile index 4363c69dcd..c9071abe6a 100644 --- a/usr/src/uts/intel/qlc/Makefile +++ b/usr/src/uts/intel/qlc/Makefile @@ -67,7 +67,6 @@ LDFLAGS += -dy -Nmisc/fctl LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED -FWTABLE = ql_fw_table.c FWIMAGES = 2200 FWIMAGES += 2300 FWIMAGES += 2400 @@ -76,7 +75,7 @@ FWIMAGES += 6322 FWIMAGES += 8100 FWMODULES = $(FWIMAGES:%=$(MODULE)_fw_%) -FWMODULES_SRC = $(FWIMAGES:%=$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_%.c) +FWMODULES_SRC = $(FWIMAGES:%=$(CONF_SRCDIR)/ql_fw_%.c) CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-type-limits @@ -87,35 +86,21 @@ CERRWARN += -_gcc=-Wno-parentheses # .KEEP_STATE: -all: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(ALL_DEPS) +all: $(ALL_DEPS) -def: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(DEF_DEPS) +def: $(DEF_DEPS) -clean: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_DEPS) +clean: $(CLEAN_DEPS) -clobber: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS) -lint: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(LINT_DEPS) +lint: $(LINT_DEPS) -modlintlib: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(MODLINTLIB_DEPS) +modlintlib: $(MODLINTLIB_DEPS) -clean.lint: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_LINT_DEPS) +clean.lint: $(CLEAN_LINT_DEPS) -install: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(INSTALL_DEPS) - -$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c: $(FWMODULES_SRC) - /usr/bin/rm -f $@ - echo '#include <ql_apps.h>' >> $@ - echo '#include <ql_api.h>' >> $@ - echo 'struct fw_table fw_table[] = {' >> $@ - grep FW_VERSION_STRING $(FWMODULES_SRC) |\ - grep '#define' |\ - sed 's/[0-9]"/& },/' |\ - sed 's/.*ql_fw_/{ 0x/' |\ - sed 's/.c:#define/,/' |\ - sed 's/FW_VERSION_STRING//' >> $@ - echo '{ 0, NULL }' >> $@ - echo '};' >> $@ +install: $(INSTALL_DEPS) # # Include common targets. diff --git a/usr/src/uts/intel/uathfw/Makefile b/usr/src/uts/intel/uathfw/Makefile index 00ab72c996..27791c3004 100644 --- a/usr/src/uts/intel/uathfw/Makefile +++ b/usr/src/uts/intel/uathfw/Makefile @@ -75,7 +75,6 @@ def: $(DEF_DEPS) $(FWOBJ) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(BINDEST)/$(BINCOPY) clobber: $(CLOBBER_DEPS) @@ -105,6 +104,8 @@ $(FWOBJ): cp $(BINSRC)/$(ORIGIN_SRC) $(BINDEST)/$(BINCOPY) $(ELFWRAP) $(WRAPOPT) -o $@ $(BINDEST)/$(BINCOPY) +CLOBBERFILES += $(BINDEST)/$(BINCOPY) + # # Include common targets. # diff --git a/usr/src/uts/sparc/config/Makefile b/usr/src/uts/sparc/config/Makefile index 767ed0b41a..8f5c587049 100644 --- a/usr/src/uts/sparc/config/Makefile +++ b/usr/src/uts/sparc/config/Makefile @@ -79,14 +79,15 @@ $(ROOTETCSEC)/%: $(SRCDIR)/% $(SRCDIR)/priv_names: $(PRIVS_DEF) $(PRIVS_AWK) $(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) -v pnamesfile=$@ -clean clobber lint: +clean lint: +clobber: clobber.targ # # No lints, so keep the clobber and clean targets reasonable. # CLEANLINTFILES = Nothing_to_remove CLEANFILES = Nothing_to_remove -CLOBBERFILES = Nothing_to_remove +CLOBBERFILES = $(SRCDIR)/priv_names # # Include common targets. diff --git a/usr/src/uts/sparc/qlc/Makefile b/usr/src/uts/sparc/qlc/Makefile index c4482bb21f..92494ed283 100644 --- a/usr/src/uts/sparc/qlc/Makefile +++ b/usr/src/uts/sparc/qlc/Makefile @@ -67,7 +67,6 @@ LDFLAGS += -dy -Nmisc/fctl LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED -FWTABLE = ql_fw_table.c FWIMAGES = 2200 FWIMAGES += 2300 FWIMAGES += 2400 @@ -76,7 +75,7 @@ FWIMAGES += 6322 FWIMAGES += 8100 FWMODULES = $(FWIMAGES:%=$(MODULE)_fw_%) -FWMODULES_SRC = $(FWIMAGES:%=$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_%.c) +FWMODULES_SRC = $(FWIMAGES:%=$(CONF_SRCDIR)/ql_fw_%.c) CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-type-limits @@ -87,35 +86,21 @@ CERRWARN += -_gcc=-Wno-parentheses # .KEEP_STATE: -all: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(ALL_DEPS) +all: $(ALL_DEPS) -def: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(DEF_DEPS) +def: $(DEF_DEPS) -clean: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_DEPS) +clean: $(CLEAN_DEPS) -clobber: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLOBBER_DEPS) +clobber: $(CLOBBER_DEPS) -lint: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(LINT_DEPS) +lint: $(LINT_DEPS) -modlintlib: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(MODLINTLIB_DEPS) +modlintlib: $(MODLINTLIB_DEPS) -clean.lint: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_LINT_DEPS) +clean.lint: $(CLEAN_LINT_DEPS) -install: $(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(INSTALL_DEPS) - -$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c: $(FWMODULES_SRC) - /usr/bin/rm -f $@ - echo '#include <ql_apps.h>' >> $@ - echo '#include <ql_api.h>' >> $@ - echo 'struct fw_table fw_table[] = {' >> $@ - grep FW_VERSION_STRING $(FWMODULES_SRC) |\ - grep '#define' |\ - sed 's/[0-9]"/& },/' |\ - sed 's/.*ql_fw_/{ 0x/' |\ - sed 's/.c:#define/,/' |\ - sed 's/FW_VERSION_STRING//' >> $@ - echo '{ 0, NULL }' >> $@ - echo '};' >> $@ +install: $(INSTALL_DEPS) # # Include common targets. diff --git a/usr/src/uts/sun4u/Makefile b/usr/src/uts/sun4u/Makefile index f54be0bccd..d08775e68e 100644 --- a/usr/src/uts/sun4u/Makefile +++ b/usr/src/uts/sun4u/Makefile @@ -83,6 +83,8 @@ def all clean clobber clean.lint: genassym unix .WAIT \ $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \ $(IMPLEMENTATIONS) $(CLOSED_IMPLEMENTATIONS) +clobber: clobber.targ + # list the modules under sun4u. modlist: unix $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \ $(IMPLEMENTATIONS:.WAIT=) $(CLOSED_IMPLEMENTATIONS) @@ -115,6 +117,7 @@ PRIVS_C = $(UTSBASE)/common/os/priv_const.c $(PRIVS_C): $(PRIVS_AWK) $(PRIVS_DEF) $(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@ +CLOBBERFILES += $(PRIVS_C) # # Prerequisites |