13559 remove lingering references to usr/closed

Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Reviewed by: Yuri Pankov <yuripv@yuripv.dev>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>

16 files changed, 30 insertions, 74 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index abe9da51a4..3bbabeb7f5 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -124,10 +124,6 @@ __GNUC64=		$(__GNUC)
 # uncomment things in the lower Makefiles to enable the feature.
 ENABLE_SMB_PRINTING=	$(POUND_SIGN)
 
-# CLOSED is the root of the tree that contains source which isn't released
-# as open source
-CLOSED=		$(SRC)/../closed
-
 # BUILD_TOOLS is the root of all tools including compilers.
 # ONBLD_TOOLS is the root of all the tools that are part of SUNWonbld.
 
diff --git a/usr/src/cmd/mdb/Makefile.common b/usr/src/cmd/mdb/Makefile.common
index ff81215380..be0f680194 100644
--- a/usr/src/cmd/mdb/Makefile.common
+++ b/usr/src/cmd/mdb/Makefile.common
@@ -105,8 +105,4 @@ COMMON_MODULES_KVM = \
 	usba \
 	zfs
 
-CLOSED_COMMON_MODULES_KVM = \
-	mpt \
-	nfs
-
 include $(SRC)/Makefile.master
diff --git a/usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile
index 8c156163bd..5aa4aeded0 100644
--- a/usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile
@@ -41,8 +41,8 @@ include	$(SRC)/cmd/picl/plugins/Makefile.com
 CPPFLAGS +=	-D_REENTRANT -I$(SRC)/uts/sun4u/serengeti
 CPPFLAGS +=	-I$(SRC)/uts/sun4u/serengeti
 CPPFLAGS +=	-I$(SRC)/uts/sun4u/lw8
-CPPFLAGS +=	-I$(SRC)/uts/sun4u -I$(CLOSED)/uts/sun4u
-CPPFLAGS +=	-I$(SRC)/uts/common -I$(CLOSED)/uts/common
+CPPFLAGS +=	-I$(SRC)/uts/sun4u
+CPPFLAGS +=	-I$(SRC)/uts/common
 
 SRCS =		$(OBJECTS:%.o=%.c)
 
@@ -90,8 +90,6 @@ $(LIBLINKS):	FRC
 include $(SRC)/lib/Makefile.targ
 include	$(SRC)/cmd/picl/plugins/Makefile.targ
 
-lint:
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/cmd/tsol/Makefile b/usr/src/cmd/tsol/Makefile
index 98d1e0ae26..a9f4ad8623 100644
--- a/usr/src/cmd/tsol/Makefile
+++ b/usr/src/cmd/tsol/Makefile
@@ -66,16 +66,15 @@ all	:=	TARGET = all
 install :=	TARGET = install
 clean	:=	TARGET = clean
 clobber	:=	TARGET = clobber
-lint	:=	TARGET = lint
 _msg	:=	TARGET = _msg
 
 .KEEP_STATE:
 
 .PARALLEL:	$(SUBDIRS)
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
 
-$(POFILE): $(MSGSUBDIRS) $(CLOSED_MSGSUBDIRS)
+$(POFILE): $(MSGSUBDIRS)
 	$(RM) $(POFILE)
 	$(CAT) $(POFILES) > $(POFILE)
 
diff --git a/usr/src/lib/libprtdiag_psr/sparc/Makefile.com b/usr/src/lib/libprtdiag_psr/sparc/Makefile.com
index 87d15f16a8..265c92b6ac 100644
--- a/usr/src/lib/libprtdiag_psr/sparc/Makefile.com
+++ b/usr/src/lib/libprtdiag_psr/sparc/Makefile.com
@@ -57,7 +57,6 @@ CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	$(CNOWARN_UNINIT)
 CERRWARN +=	-_gcc=-Wno-address
 IFLAGS +=	-I $(UTSBASE)/sun4u
-IFLAGS +=	-I $(UTSCLOSED)/sun4u
 CPPFLAGS =	$(IFLAGS) $(CPPFLAGS.master)
 LDLIBS +=	-L $(ROOT)/usr/platform/$(PSR_MACH)/lib -lprtdiag -lc
 DYNFLAGS +=	-R /usr/platform/$(PSR_MACH)/lib
diff --git a/usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile b/usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile
index f4d803ccee..6feb073942 100644
--- a/usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile
+++ b/usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile
@@ -24,7 +24,6 @@
 #
 # lib/libprtdiag_psr/sparc/montoya/Makefile
 
-UTSCLOSED = ../../../../uts
 UTSBASE   = ../../../../../src/uts
 
 PLATFORM_OBJECTS= montoya.o
diff --git a/usr/src/psm/stand/boot/Makefile b/usr/src/psm/stand/boot/Makefile
index e04bea902f..a9a0654bf0 100644
--- a/usr/src/psm/stand/boot/Makefile
+++ b/usr/src/psm/stand/boot/Makefile
@@ -34,14 +34,13 @@ all		:=	TARGET= all
 install		:=	TARGET= install
 clean		:=	TARGET= clean
 clobber		:=	TARGET= clobber
-lint		:=	TARGET= lint
 
 .KEEP_STATE:
 
-all install lint clean: $(SUBDIRS)
+all install clean: $(SUBDIRS)
 
 clobber: $(SUBDIRS)
-	$(RM) make.out lint.out
+	$(RM) make.out
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
@@ -50,12 +49,11 @@ $(SUBDIRS): FRC
 # Cross-reference customization: include all boot-related source files.
 #
 UTSDIR =	../../../uts
-UTSCLOSED =	../../../../closed/uts
 STANDLIBDIR =	../../../stand/lib
 STANDSYSDIRS =	../../../stand/sys
 PROMDIRS =	../../promif
 NAMESDIRS =	../lib/names
-XRDIRS += 	$(STANDLIBDIR) $(STANDSYSDIRS) $(PROMDIRS) $(NAMESDIRS)
+XRDIRS +=	$(STANDLIBDIR) $(STANDSYSDIRS) $(PROMDIRS) $(NAMESDIRS)
 
 #
 # Components beginning with B! are in the open and closed trees; those
diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile
index ab5b638510..3ddfad375e 100644
--- a/usr/src/tools/Makefile
+++ b/usr/src/tools/Makefile
@@ -164,9 +164,9 @@ bootstrap: $(BOOT_SUBDIRS)
 
 _msg: $(MSGSUBDIRS)
 
-.PARALLEL: $(SUBDIRS) $(CLOSED_SUBDIRS)
+.PARALLEL: $(SUBDIRS)
 
-$(SUBDIRS) $(CLOSED_SUBDIRS): $(BOOT_SUBDIRS)
+$(SUBDIRS): $(BOOT_SUBDIRS)
 
 $(BOOT_SUBDIRS) $(SUBDIRS): $$(DOROOTDIRS) $$(DOROOTONBLDLIBPY) FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/uts/common/sharefs/Makefile b/usr/src/uts/common/sharefs/Makefile
index 611e080a6c..162b45010a 100644
--- a/usr/src/uts/common/sharefs/Makefile
+++ b/usr/src/uts/common/sharefs/Makefile
@@ -21,10 +21,8 @@
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-# 
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# uts/common/nfs/Makefile
+
 #
 # include global definitions
 #
@@ -38,8 +36,8 @@ ROOTDIRS= $(ROOT)/usr/include/sharefs
 
 ROOTHDRS= $(ALLHDRS:%=$(ROOTDIRS)/%)
 
-CHECKHDRS= $(HDRS:%.h=%.check) \
-	$(CLOSEDHDRS:%.h=$(CLOSED)/uts/common/sharefs/%.check)
+CHECKHDRS= $(HDRS:%.h=%.check)
+
 
 $(ROOTDIRS)/%: %
 	$(INS.file)
diff --git a/usr/src/uts/sun4u/grover/Makefile b/usr/src/uts/sun4u/grover/Makefile
index f9883da5e1..776bff91c8 100644
--- a/usr/src/uts/sun4u/grover/Makefile
+++ b/usr/src/uts/sun4u/grover/Makefile
@@ -56,25 +56,20 @@ check		:=	TARGET= check
 #
 .KEEP_STATE:
 
-def all clean clobber modlist: $(GROVER_KMODS) \
-	$(CLOSED_GROVER_KMODS)
+def all clean clobber modlist: $(GROVER_KMODS)
 
 install:	$(ROOT_GROVER_DIR) \
 		$(USR_GROVER_DIR) \
 		$(USR_GROVER_INC_DIR) \
 		$(USR_GROVER_SBIN_DIR) \
 		$(USR_GROVER_LIB_DIR) \
-		$(GROVER_KMODS) \
-		$(CLOSED_GROVER_KMODS)
+		$(GROVER_KMODS)
 
 check install_h:
 
 $(GROVER_KMODS): FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
-$(CLOSED_GROVER_KMODS): FRC
-	cd $(CLOSED)/uts/sun4u/grover/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
 #
 #	Include common targets.
 #
diff --git a/usr/src/uts/sun4u/javelin/Makefile b/usr/src/uts/sun4u/javelin/Makefile
index 2f8ed9a641..fe401c83ef 100644
--- a/usr/src/uts/sun4u/javelin/Makefile
+++ b/usr/src/uts/sun4u/javelin/Makefile
@@ -54,23 +54,20 @@ check		:=	TARGET= check
 #
 .KEEP_STATE:
 
-def all clean clobber modlist: $(JAVELIN_KMODS) \
-		$(CLOSED_JAVELIN_KMODS)
+def all clean clobber modlist: $(JAVELIN_KMODS)
+
 
 install:	$(ROOT_JAVELIN_DIR) $(USR_JAVELIN_DIR) \
 		$(USR_JAVELIN_INC_DIR) \
 		$(USR_JAVELIN_SBIN_DIR) \
 		$(USR_JAVELIN_LIB_DIR) \
-		.WAIT $(JAVELIN_KMODS) $(CLOSED_JAVELIN_KMODS)
+		.WAIT $(JAVELIN_KMODS)
 
 install_h check:
 
 $(JAVELIN_KMODS):	FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
-$(CLOSED_JAVELIN_KMODS):	FRC
-	cd $(CLOSED)/uts/sun4u/javelin/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
 #
 #	Include common targets.
 #
diff --git a/usr/src/uts/sun4u/mpxu/Makefile b/usr/src/uts/sun4u/mpxu/Makefile
index 6014c8761e..35f9c232c1 100644
--- a/usr/src/uts/sun4u/mpxu/Makefile
+++ b/usr/src/uts/sun4u/mpxu/Makefile
@@ -54,7 +54,7 @@ check		:=	TARGET= check
 #
 .KEEP_STATE:
 
-def all clean clobber modlist: $(MPXU_KMODS) $(CLOSED_MPXU_KMODS)
+def all clean clobber modlist: $(MPXU_KMODS)
 
 IMPLEMENTED_PLATFORM	= SUNW,Sun-Fire-V240
 
@@ -71,15 +71,11 @@ install:	$(ROOT_MPXU_DIR) $(USR_MPXU_DIR) \
 		$(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%) \
 		$(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%) \
 		$(MPXU_CRYPTO_LINKS) \
-		$(CLOSED_MPXU_KMODS) \
 		.WAIT $(MPXU_KMODS)
 
 $(MPXU_KMODS): FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
-$(CLOSED_MPXU_KMODS): FRC
-	cd $(CLOSED)/uts/sun4u/mpxu/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
 $(MPXU_CRYPTO_LINKS): $(ROOT_MPXU_CRYPTO_DIR_64)
 	-$(RM) $(ROOT_MPXU_CRYPTO_DIR_64)/$@;
 	$(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ $(ROOT_MPXU_CRYPTO_DIR_64)/$@
diff --git a/usr/src/uts/sun4u/opl/Makefile b/usr/src/uts/sun4u/opl/Makefile
index 38522fbb5b..c878bb1144 100644
--- a/usr/src/uts/sun4u/opl/Makefile
+++ b/usr/src/uts/sun4u/opl/Makefile
@@ -54,9 +54,9 @@ check		:=	TARGET= check
 .KEEP_STATE:
 
 def all clean clobber: genassym unix .WAIT \
-		$(OPL_CPU_KMODS) $(OPL_KMODS) $(CLOSED_OPL_KMODS)
+		$(OPL_CPU_KMODS) $(OPL_KMODS)
 
-modlist:	unix $(OPL_CPU_KMODS) $(OPL_KMODS) $(CLOSED_OPL_KMODS)
+modlist:	unix $(OPL_CPU_KMODS) $(OPL_KMODS)
 
 IMPLEMENTED_PLATFORM	= SUNW,SPARC-Enterprise
 
@@ -68,14 +68,11 @@ install: $(ROOT_OPL_DIR) $(USR_OPL_DIR) \
 	$(USR_OPL_LIB_DIR) \
 	$(OPL_CRYPTO_LINKS) \
 	genassym unix .WAIT $(OPL_CPU_KMODS) $(OPL_KMODS) \
-	$(CLOSED_OPL_KMODS) $(OPLMSU_OPTION)
+	$(OPLMSU_OPTION)
 
 genassym unix $(OPL_KMODS) $(OPL_CPU_KMODS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
-$(CLOSED_OPL_KMODS): FRC
-	cd $(CLOSED)/uts/sun4u/opl/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
 $(OPL_CRYPTO_LINKS): $(ROOT_OPL_CRYPTO_DIR_64)
 	-$(RM) $(ROOT_OPL_CRYPTO_DIR_64)/$@
 	$(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ $(ROOT_OPL_CRYPTO_DIR_64)/$@
diff --git a/usr/src/uts/sun4u/sunfire/Makefile b/usr/src/uts/sun4u/sunfire/Makefile
index d3d0cfc768..72f0ccea2b 100644
--- a/usr/src/uts/sun4u/sunfire/Makefile
+++ b/usr/src/uts/sun4u/sunfire/Makefile
@@ -54,8 +54,7 @@ check		:=	TARGET= check
 #
 .KEEP_STATE:
 
-def all clean clobber modlist: \
-	$(SUNFIRE_KMODS) $(CLOSED_SUNFIRE_KMODS)
+def all clean clobber modlist: $(SUNFIRE_KMODS)
 
 IMPLEMENTED_PLATFORM	= SUNW,Ultra-Enterprise
 
@@ -63,7 +62,7 @@ install:	$(ROOT_SUNFIRE_DIR) $(USR_SUNFIRE_DIR) \
 		$(USR_SUNFIRE_INC_DIR) \
 		$(USR_SUNFIRE_SBIN_DIR) \
 		$(USR_SUNFIRE_LIB_DIR) \
-		.WAIT $(SUNFIRE_KMODS) $(CLOSED_SUNFIRE_KMODS)
+		.WAIT $(SUNFIRE_KMODS)
 
 install_h check:	FRC
 	@cd sys; pwd; $(MAKE) $(TARGET)
@@ -71,9 +70,6 @@ install_h check:	FRC
 $(SUNFIRE_KMODS): FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
-$(CLOSED_SUNFIRE_KMODS): FRC
-	@cd $(CLOSED)/uts/sun4u/sunfire/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
 #
 #	Include common targets.
 #
diff --git a/usr/src/uts/sun4u/tazmo/Makefile b/usr/src/uts/sun4u/tazmo/Makefile
index 53480d8bb5..3f898a0c9a 100644
--- a/usr/src/uts/sun4u/tazmo/Makefile
+++ b/usr/src/uts/sun4u/tazmo/Makefile
@@ -55,22 +55,19 @@ check		:=	TARGET= check
 #
 .KEEP_STATE:
 
-def all clean clobber modlist: $(TAZMO_KMODS) $(CLOSED_TAZMO_KMODS)
+def all clean clobber modlist: $(TAZMO_KMODS)
 
 install:	$(ROOT_TAZMO_DIR) $(USR_TAZMO_DIR) \
 		$(USR_TAZMO_INC_DIR) \
 		$(USR_TAZMO_SBIN_DIR) \
 		$(USR_TAZMO_LIB_DIR) \
-		$(TAZMO_KMODS) $(CLOSED_TAZMO_KMODS)
+		$(TAZMO_KMODS)
 
 check install_h:
 
 $(TAZMO_KMODS): FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
-$(CLOSED_TAZMO_KMODS): FRC
-	cd $(CLOSED)/uts/sun4u/tazmo/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
 #
 #	Include common targets.
 #
diff --git a/usr/src/uts/sun4v/Makefile b/usr/src/uts/sun4v/Makefile
index 4e1ac2a6da..f16af3e3c8 100644
--- a/usr/src/uts/sun4v/Makefile
+++ b/usr/src/uts/sun4v/Makefile
@@ -53,19 +53,17 @@ check		:=	TARGET= check
 
 .KEEP_STATE:
 
-.PARALLEL:	$(PARALLEL_KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
-		modlist modlist.sparc
+.PARALLEL:	$(PARALLEL_KMODS) $(XMODS) modlist modlist.sparc
 
 # Override for CPU_KMODS... they cannot be built
 # in parallel
 .NO_PARALLEL:	$(CPU_KMODS)
 
 def all clean clobber: genassym unix .WAIT \
-	$(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) $(IMPLEMENTATIONS)
+	$(KMODS) $(XMODS) $(IMPLEMENTATIONS)
 
 # list the modules under sun4v.
-modlist: unix $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
-	$(IMPLEMENTATIONS)
+modlist: unix $(KMODS) $(XMODS) $(IMPLEMENTATIONS)
 
 # list the modules for Install -k sun4v.
 modlist.karch: modlist modlist.sparc
@@ -73,8 +71,8 @@ modlist.karch: modlist modlist.sparc
 modlist.sparc:
 	@cd $(SRC)/uts/sparc; pwd; $(MAKE) $(NO_STATE) modlist
 
-install: install_platforms genassym unix .WAIT $(KMODS) $(CLOSED_KMODS) \
-	$(XMODS) $(CLOSED_XMODS) $(IMPLEMENTATIONS)
+install: install_platforms genassym unix .WAIT $(KMODS) \
+	$(XMODS) $(IMPLEMENTATIONS)
 
 genassym unix $(KMODS):	FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
@@ -85,9 +83,6 @@ $(IMPLEMENTATIONS):	FRC
 $(XMODS):	FRC
 	cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
-$(CLOSED_KMODS):	FRC
-	cd $(CLOSED)/uts/sun4v/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
 install_h check:	install_platforms $(IMPLEMENTATIONS) FRC
 	@cd sys; pwd; $(MAKE) $(TARGET)
 	@cd vm; pwd; $(MAKE) $(TARGET)