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/sun/sys/Makefile
          +++ new/usr/src/uts/sun/sys/Makefile
↓ open down ↓ 35 lines elided ↑ open up ↑
  36   36  ser_async.h             ser_zscc.h \
  37   37  socalio.h               socalreg.h \
  38   38  socal_cq_defs.h         socalmap.h              socalvar.h \
  39   39  ttymux.h                ttymuxuser.h \
  40   40  zsdev.h
  41   41  
  42   42  SCSIADHDRS= \
  43   43  fascmd.h        fasdma.h \
  44   44  fasreg.h        fasvar.h        ifpio.h         sfvar.h
  45   45  
  46      -CLOSED_SCSIAD = $(CLOSED)/uts/sun/sys/scsi/adapters
  47      -
  48      -CLOSED_SCSIADHDRS= \
  49      -ifpcmd.h        ifpmail.h       ifpreg.h        ifpvar.h \
  50      -ispcmd.h        ispmail.h       ispreg.h        ispvar.h
  51      -
  52   46  SCSITARGHDRS= \
  53   47  
  54   48  ROOTDIR=        $(ROOT)/usr/include/sys
  55   49  ROOTDIRS=       $(ROOTDIR) \
  56   50                  $(ROOTDIR)/audio \
  57   51                  $(ROOTDIR)/scsi/adapters \
  58   52                  $(ROOTDIR)/scsi/targets
  59   53  
  60   54  ROOTHDRS= $(HDRS:%=$(ROOTDIR)/%)
  61      -$(CLOSED_BUILD)ROOTHDRS += $(CLOSED_HDRS:%=$(ROOTDIR)/%)
  62   55  ROOTFCHDRS= $(FCHDRS:%=$(ROOTDIR)/fc4/%)
  63   56  ROOTSCSIADHDRS= $(SCSIADHDRS:%=$(ROOTDIR)/scsi/adapters/%)
  64      -$(CLOSED_BUILD)ROOTSCSIADHDRS += \
  65      -        $(CLOSED_SCSIADHDRS:%=$(ROOTDIR)/scsi/adapters/%)
  66   57  ROOTSCSITARGHDRS= $(SCSITARGHDRS:%=$(ROOTDIR)/scsi/targets/%)
  67   58  
  68   59  
  69   60  # install rules
  70   61  $(ROOTDIR)/%: %
  71   62          $(INS.file)
  72   63  
  73      -$(ROOTDIR)/%: $(CLOSED)/uts/sun/sys/%
  74      -        $(INS.file)
  75      -
  76   64  $(ROOTDIR)/audio/%: audio/%
  77   65          $(INS.file)
  78   66  
  79   67  $(ROOTDIR)/scsi/adapters/%: scsi/adapters/%
  80   68          $(INS.file)
  81   69  
  82      -$(ROOTDIR)/scsi/adapters/%: $(CLOSED_SCSIAD)/%
  83      -        $(INS.file)
  84      -
  85   70  $(ROOTDIR)/scsi/targets/%: scsi/targets/%
  86   71          $(INS.file)
  87   72  
  88   73  # check files really don't exist
  89   74  
  90   75  audio/%.check:          audio/%.h
  91   76          $(DOT_H_CHECK)
  92   77  
  93   78  scsi/adapters/%.check:  scsi/adapters/%.h
  94   79          $(DOT_H_CHECK)
  95   80  
  96   81  scsi/targets/%.check:   scsi/targets/%.h
  97   82          $(DOT_H_CHECK)
  98   83  
  99   84  CHECKHDRS= \
 100   85          $(HDRS:%.h=%.check) \
 101   86          $(FCHDRS:%.h=fc4/%.check) \
 102   87          $(SCSIADHDRS:%.h=scsi/adapters/%.check) \
 103   88          $(SCSITARGHDRS:%.h=scsi/targets/%.check)
 104   89  
 105      -$(CLOSED_BUILD)CHECKHDRS += \
 106      -        $(CLOSED_HDRS:%.h=$(CLOSED)/uts/sun/sys/%.check) \
 107      -        $(CLOSED_SCSIADHDRS:%.h=$(CLOSED_SCSIAD)/%.check)
 108      -
 109   90  # headers which won't quite meet the standards...
 110   91  #
 111   92  # devops.h has a macro where the formal parameters to the macro are greater
 112   93  # than 80 characters.  cpp (or the equivalent built into acomp) does not allow
 113   94  # continuation line breaks in the formal parameter list.  This could be fixed
 114   95  # by giving shorter names to the formal parameters, but the right fix is to
 115   96  # fix cpp.  (Also, /* CSTYLED */ doesn't seem to fix this.
 116   97  #
 117   98  devops.check    := CSTYLE_TAIL = | grep -v "line > 80 characters" | true
 118   99  
↓ open down ↓ 14 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX