kbuild: Beautify ACPI Makefiles

drivers/acpi/Makefile

@@ -21,35 +21,29 @@ obj-y		:= acpi_ksyms.o
 #
 # ACPI Boot-Time Table Parsing
 #
-ifeq ($(CONFIG_ACPI_BOOT),y)
-  obj-y		+= acpi_tables.o
-endif
+obj-$(CONFIG_ACPI_BOOT)		+= acpi_tables.o
 
 #
 # ACPI Core Subsystem (Interpreter)
 #
-ifeq ($(CONFIG_ACPI_INTERPRETER),y)
-  obj-y		+= acpi_osl.o acpi_utils.o
-  subdir-y	+= dispatcher events executer hardware namespace parser \
-		   resources tables utilities
-  obj-y 	+= $(foreach dir,$(subdir-y),$(dir)/$(dir).o)
-endif
+obj-$(CONFIG_ACPI_INTERPRETER)	+= acpi_osl.o acpi_utils.o \
+				   dispatcher/ events/ executer/ hardware/ \
+				   namespace/ parser/ resources/ tables/ \
+				   utilities/
 
 #
 # ACPI Bus and Device Drivers
 #
-ifeq ($(CONFIG_ACPI_BUS),y)
-  obj-y				+= acpi_bus.o 
-  obj-$(CONFIG_ACPI_AC) 	+= acpi_ac.o
-  obj-$(CONFIG_ACPI_BATTERY)	+= acpi_battery.o
-  obj-$(CONFIG_ACPI_BUTTON)	+= acpi_button.o
-  obj-$(CONFIG_ACPI_EC)		+= acpi_ec.o
-  obj-$(CONFIG_ACPI_FAN)	+= acpi_fan.o
-  obj-$(CONFIG_ACPI_PCI)	+= acpi_pci_root.o acpi_pci_link.o
-  obj-$(CONFIG_ACPI_POWER)	+= acpi_power.o
-  obj-$(CONFIG_ACPI_PROCESSOR)	+= acpi_processor.o
-  obj-$(CONFIG_ACPI_THERMAL)	+= acpi_thermal.o
-  obj-$(CONFIG_ACPI_SYSTEM)	+= acpi_system.o
-endif
+obj-$(CONFIG_ACPI_BUS)		+= acpi_bus.o 
+obj-$(CONFIG_ACPI_AC) 		+= acpi_ac.o
+obj-$(CONFIG_ACPI_BATTERY)	+= acpi_battery.o
+obj-$(CONFIG_ACPI_BUTTON)	+= acpi_button.o
+obj-$(CONFIG_ACPI_EC)		+= acpi_ec.o
+obj-$(CONFIG_ACPI_FAN)		+= acpi_fan.o
+obj-$(CONFIG_ACPI_PCI)		+= acpi_pci_root.o acpi_pci_link.o
+obj-$(CONFIG_ACPI_POWER)	+= acpi_power.o
+obj-$(CONFIG_ACPI_PROCESSOR)	+= acpi_processor.o
+obj-$(CONFIG_ACPI_THERMAL)	+= acpi_thermal.o
+obj-$(CONFIG_ACPI_SYSTEM)	+= acpi_system.o
 
 include $(TOPDIR)/Rules.make

drivers/acpi/debugger/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/dispatcher/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/events/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/executer/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/hardware/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/namespace/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/parser/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/resources/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/tables/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/utilities/Makefile

@@ -2,8 +2,6 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-O_TARGET := $(notdir $(CURDIR)).o
-
 obj-$(CONFIG_ACPI_INTERPRETER) := $(patsubst %.c,%.o,$(wildcard *.c))
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)