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/sparc/sd/Makefile
          +++ new/usr/src/uts/sparc/sd/Makefile
↓ open down ↓ 127 lines elided ↑ open up ↑
 128  128  #
 129  129  # Note that in warlock_with_{esp,isp} it is important to load sd.ll
 130  130  # before {isp,esp}.ll; the reason is that both have _init/_info/_fini
 131  131  # and warlock can only handle one extern function by a given name;
 132  132  # any loaded after the first are ignored.
 133  133  
 134  134  SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
 135  135  CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll)
 136  136  
 137  137  WARLOCK_TARGETS = warlock_alone warlock_with_esp warlock_with_fas
 138      -$(CLOSED_BUILD)WARLOCK_TARGETS += warlock_with_isp warlock_with_glm \
 139      -        warlock_with_uata warlock_with_mpt
 140  138  
 141  139  warlock: $(WARLOCK_TARGETS)
 142  140  
 143  141  warlock_alone: $(WARLOCK_OK)
 144  142  
 145  143  $(WARLOCK_OK): $(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) scsi_files \
 146  144          warlock_ddi.files cmlb_files
 147  145          $(WARLOCK) -c $(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) $(SCSI_FILES) \
 148  146                  $(CMLB_FILES) \
 149  147                  -l ../warlock/ddi_dki_impl.ll
↓ open down ↓ 9 lines elided ↑ open up ↑
 159  157                  -l ../warlock/ddi_dki_impl.ll
 160  158  
 161  159  warlock_with_fas: $(WLCMD_DIR)/sd_with_fas.wlcmd $(WARLOCK_OUT) scsi_files \
 162  160          fas_files warlock_ddi.files cmlb_files
 163  161          $(WARLOCK) -c $(WLCMD_DIR)/sd_with_fas.wlcmd \
 164  162                  $(WARLOCK_OUT) ../fas/fas \
 165  163                  ../fas/fas_callbacks \
 166  164                  $(SCSI_FILES) $(CMLB_FILES) \
 167  165                  -l ../warlock/ddi_dki_impl.ll
 168  166  
 169      -warlock_with_isp: $(WLCMD_DIR)/sd_with_isp.wlcmd $(WARLOCK_OUT) scsi_files \
 170      -        isp_files warlock_ddi.files cmlb_files
 171      -        $(WARLOCK) -c $(WLCMD_DIR)/sd_with_isp.wlcmd \
 172      -                $(WARLOCK_OUT) $(CLOSED)/uts/sparc/isp/isp $(SCSI_FILES) \
 173      -                $(CMLB_FILES) \
 174      -                -l ../warlock/ddi_dki_impl.ll
 175      -
 176      -warlock_with_glm: $(WLCMD_DIR)/sd_with_glm.wlcmd $(WARLOCK_OUT) scsi_files \
 177      -        glm_files warlock_ddi.files cmlb_files
 178      -        $(WARLOCK) -c $(WLCMD_DIR)/sd_with_glm.wlcmd \
 179      -                $(WARLOCK_OUT) $(CLOSED)/uts/sparc/glm/glm $(SCSI_FILES) \
 180      -                $(CMLB_FILES) \
 181      -                -l ../warlock/ddi_dki_impl.ll
 182      -
 183      -warlock_with_uata: $(WLCMD_DIR)/sd_with_uata.wlcmd $(WARLOCK_OUT) scsi_files \
 184      -        uata_files warlock_ddi.files cmlb_files
 185      -        $(WARLOCK) -c $(WLCMD_DIR)/sd_with_uata.wlcmd \
 186      -                $(WARLOCK_OUT) $(CLOSED)/uts/sparc/uata/*.ll $(SCSI_FILES) \
 187      -                $(CMLB_FILES) \
 188      -                -l ../warlock/ddi_dki_impl.ll
 189      -
 190      -warlock_with_mpt: $(WLCMD_DIR)/sd_with_mpt.wlcmd $(WARLOCK_OUT) scsi_files \
 191      -        mpt_files warlock_ddi.files cmlb_files
 192      -        $(WARLOCK) -c $(WLCMD_DIR)/sd_with_mpt.wlcmd \
 193      -                $(WARLOCK_OUT) $(CLOSED)/uts/sparc/mpt/*.ll $(SCSI_FILES)  \
 194      -                $(CMLB_FILES) \
 195      -                -l ../warlock/ddi_dki_impl.ll
 196      -
 197  167  cmlb_files:
 198  168          @cd ../cmlb; pwd; $(MAKE) warlock
 199  169  
 200  170  
 201  171  scsi_files:
 202  172          @cd ../scsi; pwd; $(MAKE) warlock
 203  173  
 204  174  esp_files:
 205  175          @cd ../esp; pwd; $(MAKE) warlock
 206  176  
 207  177  fas_files:
 208  178          @cd ../fas; pwd; $(MAKE) warlock
 209  179  
 210      -isp_files:
 211      -        @cd $(CLOSED)/uts/sparc/isp; pwd; $(MAKE) warlock
 212      -
 213      -glm_files:
 214      -        @cd $(CLOSED)/uts/sparc/glm; pwd; $(MAKE) warlock
 215      -
 216      -uata_files:
 217      -        @cd $(CLOSED)/uts/sparc/uata; pwd; $(MAKE) warlock
 218      -
 219      -mpt_files:
 220      -        @cd $(CLOSED)/uts/sparc/mpt; pwd; $(MAKE) warlock
 221      -
 222  180  warlock_ddi.files:
 223  181          @cd ../warlock; pwd; $(MAKE) warlock
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX