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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/intel/Makefile
          +++ new/usr/src/uts/intel/Makefile
↓ open down ↓ 25 lines elided ↑ open up ↑
  26   26  #       independent modules for Intel processors.
  27   27  
  28   28  UTSBASE = ..
  29   29  
  30   30  include Makefile.intel
  31   31  
  32   32  LINT_KMODS_X1   = $(LINT_KMODS:nsmb=)
  33   33  LINT_KMODS_X2   = $(LINT_KMODS_X1:smbfs=)
  34   34  LINT_KMODLIBS   = $(LINT_KMODS_X2:e1000g=)
  35   35  LINT_LIBS       = $(LINT_LIB) $(GEN_LINT_LIB) \
  36      -                  $(LINT_KMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
  37      -                  $(CLOSED_LINT_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) 
  38      -
  39      -$(CLOSED_BUILD)LINT_LIBS        += $(SVVS_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln)
  40      -$(CLOSED_BUILD)LINT_CLOSED_XMOD4        = $(CLOSED_XMODS:bnx=)
  41      -$(CLOSED_BUILD)LINT_CLOSED_XMOD3        = $(LINT_CLOSED_XMOD4:bnxe=)
  42      -$(CLOSED_BUILD)LINT_CLOSED_XMOD2        = $(LINT_CLOSED_XMOD3:lsimega=)
  43      -$(CLOSED_BUILD)LINT_CLOSED_XMOD1        = $(LINT_CLOSED_XMOD2:adpu320=)
  44      -$(CLOSED_BUILD)LINT_LIBS        += $(LINT_XMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln)
       36 +                  $(LINT_KMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln)
  45   37  
  46   38  #
  47   39  # dprov is delivered in the SUNWcryptoint package.
  48   40  #
  49   41  DRV_KMODS       += dprov
  50   42  
  51   43  #
  52   44  #
  53   45  def             :=      TARGET= def
  54   46  def.prereq      :=      TARGET= def
↓ open down ↓ 8 lines elided ↑ open up ↑
  63   55  modlintlib      :=      TARGET= modlintlib
  64   56  modlist         :=      TARGET= modlist
  65   57  modlist         :=      NO_STATE= -K $$MODSTATE$$$$
  66   58  clean.lint      :=      TARGET= clean.lint
  67   59  check           :=      TARGET= check
  68   60  install_h       :=      TARGET= install_h
  69   61  install_h.prereq        :=      TARGET= install_h
  70   62  
  71   63  .KEEP_STATE:
  72   64  
  73      -.PARALLEL:      $(PARALLEL_KMODS) $(CLOSED_KMODS) $(SVVS) $(XMODS) \
  74      -                $(CLOSED_XMODS) config $(LINT_DEPS)
       65 +.PARALLEL:      $(PARALLEL_KMODS) $(XMODS) config $(LINT_DEPS)
  75   66  
  76      -def all install clean clobber modlist: $(KMODS) $(CLOSED_KMODS) \
  77      -        $(SVVS) $(XMODS) $(CLOSED_XMODS) config
       67 +def all install clean clobber modlist: $(KMODS) $(XMODS) config
  78   68  
  79   69  clobber: clobber.targ
  80   70  
  81   71  #
  82   72  # Privilege constants
  83   73  #
  84   74  # NOTE: The rules for generating priv_const.c file are shared between all
  85   75  # processor architectures and and should be kept in sync. If they are changed in
  86   76  # this file make sure that sparc rules are updated as well.
  87   77  #
↓ open down ↓ 37 lines elided ↑ open up ↑
 125  115  lint.prereq: FRC
 126  116          @cd ../i86pc; pwd; $(MAKE) $(NO_STATE) lint
 127  117  
 128  118  #
 129  119  # Nothing to do for any other prerequisite targets.
 130  120  #
 131  121  %.prereq:
 132  122  
 133  123  genunix: $(PRIVS_C)
 134  124  
 135      -modlintlib clean.lint: $(LINT_KMODS) $(CLOSED_LINT_KMODS) $(SVVS) \
 136      -        $(XMODS) $(CLOSED_XMODS)
      125 +modlintlib clean.lint: $(LINT_KMODS) $(XMODS)
 137  126  
 138  127  $(KMODS) $(SUBDIRS) config:     FRC
 139  128          @cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 140  129  
 141      -$(CLOSED_KMODS):        FRC
 142      -        cd $(CLOSED)/uts/intel/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 143      -
 144  130  $(XMODS):       FRC
 145  131          @if [ -f $@/Makefile  ]; then \
 146  132                  cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
 147  133          else \
 148  134                  true; \
 149  135          fi
 150  136  
 151      -$(SVVS) $(CLOSED_XMODS):        FRC
 152      -        @if [ -f $(CLOSED)/uts/intel/$@/Makefile  ]; then \
 153      -                cd $(CLOSED)/uts/intel/$@; pwd; \
 154      -                    $(MAKE) $(NO_STATE) $(TARGET); \
 155      -        else \
 156      -                true; \
 157      -        fi
 158      -
 159  137  install_h check:        FRC
 160  138          @cd sys; pwd; $(MAKE) $(TARGET)
 161  139          @cd asm; pwd; $(MAKE) $(TARGET)
 162  140          @cd ia32/sys; pwd; $(MAKE) $(TARGET)
 163  141          @cd amd64/sys; pwd; $(MAKE) $(TARGET)
 164  142  
 165  143  #
 166  144  # Work-around to disable acpica global crosscheck lint warnings
 167  145  #
 168  146  LGREP.intel =   grep -v 'intel/io/acpica'
↓ open down ↓ 17 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX