patch-pre2.0.8 linux/arch/ppc/kernel/Makefile

Next file: linux/arch/ppc/kernel/head.S
Previous file: linux/arch/ppc/config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file pre2.0.7/linux/arch/ppc/kernel/Makefile linux/arch/ppc/kernel/Makefile
@@ -6,10 +6,6 @@
 # unless it's something special (ie not a .c file).
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
-#
-#
-# Modified by Cort Dougan
-#
 
 .c.s:
 	$(CC) $(CFLAGS) -S $<
@@ -24,54 +20,49 @@
 #	$(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
 	$(CPP) $(CFLAGS) -D__ASSEMBLY__ $< -o $*.s
 	$(AS) $(ASFLAGS) -o $*.o $*.s
+	rm $*.s
 
 HOST_CC = gcc
 
 OBJS  = misc.o setup.o port_io.o irq.o pci.o traps.o stubs.o process.o \
-	signal.o raw_printf.o ramdisk.o 
+	signal.o raw_printf.o ksyms.o time.o ramdisk_drvr.o syscalls.o \
+	support.o ptrace.o
 
-all: head.o kernel.o
+all: head.o kernel.o no_ramdisk.o ramdisk.o
 
 head.o: head.s
 head.s: head.S $(TOPDIR)/include/linux/tasks.h ppc_defs.h
 
-ppc_defs.h: mk_defs $(TOPDIR)/include/asm/mmu.h $(TOPDIR)/include/asm/processor.h $(TOPDIR)/include/asm/pgtable.h $(TOPDIR)/include/asm/ptrace.h
+ppc_defs.h: mk_defs
 #	simppc mk_defs -- $@
-	mk_defs ppc_defs.h
+	mk_defs $@
 
-ramdisk.o: ramdisk.s
+no_ramdisk.o: no_ramdisk.S
 
-ramdisk.s: ramdisk.image mk_ramdisk
-	mk_ramdisk ramdisk.image ramdisk.s
+ramdisk.o: ramdisk.image mk_ramdisk
+	mk_ramdisk ramdisk.image $*.s
+	$(AS) -o $@ $*.s
+	rm $*.s
 
 mk_ramdisk: mk_ramdisk.c
-	$(HOST_CC) -o mk_ramdisk mk_ramdisk.c	
-
-
-
-cortstrip : cortstrip.c
-	${HOST_CC} -o cortstrip cortstrip.c
-
-mkboot : mkboot.c
-	${HOST_CC} -o mkboot mkboot.c
-
+	${HOST_CC} -o mk_ramdisk mk_ramdisk.c	
+	
 mk_defs: mk_defs.c $(TOPDIR)/include/asm/mmu.h $(TOPDIR)/include/asm/processor.h $(TOPDIR)/include/asm/pgtable.h $(TOPDIR)/include/asm/ptrace.h
-#	$(CC) ${CFLAGS} -c mk_defs -T ld.script-user -Ttext 0x1000 mk_defs.c
-#	$(LD) -T ld.script-user -Ttext 0x1000  -o mk_defs mk_defs.o
-	$(HOST_CC) -DMKDEFS ${CFLAGS} -o mk_defs mk_defs.c
+#	cc.ppc ${CFLAGS} -o mk_defs -T ld.script-user -Ttext 0x1000 mk_defs.c
+	cc.ppc ${CFLAGS} -o mk_defs mk_defs.c
 
 
 kernel.o: $(OBJS)
 	$(LD) -r -o kernel.o $(OBJS)
 	sync
 
+mkboot: mkboot.c
+	${HOST_CC} -o $@ -Iinclude mkboot.c
 
 dep:
 	$(CPP) -M *.c > .depend
-
+	
 fastdep:
-	$(CPP) -M *.c > .depend
-
 
 modules:
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this