Print this page
4027 remove CLOSED_BUILD
4028 remove CLOSED_IS_PRESENT
4029 remove tonic build bits
Reviewed by: Andy Stormont <andyjstormont@gmail.com>

@@ -44,11 +44,10 @@
 #
 #
 #
 LINT_LIBS        = $(LINT_LIB) \
                    $(LINT_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
-                   $(CLOSED_LINT_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
                    $(SPARC_LINTS:%=$(SPARC_LIB_DIR)/llib-l%.ln)
 
 
 def             :=      TARGET= def
 def.prereq      :=      TARGET= def

@@ -69,40 +68,38 @@
 clean.lint      :=      TARGET= clean.lint
 check           :=      TARGET= check
 
 .KEEP_STATE:
 
-.PARALLEL:      $(PARALLEL_KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
-                $(IMPLEMENTATIONS) $(CLOSED_IMPLEMENTATIONS) \
+.PARALLEL:      $(PARALLEL_KMODS) $(XMODS) \
+                $(IMPLEMENTATIONS) \
                 modlist modlist.sparc
 
 # Override for CPU_KMODS... they cannot be built
 # in parallel
 .NO_PARALLEL:   $(CPU_KMODS)
 
 def all clean clobber clean.lint: genassym unix .WAIT \
-        $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
-        $(IMPLEMENTATIONS) $(CLOSED_IMPLEMENTATIONS)
+        $(KMODS) $(XMODS) $(IMPLEMENTATIONS)
 
 clobber: clobber.targ
 
 # list the modules under sun4u.
-modlist: unix $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
-        $(IMPLEMENTATIONS:.WAIT=) $(CLOSED_IMPLEMENTATIONS)
+modlist: unix $(KMODS) $(XMODS) $(IMPLEMENTATIONS:.WAIT=)
 
 # list the modules for Install -k sun4u.
 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) $(CLOSED_IMPLEMENTATIONS)
+install: install_platforms genassym unix .WAIT $(KMODS) \
+        $(XMODS) $(IMPLEMENTATIONS)
 
 lintlib:        unix
 
-modlintlib:     $(LINT_KMODS) $(CLOSED_LINT_KMODS)
+modlintlib:     $(LINT_KMODS)
 
 genassym unix $(KMODS): FRC
         @cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
 #

@@ -193,33 +190,18 @@
 #
 
 $(IMPLEMENTATIONS):     FRC
         @cd $@; pwd; THISIMPL=$@ $(MAKE) $(NO_STATE) $(TARGET)
 
-$(CLOSED_IMPLEMENTATIONS):      FRC
-        cd $(CLOSED)/uts/sun4u/$@; pwd; \
-            THISIMPL=$@ $(MAKE) $(NO_STATE) $(TARGET); \
-
 $(XMODS):       FRC
         @if [ -f $@/Makefile  ]; then \
                 cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
         else \
                 true; \
         fi
 
-$(CLOSED_XMODS):        FRC
-        @if [ -f $(CLOSED)/uts/sun4u/$@/Makefile ]; then \
-                cd $(CLOSED)/uts/sun4u/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
-        else \
-                true; \
-        fi
-
-$(CLOSED_KMODS):        FRC
-        cd $(CLOSED)/uts/sun4u/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
-
 install_h check: install_platforms $(IMPLEMENTATIONS) \
-        $(CLOSED_IMPLEMENTATIONS) FRC
         @cd sys; pwd; $(MAKE) $(TARGET)
         @cd vm; pwd; $(MAKE) $(TARGET)
 
 #
 # Rules for the /platforms directories.  This is hardwired here because

@@ -285,22 +267,18 @@
         @pwd
         @-$(ECHO) "\nSUN4U KERNEL: global crosschecks:"
         @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2)
 
 lint:   lintlib .WAIT modlintlib .WAIT $(SPARC_LINTS) $(LINT_DEPS) \
-        $(IMPLEMENTATIONS) $(CLOSED_IMPLEMENTATIONS) $(CPU_KMODS)
+        $(IMPLEMENTATIONS) $(CPU_KMODS)
 
 include ../Makefile.targ
 
 #
 # Cross-reference customization: build a cross-reference over all of the
 # sun4u-related directories.
 #
-SHARED_XRDIRS   = ../sun4u ../sun4 ../sfmmu ../sparc ../sun ../common
-CLOSED_XRDIRS   = $(SHARED_XRDIRS:../%=../% ../../../closed/uts/%)
-XRDIRS          = $(SHARED_XRDIRS)
-$(CLOSED_BUILD)XRDIRS   = $(CLOSED_XRDIRS:../../../closed/uts/sfmmu=)
-
+XRDIRS  = ../sun4u ../sun4 ../sfmmu ../sparc ../sun ../common
 XRPRUNE = i86pc
 
 cscope.out tags: FRC
         $(XREF) -x $@