[PATCH] M68k build fixes

M68k build fixes, caused by kbuild changes in 2.5.41:
  - 68040 Floating Point and 68060 Integer and Floating Point Support Packages:
    use cpp includes instead of gas includes
  - Add `$(obj)' and `$(src)' where necessary to fix building of generated
    header files

arch/m68k/fpsp040/bindec.S

@@ -137,7 +137,7 @@
 
 |BINDEC    idnt    2,1 | Motorola 040 Floating Point Software Package
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|section	8
 

arch/m68k/fpsp040/binstr.S

@@ -68,7 +68,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	.global	binstr
 binstr:

arch/m68k/fpsp040/bugfix.S

@@ -160,7 +160,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	fpsp_fmt_error
 

arch/m68k/fpsp040/decbin.S

@@ -77,7 +77,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 |
 |	PTENRN, PTENRM, and PTENRP are arrays of powers of 10 rounded

arch/m68k/fpsp040/do_func.S

@@ -30,7 +30,7 @@ DO_FUNC:	|idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	t_dz2
 	|xref	t_operr

arch/m68k/fpsp040/gen_except.S

@@ -37,7 +37,7 @@ GEN_EXCEPT:    |idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section 8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	real_trace
 	|xref	fpsp_done

arch/m68k/fpsp040/get_op.S

@@ -62,7 +62,7 @@ GET_OP:    |idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	.global	PIRN,PIRZRM,PIRP
 	.global	SMALRN,SMALRZRM,SMALRP

arch/m68k/fpsp040/kernel_ex.S

@@ -20,7 +20,7 @@ KERNEL_EX:    |idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section    8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 mns_inf:  .long 0xffff0000,0x00000000,0x00000000
 pls_inf:  .long 0x7fff0000,0x00000000,0x00000000

arch/m68k/fpsp040/res_func.S

@@ -24,7 +24,7 @@ RES_FUNC:    |idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 sp_bnds:	.short	0x3f81,0x407e
 		.short	0x3f6a,0x0000

arch/m68k/fpsp040/round.S

@@ -16,7 +16,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 |
 |	round --- round result according to precision/mode

arch/m68k/fpsp040/satan.S

@@ -51,7 +51,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 	
 BOUNDS1:	.long 0x3FFB8000,0x4002FFFF
 

arch/m68k/fpsp040/scale.S

@@ -29,7 +29,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	t_ovfl2
 	|xref	t_unfl

arch/m68k/fpsp040/setox.S

@@ -339,7 +339,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 L2:	.long	0x3FDC0000,0x82E30865,0x4361C4C6,0x00000000
 

arch/m68k/fpsp040/sgetem.S

@@ -32,7 +32,7 @@
 
 	|section 8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	nrm_set
 

arch/m68k/fpsp040/sint.S

@@ -59,7 +59,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	dnrm_lp
 	|xref	nrm_set

arch/m68k/fpsp040/skeleton.S

@@ -51,7 +51,7 @@
 
 	|section 8
  
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	b1238_fix
 

arch/m68k/fpsp040/slogn.S

@@ -71,7 +71,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 BOUNDS1:  .long 0x3FFEF07D,0x3FFF8841
 BOUNDS2:  .long 0x3FFE8000,0x3FFFC000

arch/m68k/fpsp040/smovecr.S

@@ -23,7 +23,7 @@
 
 	|section 8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	nrm_set
 	|xref	round

arch/m68k/fpsp040/srem_mod.S

@@ -74,7 +74,7 @@ SREM_MOD:    |idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section    8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	.set	Mod_Flag,L_SCR3
 	.set	SignY,FP_SCR3+4

arch/m68k/fpsp040/ssin.S

@@ -91,7 +91,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 BOUNDS1:	.long 0x3FD78000,0x4004BC7E
 TWOBYPI:	.long 0x3FE45F30,0x6DC9C883

arch/m68k/fpsp040/stan.S

@@ -58,7 +58,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 BOUNDS1:	.long 0x3FD78000,0x4004BC7E
 TWOBYPI:	.long 0x3FE45F30,0x6DC9C883

arch/m68k/fpsp040/stanh.S

@@ -57,7 +57,7 @@
 
 	|section	8
 	
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	.set	X,FP_SCR5
 	.set	XDCARE,X+2

arch/m68k/fpsp040/sto_res.S

@@ -28,7 +28,7 @@ STO_RES:	|idnt	2,1 | Motorola 040 Floating Point Software Package
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	.global	sto_cos
 sto_cos:

arch/m68k/fpsp040/stwotox.S

@@ -84,7 +84,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 BOUNDS1:	.long 0x3FB98000,0x400D80C0 | ... 2^(-70),16480
 BOUNDS2:	.long 0x3FB98000,0x400B9B07 | ... 2^(-70),16480 LOG2/LOG10

arch/m68k/fpsp040/util.S

@@ -24,7 +24,7 @@
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	mem_read
 

arch/m68k/fpsp040/x_bsun.S

@@ -21,7 +21,7 @@ X_BSUN:	|idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	real_bsun
 

arch/m68k/fpsp040/x_fline.S

@@ -21,7 +21,7 @@ X_FLINE:	|idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	real_fline
 	|xref	fpsp_unimp

arch/m68k/fpsp040/x_operr.S

@@ -51,7 +51,7 @@ X_OPERR:	|idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	mem_write
 	|xref	real_operr

arch/m68k/fpsp040/x_ovfl.S

@@ -43,7 +43,7 @@ X_OVFL:	|idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	ovf_r_x2
 	|xref	ovf_r_x3

arch/m68k/fpsp040/x_snan.S

@@ -30,7 +30,7 @@ X_SNAN:	|idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	get_fline
 	|xref	mem_write

arch/m68k/fpsp040/x_store.S

@@ -22,7 +22,7 @@ X_STORE:	|idnt    2,1 | Motorola 040 Floating Point Software Package
 fpreg_mask:
 	.byte	0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	mem_write
 	|xref	get_fline

arch/m68k/fpsp040/x_unfl.S

@@ -29,7 +29,7 @@ X_UNFL:	|idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	denorm
 	|xref	round

arch/m68k/fpsp040/x_unimp.S

@@ -30,7 +30,7 @@ X_UNIMP:	|idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	get_op
 	|xref	do_func

arch/m68k/fpsp040/x_unsupp.S

@@ -31,7 +31,7 @@ X_UNSUPP:	|idnt    2,1 | Motorola 040 Floating Point Software Package
 
 	|section	8
 
-	.include "fpsp.h"
+#include "fpsp.h"
 
 	|xref	get_op
 	|xref	res_func

arch/m68k/ifpsp060/fskeleton.S

@@ -340,4 +340,4 @@ _FP_CALL_TOP:
 
 | 060 FPSP KERNEL PACKAGE NEEDS TO GO HERE!!!
 
-	.include "fpsp.sa"
+#include "fpsp.sa"

arch/m68k/ifpsp060/iskeleton.S

@@ -304,4 +304,4 @@ _I_CALL_TOP:
 |###########################################################################
 
 | 060 INTEGER KERNEL PACKAGE MUST GO HERE!!!
-	.include "isp.sa"
+#include "isp.sa"

arch/m68k/kernel/Makefile

@@ -19,18 +19,19 @@ EXTRA_AFLAGS := -traditional
 
 include $(TOPDIR)/Rules.make
 
-head.o: head.S m68k_defs.h
+$(obj)/head.o: $(obj)/head.S $(obj)/m68k_defs.h
 
-entry.o: entry.S m68k_defs.h
+$(obj)/entry.o: $(obj)/entry.S $(obj)/m68k_defs.h
 
-sun3-head.o: sun3-head.S m68k_defs.h
+$(obj)/sun3-head.o: $(obj)/sun3-head.S $(obj)/m68k_defs.h
 
-m68k_defs.h: m68k_defs.c m68k_defs.head
-	rm -f m68k_defs.d
-	SUNPRO_DEPENDENCIES="m68k_defs.d m68k_defs.h" \
-	$(CC) $(filter-out -MD,$(CFLAGS)) -S m68k_defs.c
-	cp m68k_defs.head m68k_defs.h
-	grep '^#define' m68k_defs.s >> m68k_defs.h
-	rm m68k_defs.s
--include m68k_defs.d
+$(obj)/m68k_defs.h: $(src)/m68k_defs.c $(src)/m68k_defs.head
+	rm -f $(obj)/m68k_defs.d
+	SUNPRO_DEPENDENCIES="$(obj)/m68k_defs.d $(obj)/m68k_defs.h" \
+	$(CC) $(filter-out -MD,$(CFLAGS)) -S $(src)/m68k_defs.c -o \
+	$(obj)/m68k_defs.s
+	cp $(src)/m68k_defs.head $(obj)/m68k_defs.h
+	grep '^#define' $(obj)/m68k_defs.s >> $(obj)/m68k_defs.h
+	rm $(obj)/m68k_defs.s
+-include $(obj)/m68k_defs.d