PANKOVs restructure

          --- old/usr/src/uts/intel/acpica/Makefile
          +++ new/usr/src/uts/intel/acpica/Makefile

   1    1  #
   2    2  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   3    3  # Use is subject to license terms.
   4    4  #
   5    5  #
   6    6  #       This makefile drives the production of the ACPI CA services
   7    7  #       kernel module.
   8    8  #
   9    9  #       intel architecture dependent
  10   10  #
  11   11  
  12   12  #
  13   13  #       Path to the base of the uts directory tree (usually /usr/src/uts).
  14   14  #
  15   15  UTSBASE         = ../..
  16   16  

  17   17  #
  18   18  #       Define the module and object file sets.
  19   19  #
  20   20  MODULE          = acpica
  21   21  OBJECTS         = $(ACPICA_OBJS:%=$(OBJS_DIR)/%)
  22   22  LINTS           = $(ACPICA_OBJS:%.o=$(LINTS_DIR)/%.ln)
  23   23  ROOTMODULE      = $(ROOT_MISC_DIR)/$(MODULE)
  24   24  INC_PATH        += -I$(UTSBASE)/intel/sys/acpi
  25   25  INC_PATH        += -I$(UTSBASE)/i86pc
  26   26  INC_PATH        += -I$(SRC)/common
       27 +INC_PATH        += -I$(SRC)/common/acpica/include
  27   28  
  28   29  #
  29   30  #       Include common rules.
  30   31  #
  31   32  include $(UTSBASE)/intel/Makefile.intel
  32   33  
  33   34  #
  34   35  #       Define targets
  35   36  #
  36   37  ALL_TARGET      = $(BINARY) $(CONFMOD)

  37   38  LINT_TARGET     = $(MODULE).lint

  38   39  INSTALL_TARGET  = $(BINARY) $(ROOTMODULE)
  39   40  
  40   41  #
  41   42  #       Overrides.
  42   43  #
  43   44  DEBUG_DEFS      += $(DEBUG_FLGS)
  44   45  
  45   46  #
  46   47  # lint pass one non-enforcement
  47   48  #
  48      -CFLAGS += $(CCVERBOSE) -DPWRDMN -DACPI_USE_LOCAL_CACHE -DACPI_DEBUG_OUTPUT
       49 +CFLAGS          += $(CCVERBOSE) -DACPI_USE_LOCAL_CACHE
  49   50  
  50   51  #
  51   52  # 3rd party code is not lint clean
  52   53  #
  53      -CERRWARN += -erroff=E_STATEMENT_NOT_REACHED
       54 +LINTFLAGS       += -errchk=%none
       55 +LINTFLAGS       += -errhdr=%none
       56 +LINTFLAGS       += -erroff=%all
       57 +LINTFLAGS       += -errwarn=%none
  54   58  
  55      -LINTFLAGS += -errchk=%none
  56      -LINTFLAGS += -errhdr=%none
  57      -LINTFLAGS += -erroff=%all
  58      -LINTFLAGS += -errwarn=%none
       59 +CERRWARN        += -_cc=-erroff=E_STATEMENT_NOT_REACHED
  59   60  
  60   61  CERRWARN        += -_gcc=-Wno-unused-variable
  61   62  CERRWARN        += -_gcc=-Wno-parentheses
  62   63  CERRWARN        += -_gcc=-Wno-uninitialized
  63   64  
  64   65  #
  65   66  #       Default build targets.
  66   67  #
  67   68  .KEEP_STATE:
  68   69  

  69   70  def:            $(DEF_DEPS)
  70   71  
  71   72  all:            $(ALL_DEPS)
  72   73  
  73   74  clean:          $(CLEAN_DEPS)
  74   75  
  75   76  clobber:        $(CLOBBER_DEPS)
  76   77  
  77   78  lint:           $(LINT_DEPS)
  78   79  
  79   80  modlintlib:     $(MODLINTLIB_DEPS)
  80   81  
  81   82  clean.lint:     $(CLEAN_LINT_DEPS)
  82   83  
  83   84  install:        $(INSTALL_DEPS)
  84   85  
  85   86  #
  86   87  #       Include common targets.
  87   88  #
  88   89  include $(UTSBASE)/intel/Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX