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/sun4v/sys/Makefile
          +++ new/usr/src/uts/sun4v/sys/Makefile
↓ open down ↓ 57 lines elided ↑ open up ↑
  58   58          scb.h                   \
  59   59          sun4asi.h               \
  60   60          tod.h                   \
  61   61          trapstat.h              \
  62   62          vis.h                   \
  63   63          vm_machparam.h          \
  64   64          x_call.h                \
  65   65          xc_impl.h               \
  66   66          zsmach.h
  67   67  
  68      -CLOSED_SUN4_HDRS=                       \
  69      -        memtestio.h
  70      -
  71   68  HDRS=   \
  72   69          ds_pri.h                \
  73   70          ds_snmp.h               \
  74   71          hypervisor_api.h        \
  75   72          hsvc.h                  \
  76   73          machasi.h               \
  77   74          machclock.h             \
  78   75          machcpuvar.h            \
  79   76          mach_descrip.h          \
  80   77          machintreg.h            \
↓ open down ↓ 4 lines elided ↑ open up ↑
  85   82          niagaraasi.h            \
  86   83          niagararegs.h           \
  87   84          ntwdt.h                 \
  88   85          pte.h                   \
  89   86          prom_plat.h             \
  90   87          qcn.h                   \
  91   88          soft_state.h            \
  92   89          traptrace.h             \
  93   90          vlds.h
  94   91  
  95      -CLOSED_HDRS=    \
  96      -        memtestio_kt.h          \
  97      -        memtestio_ni.h          \
  98      -        memtestio_n2.h          \
  99      -        memtestio_v.h           \
 100      -        memtestio_vf.h
 101      -
 102   92  ROOTHDRS=               $(HDRS:%=$(USR_PSM_ISYS_DIR)/%)
 103      -$(CLOSED_BUILD)ROOTHDRS += $(CLOSED_HDRS:%=$(USR_PSM_ISYS_DIR)/%)
 104   93  
 105   94  SUN4_ROOTHDRS=          $(SUN4_HDRS:%=$(USR_PSM_ISYS_DIR)/%)
 106      -$(CLOSED_BUILD)SUN4_ROOTHDRS += $(CLOSED_SUN4_HDRS:%=$(USR_PSM_ISYS_DIR)/%)
 107   95  
 108   96  ROOTDIR=                $(ROOT)/usr/share/src
 109   97  ROOTDIRS=               $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM)
 110   98  
 111   99  ROOTLINK=               $(ROOTDIR)/uts/$(PLATFORM)/sys
 112  100  LINKDEST=               ../../../../platform/$(PLATFORM)/include/sys
 113  101  
 114  102  CHECKHDRS=              $(HDRS:%.h=%.check) \
 115  103                          $(SUN4_HDRS:%.h=%.cmncheck)
 116  104  
 117      -$(CLOSED_BUILD)CHECKHDRS +=                     \
 118      -        $(CLOSED_HDRS:%.h=%.check)              \
 119      -        $(CLOSED_SUN4_HDRS:%.h=%.cmncheck)
 120      -
 121  105  .KEEP_STATE:
 122  106  
 123  107  .PARALLEL: $(CHECKHDRS) $(ROOTHDRS) $(SUN4_ROOTHDRS)
 124  108  
 125  109  install_h: $(ROOTDIRS) .WAIT \
 126  110                  $(ROOTHDRS) .WAIT \
 127  111                  $(SUN4_ROOTHDRS) .WAIT $(ROOTLINK)
 128  112  
 129  113  check:  $(CHECKHDRS)
 130  114  
 131  115  #
 132  116  # install rules
 133  117  #
 134  118  $(USR_PSM_ISYS_DIR)/%:  ../../sfmmu/sys/% $(USR_PSM_ISYS_DIR)
 135  119          $(INS.file)
 136  120  
 137  121  $(USR_PSM_ISYS_DIR)/%:  ../../sun4/sys/% $(USR_PSM_ISYS_DIR)
 138  122          $(INS.file)
 139  123  
 140      -$(USR_PSM_ISYS_DIR)/%:  $(CLOSED)/uts/sun4/sys/% $(USR_PSM_ISYS_DIR)
 141      -        $(INS.file)
 142      -
 143      -$(USR_PSM_ISYS_DIR)/%:  $(CLOSED)/uts/sun4v/sys/% $(USR_PSM_ISYS_DIR)
 144      -        $(INS.file)
 145      -
 146  124  $(ROOTDIRS):
 147  125          $(INS.dir)
 148  126  
 149  127  # -r because this used to be a directory and is now a link.
 150  128  $(ROOTLINK):    $(ROOTDIRS)
 151  129          -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
 152  130  
 153  131  mon/%.check:    mon/%.h
 154  132          $(DOT_H_CHECK)
 155  133  
 156  134  %.check:        ../../sfmmu/sys/%.h
 157  135          $(DOT_H_CHECK)
 158      -%.check:        $(CLOSED)/uts/sun4v/sys/%.h
 159      -        $(DOT_H_CHECK)
 160  136  %.cmncheck:     ../../sun4/sys/%.h
 161  137          $(DOT_H_CHECK)
 162      -%.cmncheck:     $(CLOSED)/uts/sun4/sys/%.h
 163      -        $(DOT_H_CHECK)
 164  138  
 165  139  FRC:
 166  140  
 167  141  include ../../Makefile.targ
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX