acpica-unix2-20130823
PANKOVs restructure

@@ -16,14 +16,16 @@
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
+
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # Copyright 2012 Joyent, Inc.  All rights reserved.
+# Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 #
 
 #
 #       This Makefile defines all file modules and build rules for the
 # directory uts/intel and its children. These are the source files which

@@ -99,51 +101,51 @@
         $(CTFCONVERT_O)
 
 $(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/acpica/%.s
         $(COMPILE.s) -o $@ $<
 
-$(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/acpica/debugger/%.c
+$(OBJS_DIR)/%.o:                $(SRC)/common/acpica/components/debugger/%.c
         $(COMPILE.c) -o $@ $<
         $(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/acpica/events/%.c
+$(OBJS_DIR)/%.o:                $(SRC)/common/acpica/components/disassembler/%.c
         $(COMPILE.c) -o $@ $<
         $(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/acpica/hardware/%.c
+$(OBJS_DIR)/%.o:                $(SRC)/common/acpica/components/dispatcher/%.c
         $(COMPILE.c) -o $@ $<
         $(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/acpica/dispatcher/%.c
+$(OBJS_DIR)/%.o:                $(SRC)/common/acpica/components/events/%.c
         $(COMPILE.c) -o $@ $<
         $(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/acpica/executer/%.c
+$(OBJS_DIR)/%.o:                $(SRC)/common/acpica/components/executer/%.c
         $(COMPILE.c) -o $@ $<
         $(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/acpica/parser/%.c
+$(OBJS_DIR)/%.o:                $(SRC)/common/acpica/components/hardware/%.c
         $(COMPILE.c) -o $@ $<
         $(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/acpica/namespace/%.c
+$(OBJS_DIR)/%.o:                $(SRC)/common/acpica/components/namespace/%.c
         $(COMPILE.c) -o $@ $<
         $(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/acpica/resources/%.c
+$(OBJS_DIR)/%.o:                $(SRC)/common/acpica/components/parser/%.c
         $(COMPILE.c) -o $@ $<
         $(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/acpica/tables/%.c
+$(OBJS_DIR)/%.o:                $(SRC)/common/acpica/components/resources/%.c
         $(COMPILE.c) -o $@ $<
         $(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/acpica/utilities/%.c
+$(OBJS_DIR)/%.o:                $(SRC)/common/acpica/components/tables/%.c
         $(COMPILE.c) -o $@ $<
         $(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/acpica/disassembler/%.c
+$(OBJS_DIR)/%.o:                $(SRC)/common/acpica/components/utilities/%.c
         $(COMPILE.c) -o $@ $<
         $(CTFCONVERT_O)
 
 $(OBJS_DIR)/%.o:                $(UTSBASE)/intel/io/agpgart/%.c
         $(COMPILE.c) -o $@ $<

@@ -353,41 +355,41 @@
         @($(LHEAD) $(LINT.s) $< $(LTAIL))
 
 $(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/acpica/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/acpica/debugger/%.c
+$(LINTS_DIR)/%.ln:              $(SRC)/common/acpica/components/debugger/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/acpica/events/%.c
+$(LINTS_DIR)/%.ln:              $(SRC)/common/acpica/components/events/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/acpica/hardware/%.c
+$(LINTS_DIR)/%.ln:              $(SRC)/common/acpica/components/hardware/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/acpica/dispatcher/%.c
+$(LINTS_DIR)/%.ln:              $(SRC)/common/acpica/components/dispatcher/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/acpica/executer/%.c
+$(LINTS_DIR)/%.ln:              $(SRC)/common/acpica/components/executer/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/acpica/parser/%.c
+$(LINTS_DIR)/%.ln:              $(SRC)/common/acpica/components/parser/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/acpica/namespace/%.c
+$(LINTS_DIR)/%.ln:              $(SRC)/common/acpica/components/namespace/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/acpica/resources/%.c
+$(LINTS_DIR)/%.ln:              $(SRC)/common/acpica/components/resources/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/acpica/tables/%.c
+$(LINTS_DIR)/%.ln:              $(SRC)/common/acpica/components/tables/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/acpica/utilities/%.c
+$(LINTS_DIR)/%.ln:              $(SRC)/common/acpica/components/utilities/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/acpica/disassembler/%.c
+$(LINTS_DIR)/%.ln:              $(SRC)/common/acpica/components/disassembler/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))
 
 $(LINTS_DIR)/%.ln:              $(UTSBASE)/intel/io/agpgart/%.c
         @($(LHEAD) $(LINT.c) $< $(LTAIL))