Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your

Makefiles.

1 files changed, 39 insertions, 82 deletions

diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index a539083bd..4a9852612 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -15,10 +15,6 @@ else
 	$(CC) $(CFLAGS) -D__ASSEMBLY__ -c $< -o $*.o
 endif
 
-O_TARGET := kernel.o
-OX_OBJS := ppc_ksyms.o setup.o
-
-
 ifeq ($(CONFIG_4xx),y)
   KHEAD := head_4xx.o
 else
@@ -29,90 +25,52 @@ else
   endif
 endif
 
-ifdef CONFIG_ALL_PPC
-CONFIG_PMAC=y
-CONFIG_PREP=y
-CONFIG_CHRP=y
-endif
-
-O_OBJS := entry.o traps.o irq.o idle.o time.o process.o signal.o syscalls.o \
-	  misc.o ptrace.o align.o ppc_htab.o semaphore.o bitops.o
-
-ifdef CONFIG_POWER4
-O_OBJS += xics.o
-endif
-
-ifndef CONFIG_8xx
-O_OBJS += hashtable.o
-endif
-
-ifdef CONFIG_PCI
-O_OBJS += pci.o pci-dma.o
-endif
-
-ifdef CONFIG_KGDB
-O_OBJS += ppc-stub.o
-endif
-
-ifdef CONFIG_PMAC_PBOOK
-O_OBJS += sleep.o
-endif
-
-ifdef CONFIG_SMP
-O_OBJS += smp.o
-endif
-
-ifeq ($(CONFIG_4xx),y)
-  O_OBJS += ppc4xx_pic.o
-endif
+all: $(KHEAD) kernel.o
 
-ifeq ($(CONFIG_OAK),y)
-  O_OBJS += oak_setup.o
-endif
+O_TARGET := kernel.o
 
+export-objs			:= ppc_ksyms.o prep_setup.o 
+
+obj-$(CONFIG_PPC)		:= entry.o traps.o irq.o idle.o time.o misc.o \
+					process.o signal.o bitops.o ptrace.o \
+					ppc_htab.o semaphore.o syscalls.o  \
+					align.o setup.o
+obj-$(CONFIG_POWER4)		+= xics.o
+obj-$(CONFIG_PCI)		+= pci.o pci-dma.o
+obj-$(CONFIG_KGDB)		+= ppc-stub.o
+obj-$(CONFIG_PMAC_PBOOK)	+= sleep.o
+obj-$(CONFIG_SMP)		+= smp.o
+obj-$(CONFIG_PPC_RTAS)		+= error_log.o proc_rtas.o
+obj-$(CONFIG_NVRAM)		+= pmac_nvram.o
+obj-$(CONFIG_PREP_RESIDUAL)	+= residual.o
+obj-$(CONFIG_4xx)		+= ppc4xx_pic.o
+obj-$(CONFIG_OAK)		+= oak_setup.o
+obj-$(CONFIG_WALNUT)		+= walnut_setup.o
 ifeq ($(CONFIG_WALNUT),y)
-  O_OBJS += walnut_setup.o
-  ifeq ($(CONFIG_PCI),y)
-    O_OBJS += galaxy_pci.o
-  endif
+obj-$(CONFIG_PCI)		+= galaxy_pci.o
 endif
-
+obj-$(CONFIG_8xx)		+= m8xx_setup.o ppc8xx_pic.o
 ifeq ($(CONFIG_8xx),y)
-  O_OBJS += m8xx_setup.o ppc8xx_pic.o
-  ifndef CONFIG_MATH_EMULATION
-    O_OBJS += softemu8xx.o
-  endif
-  ifdef CONFIG_PCI
-    O_OBJS += qspan_pci.c
-  endif
-  ifdef CONFIG_MBX
-    O_OBJS += i8259.o
-  endif
-endif
+obj-$(CONFIG_PCI)		+= qspan_pci.c
+else
+obj-$(CONFIG_PPC)		+= hashtable.o
+endif
+obj-$(CONFIG_MATH_EMULATION)	+= softemu8xx.o
+obj-$(CONFIG_MBX)		+= i8259.o
+obj-$(CONFIG_APUS)		+= apus_setup.o
+obj-$(CONFIG_ALL_PPC)		+= pmac_pic.o pmac_setup.o pmac_time.o prom.o \
+					feature.o pmac_pci.o chrp_setup.o \
+					chrp_time.o chrp_pci.o 	open_pic.o \
+					indirect_pci.o i8259.o prep_pci.o \
+					prep_time.o prep_nvram.o ppc_ksyms.o \
+					prep_setup.o 
+obj-$(CONFIG_PMAC_BACKLIGHT)	+= pmac_backlight.o
+obj-$(CONFIG_GEMINI)		+= gemini_prom.o gemini_pci.o gemini_setup.o \
+					open_pic.o
+obj-$(CONFIG_8260)		+= m8260_setup.o ppc8260_pic.o
 
-ifeq ($(CONFIG_NVRAM),y)
-  O_OBJS += pmac_nvram.o
-endif
-ifeq ($(CONFIG_APUS),y)
-  O_OBJS += apus_setup.o
-endif
-ifeq ($(CONFIG_ALL_PPC),y)
-  O_OBJS += pmac_pic.o pmac_setup.o pmac_time.o feature.o pmac_pci.o prom.o \
-	chrp_setup.o chrp_time.o chrp_pci.o open_pic.o indirect_pci.o \
-	prep_pci.o i8259.o prep_nvram.o prep_time.o residual.o
-  ifeq ($(CONFIG_PMAC_BACKLIGHT),y)
-    O_OBJS += pmac_backlight.o
-  endif
-  OX_OBJS += prep_setup.o
-endif
-ifeq ($(CONFIG_GEMINI),y)
-  O_OBJS += gemini_prom.o gemini_pci.o gemini_setup.o open_pic.o
-endif
-ifeq ($(CONFIG_8260),y)
-  O_OBJS += m8260_setup.o ppc8260_pic.o
-endif
 
-all: $(KHEAD) kernel.o
+include $(TOPDIR)/Rules.make
 
 head.o: head.S ppc_defs.h
 head_4xx.o: head_4xx.S ppc_defs.h
@@ -137,4 +95,3 @@ checks: checks.c
 	$(HOSTCC) -I$(HPATH) $(HOSTCFLAGS) -D__KERNEL__ -fno-builtin -o checks checks.c
 	./checks
 
-include $(TOPDIR)/Rules.make