patch-2.4.6 linux/arch/mips/kernel/Makefile

• Lines: 128
• Date: Mon Jul 2 13:56:40 2001
• Orig file: v2.4.5/linux/arch/mips/kernel/Makefile
• Orig date: Tue Jul 11 11:14:42 2000

diff -u --recursive --new-file v2.4.5/linux/arch/mips/kernel/Makefile linux/arch/mips/kernel/Makefile
@@ -6,93 +6,58 @@
 # unless it's something special (ie not a .c file).
 #
 
+.S.s:
+	$(CPP) $(AFLAGS) $< -o $@
 .S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+	$(CC) $(AFLAGS) -c $< -o $@
+
+EXTRA_AFLAGS = -mips3 -mcpu=r4000
 
 all:	kernel.o head.o init_task.o
-EXTRA_ASFLAGS = -mips3 -mcpu=r4000
+
 O_TARGET := kernel.o
-O_OBJS	:= branch.o process.o signal.o entry.o traps.o ptrace.o vm86.o \
-	   ioport.o reset.o semaphore.o setup.o syscall.o sysmips.o ipc.o \
-	   scall_o32.o softfp.o unaligned.o
-OX_OBJS := mips_ksyms.o
+
+obj-y				+= branch.o process.o signal.o entry.o \
+				   traps.o ptrace.o vm86.o ioport.o reset.o \
+				   semaphore.o setup.o syscall.o sysmips.o \
+				   ipc.o scall_o32.o unaligned.o
+obj-$(CONFIG_MODULES)		+= mips_ksyms.o
 
 ifdef CONFIG_CPU_R3000
-O_OBJS	+= r2300_misc.o r2300_fpu.o r2300_switch.o
+obj-y	+= r2300_misc.o r2300_fpu.o r2300_switch.o
 else
-O_OBJS	+= r4k_misc.o r4k_switch.o 
+obj-y	+= r4k_misc.o r4k_switch.o 
 ifdef CONFIG_CPU_R6000
-O_OBJS	+= r6000_fpu.o
+obj-y	+= r6000_fpu.o
 else
-O_OBJS	+= r4k_fpu.o
-endif
-endif
-
-ifdef CONFIG_MIPS_FPE_MODULE
-M_OBJS += fpe.o
+obj-y	+= r4k_fpu.o
 endif
-
-#
-# SGIs have very different interrupt/timer hardware.
-#
-ifndef CONFIG_DECSTATION
-  ifndef CONFIG_BAGET_MIPS
-    O_OBJS += time.o
-    ifndef CONFIG_SGI_IP22
-      ifndef CONFIG_ORION
-        OX_OBJS += irq.o
-      endif
-    endif
-  endif
 endif
 
-#
-# Do we want to be able to execute IRIX elf binaries?
-#
-ifdef CONFIG_BINFMT_IRIX
-O_OBJS += irixelf.o irixioctl.o irixsig.o sysirix.o irixinv.o
+obj-$(CONFIG_SMP)		+= smp.o
+obj-$(CONFIG_MIPS_FPE_MODULE)	+= fpe.o
+ifndef CONFIG_MIPS_FPU_EMULATOR
+  obj-y				+= softfp.o
 endif
 
-#
-# Kernel debugging
-#
-ifdef CONFIG_REMOTE_DEBUG
-O_OBJS += gdb-low.o gdb-stub.o 
-endif
+# Old style irq support, going to die in 2.5.
+export-objs			+= old-irq.o
+obj-$(CONFIG_NEW_IRQ)		+= irq.o
+obj-$(CONFIG_ROTTEN_IRQ)	+= old-irq.o
 
-#
-# Depending from some other kernel option
-#
-ifdef CONFIG_PROC_FS
-O_OBJS += proc.o
-endif
+# transition from old time.c to new time.c
+# some boards uses old-time.c, some use time.c, and some use their own ones
+export-objs			+= old-time.o time.o
+obj-$(CONFIG_OLD_TIME_C)	+= old-time.o
+obj-$(CONFIG_NEW_TIME_C)	+= time.o
 
-#
-# Since we add the same object files to O_OBJS for different configurations.
-# O_OBJS might contain duplicate files.  We correct this by filtering out
-# duplicate files.  Just to avoid users having to know about all the
-# compatibility stuff between various boards and boards.
-#
-O_OBJS := $(sort $(O_OBJS))
+obj-$(CONFIG_BINFMT_IRIX)	+= irixelf.o irixioctl.o irixsig.o sysirix.o \
+				   irixinv.o
+obj-$(CONFIG_REMOTE_DEBUG)	+= gdb-low.o gdb-stub.o 
+obj-$(CONFIG_PCI)		+= pci-dma.o
+obj-$(CONFIG_PROC_FS)		+= proc.o
 
 entry.o: entry.S
-
 head.o: head.S
-
-#r4k_switch.o: r4k_switch.S
-#
-#r4k_misc.o: r4k_misc.S
-#
-#r4k_fpu.o: r4k_fpu.S
-#
-#r2300_switch.o: r2300_switch.S
-#
-#r2300_misc.o: r2300_misc.S
-#
-#r2300_fpu.o: r2300_fpu.S
-#
-#r6000_fpu.o: r6000_fpu.S
-
-clean:
 
 include $(TOPDIR)/Rules.make