patch-2.4.0-test5 linux/arch/ia64/kernel/Makefile

• Lines: 48
• Date: Fri Jul 14 16:08:11 2000
• Orig file: v2.4.0-test4/linux/arch/ia64/kernel/Makefile
• Orig date: Fri Jun 23 21:55:07 2000

diff -u --recursive --new-file v2.4.0-test4/linux/arch/ia64/kernel/Makefile linux/arch/ia64/kernel/Makefile
@@ -9,35 +9,20 @@
 
 all: kernel.o head.o init_task.o
 
+obj-y := acpi.o entry.o gate.o efi.o efi_stub.o irq.o irq_ia64.o irq_sapic.o ivt.o	\
+	 pal.o pci-dma.o process.o perfmon.o ptrace.o sal.o semaphore.o setup.o		\
+	 signal.o sys_ia64.o traps.o time.o unaligned.o unwind.o
+
+obj-$(CONFIG_IA64_GENERIC) += machvec.o
+obj-$(CONFIG_IA64_PALINFO) += palinfo.o
+obj-$(CONFIG_PCI) += pci.o
+obj-$(CONFIG_SMP) += smp.o
+obj-$(CONFIG_IA64_MCA) += mca.o mca_asm.o
+obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o
+
 O_TARGET := kernel.o
-O_OBJS	 := acpi.o entry.o gate.o efi.o efi_stub.o irq.o irq_ia64.o irq_sapic.o ivt.o	\
-	    pal.o pci-dma.o process.o perfmon.o ptrace.o sal.o semaphore.o setup.o	\
-	    signal.o sys_ia64.o traps.o time.o unaligned.o unwind.o
+O_OBJS	 :=  $(obj-y)
 OX_OBJS  := ia64_ksyms.o
-
-ifdef CONFIG_IA64_GENERIC
-O_OBJS	+= machvec.o
-endif
-
-ifdef CONFIG_IA64_PALINFO
-O_OBJS	+= palinfo.o
-endif
-
-ifdef CONFIG_PCI
-O_OBJS	+= pci.o
-endif
-
-ifdef CONFIG_SMP
-O_OBJS	+= smp.o
-endif
-
-ifdef CONFIG_IA64_MCA
-O_OBJS	+= mca.o mca_asm.o
-endif
-
-ifdef CONFIG_IA64_BRL_EMU
-O_OBJS  += brl_emu.o
-endif
 
 clean::