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/i86xpv/Makefile
          +++ new/usr/src/uts/i86xpv/Makefile
↓ open down ↓ 37 lines elided ↑ open up ↑
  38   38  #       not involved in the build in any other way. In order to minimize
  39   39  #       build time, it is assumed that they are up to date.
  40   40  #
  41   41  INTEL_LIB_DIR    = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR)
  42   42  
  43   43  INTEL_LINTS      = genunix
  44   44  
  45   45  LINT_LIBS        = \
  46   46                     $(GENUNIX_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
  47   47                     $(PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
  48      -                   $(CLOSED_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
  49   48                     $(INTEL_LINTS:%=$(INTEL_LIB_DIR)/llib-l%.ln)
  50   49  
  51   50  I86XPV_LINTS =  xdb xnb xnbe xnbo xnbu xpvtap
  52   51  
  53   52  #
  54   53  #
  55   54  #
  56   55  def             :=      TARGET= def
  57   56  all             :=      TARGET= all
  58   57  install         :=      TARGET= install
↓ open down ↓ 2 lines elided ↑ open up ↑
  61   60  lint            :=      TARGET= lint
  62   61  lintlib         :=      TARGET= lintlib
  63   62  machmodlintlib  :=      TARGET= modlintlib
  64   63  modlist         :=      TARGET= modlist
  65   64  modlist modlist.intel :=        NO_STATE= -K $$MODSTATE$$$$
  66   65  clean.lint      :=      TARGET= clean.lint
  67   66  check           :=      TARGET= check
  68   67  
  69   68  .KEEP_STATE:
  70   69  
  71      -.PARALLEL:      $(PARALLEL_KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS) \
  72      -                modlist modlist.intel
       70 +.PARALLEL:      $(PARALLEL_KMODS) $(XMODS) modlist modlist.intel
  73   71  
  74   72  INITIAL_TARGETS = \
  75   73          genassym \
  76   74          unix \
  77   75          cpu/scripts
  78   76  
  79   77  def all clean clobber clean.lint: setup genassym unix .WAIT \
  80      -        $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS)
       78 +        $(KMODS) $(XMODS)
  81   79  
  82   80  install: install_platforms setup genassym unix .WAIT \
  83      -        $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS)
       81 +        $(KMODS) $(XMODS)
  84   82  
  85   83  # Need to clean in here too because of lint.
  86   84  clean: $(I86XPV_LINTS)
  87   85  
  88   86  # list the modules under i86xpv.
  89      -modlist: unix $(KMODS) $(CLOSED_KMODS) $(XMODS) $(CLOSED_XMODS)
       87 +modlist: unix $(KMODS) $(XMODS)
  90   88  
  91   89  # list the modules for Install -k i86xpv.
  92   90  modlist.karch: modlist modlist.intel
  93   91  
  94   92  modlist.intel:
  95   93          @cd $(SRC)/uts/intel; pwd; $(MAKE) $(NO_STATE) modlist
  96   94  
  97   95  lintlib:        unix
  98   96  
  99      -modlintlib:     $(KMODS) $(CLOSED_KMODS)
       97 +modlintlib:     $(KMODS)
 100   98  
 101   99  genassym unix $(KMODS): FRC
 102  100          @cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 103  101  
 104  102  setup: FRC
 105  103          @cd cpu/scripts; pwd; $(MAKE) $(TARGET)
 106  104  
 107  105  $(XMODS):       FRC
 108  106          @if [ -f $@/Makefile  ]; then \
 109  107                  cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
 110  108          else \
 111  109                  true; \
 112  110          fi
 113  111  
 114      -$(CLOSED_KMODS):        FRC
 115      -        cd $(CLOSED)/uts/i86xpv/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 116      -
 117      -$(CLOSED_XMODS):        FRC
 118      -        @if [ -f $(CLOSED)/uts/i86xpv/$@/Makefile  ]; then \
 119      -                cd $(CLOSED)/uts/i86xpv/$@; pwd; \
 120      -                    $(MAKE) $(NO_STATE) $(TARGET); \
 121      -        else \
 122      -                true; \
 123      -        fi
 124      -
 125  112  install_h check:        FRC
 126  113          @cd sys; pwd; $(MAKE) $(TARGET)
 127  114  
 128  115  #
 129  116  # Definitions for the /platform directory aliases.
 130  117  # Currently none for i86xpv.
 131  118  #
 132  119  PLAT_LINKS      =
 133  120  
 134  121  #
↓ open down ↓ 24 lines elided ↑ open up ↑
 159  146          @cd $(UTSBASE)/intel/$@; pwd; $(MAKE) modlintlib
 160  147  
 161  148  FRC:
 162  149  
 163  150  include ../Makefile.targ
 164  151  
 165  152  #
 166  153  # Cross-reference customization: build a cross-reference over all of the
 167  154  # i86pc-related directories.
 168  155  #
 169      -SHARED_XRDIRS   = ../i86xpv ../i86pc ../intel ../common
 170      -XRDIRS          = $(SHARED_XRDIRS)
 171      -CLOSED_XRDIRS1  = $(SHARED_XRDIRS:../%=../% ../../../closed/uts/%)
 172      -CLOSED_XRDIRS2  = $(CLOSED_XRDIRS1:../../../closed/uts/i86pc=)
 173      -$(CLOSED_BUILD)XRDIRS   = $(CLOSED_XRDIRS2:../../../closed/uts/i86xpv=)
      156 +XRDIRS  = ../i86xpv ../i86pc ../intel ../common
 174  157  XRPRUNE = sun4v sun4u sun4 sfmmu sparc
 175  158  
 176  159  cscope.out tags: FRC
 177  160          $(XREF) -x $@
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX