patch-2.4.10 linux/drivers/acpi/Makefile

Next file: linux/drivers/acpi/acpi_ksyms.c
Previous file: linux/drivers/acorn/scsi/queue.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/drivers/acpi/Makefile linux/drivers/acpi/Makefile
@@ -1,6 +1,5 @@
 #
 # Makefile for the Linux ACPI interpreter
-# (It's a mess, but it's all here for a reason.)
 # 
 
 O_TARGET := acpi.o
@@ -22,9 +21,12 @@
 		executer namespace parser resources tables
 
 ifdef CONFIG_ACPI_DEBUG
-  ACPI_CFLAGS += -DACPI_DEBUG -Wno-unused #-DENABLE_DEBUGGER
+  ACPI_CFLAGS += -DACPI_DEBUG -Wno-unused
+endif
 
-  #acpi-subdirs += debugger
+ifdef CONFIG_ACPI_DEBUGGER
+  ACPI_CFLAGS += -DENABLE_DEBUGGER
+  acpi-subdirs += debugger
 endif
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)
@@ -38,9 +40,8 @@
 obj-$(CONFIG_ACPI)	+= $(foreach dir,$(acpi-subdirs),$(dir)/$(dir).o) 
 ifdef CONFIG_ACPI_KERNEL_CONFIG
    obj-$(CONFIG_ACPI) 	+= acpiconf.o osconf.o
-else
-   obj-$(CONFIG_ACPI)	+= driver.o
 endif
+obj-$(CONFIG_ACPI)	+= driver.o
 
 ifeq ($(CONFIG_ACPI_BUSMGR),y)
 	obj-y			+= ospm/ospm.o

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)