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

Makefiles.

3 files changed, 5 insertions, 15 deletions

diff --git a/arch/mips/mips-boards/atlas/Makefile b/arch/mips/mips-boards/atlas/Makefile
index 4771fb317..b5939f8dd 100644
--- a/arch/mips/mips-boards/atlas/Makefile
+++ b/arch/mips/mips-boards/atlas/Makefile
@@ -37,9 +37,6 @@ all: atlas.o
 
 O_TARGET := atlas.o
 
-O_OBJS := atlas_int.o atlas_rtc.o atlas_setup.o
-
-dep:
-	$(CPP) -M *.c > .depend
+obj-y	:= atlas_int.o atlas_rtc.o atlas_setup.o
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips/mips-boards/generic/Makefile b/arch/mips/mips-boards/generic/Makefile
index 8a2f0e6d8..ebc07dcdd 100644
--- a/arch/mips/mips-boards/generic/Makefile
+++ b/arch/mips/mips-boards/generic/Makefile
@@ -32,15 +32,10 @@
 .S.o:
 	$(CC) $(CFLAGS) -c $< -o $*.o
 
-all: mipsboards.o
-
 O_TARGET := mipsboards.o
 
-O_OBJS := mipsIRQ.o pci.o reset.o display.o init.o memory.o printf.o \
-	  cmdline.o time.o
-
-ifdef CONFIG_REMOTE_DEBUG
-O_OBJS += gdb_hook.o
-endif
+obj-y				:= mipsIRQ.o pci.o reset.o display.o init.o \
+				   memory.o printf.o cmdline.o time.o
+obj-$(CONFIG_REMOTE_DEBUG)	+= gdb_hook.o
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips/mips-boards/malta/Makefile b/arch/mips/mips-boards/malta/Makefile
index a5c7fdb13..e71c8e8ed 100644
--- a/arch/mips/mips-boards/malta/Makefile
+++ b/arch/mips/mips-boards/malta/Makefile
@@ -33,10 +33,8 @@
 .S.o:
 	$(CC) $(CFLAGS) -c $< -o $*.o
 
-all: malta.o
-
 O_TARGET := malta.o
 
-O_OBJS := malta_int.o malta_rtc.o malta_setup.o
+obj-y := malta_int.o malta_rtc.o malta_setup.o
 
 include $(TOPDIR)/Rules.make