From e470e08013cd91396fa3cb40b2517b94b84e47d7 Mon Sep 17 00:00:00 2001
From: Harald Koerfgen <hkoerfg@web.de>
Date: Sat, 27 May 2000 11:53:31 +0000
Subject:  Next iteration, that should be it [tm].

* offset.h now depends on include/linux/autoconf.h as suggested by Ulf.
That doesn't really make a difference, but it feels better :)
* If include/asm-$(ARCH)/offset.h doesn't exist during a "make dep",
create an empty one so that the dependecies are built correctly.
That seems to be the correct fix.
* Added a mrproper target to arch/$(ARCH)/tools/Makefile so that
"make dep clean vmlinux" works. include/asm-$(ARCH)/offset.h is now beeing
deleted with a "make mrproper".
* While beeing at it, I added a mrproper target in arch/$(ARCH)/boot/Makefile
as well.

I'd appreciate if someone with a working MIPS64 toolchain (hint, hint) could
check if this works as expected for MIPS64. Toggling CONFIG_SMP should rebuild
nearly the whole kernel without the need for a "make clean" or something like
that.
---
 arch/mips/Makefile         | 7 ++++++-
 arch/mips/boot/Makefile    | 3 +++
 arch/mips/tools/Makefile   | 5 ++++-
 arch/mips64/Makefile       | 5 +++++
 arch/mips64/boot/Makefile  | 5 +++++
 arch/mips64/tools/Makefile | 5 ++++-
 6 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index baccc3980..e1bb00596 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -193,6 +193,11 @@ archclean:
 	$(MAKE) -C arch/mips/baget clean
 
 archmrproper:
-
+	@$(MAKEBOOT) mrproper
+	$(MAKE) -C arch/$(ARCH)/tools mrproper
+	
 archdep:
+	if [ ! -f $(TOPDIR)/include/asm-$(ARCH)/offset.h ]; then \
+	 touch $(TOPDIR)/include/asm-$(ARCH)/offset.h; \
+	fi;
 	@$(MAKEBOOT) dep
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile
index 1ae3a3fd6..5c2a50a0c 100644
--- a/arch/mips/boot/Makefile
+++ b/arch/mips/boot/Makefile
@@ -46,6 +46,9 @@ dep:
 
 clean:
 	rm -f vmlinux.ecoff
+
+mrproper:
+	rm -f vmlinux.ecoff
 	rm -f addinitrd
 	rm -f elf2ecoff
 
diff --git a/arch/mips/tools/Makefile b/arch/mips/tools/Makefile
index e8474a4c2..6b6c39c65 100644
--- a/arch/mips/tools/Makefile
+++ b/arch/mips/tools/Makefile
@@ -18,10 +18,13 @@ $(TARGET): offset.h
 offset.h: offset.s
 	sed -n '/^@@@/s///p' $^ >$@
 
-offset.s: offset.c $(TOPDIR)/.config
+offset.s: offset.c $(TOPDIR)/include/linux/autoconf.h
 
 clean:
 	rm -f offset.[hs] $(TARGET).new
+	
+mrproper:	
+	rm -f offset.[hs] $(TARGET).new
 	rm -f $(TARGET)
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips64/Makefile b/arch/mips64/Makefile
index 218c22ec4..4dd450698 100644
--- a/arch/mips64/Makefile
+++ b/arch/mips64/Makefile
@@ -144,6 +144,11 @@ archclean:
 	rm -f vmlinux.64
 
 archmrproper:
+	@$(MAKEBOOT) mrproper
+	$(MAKE) -C arch/$(ARCH)/tools mrproper
 
 archdep:
+	if [ ! -f $(TOPDIR)/include/asm-$(ARCH)/offset.h ]; then \
+	 touch $(TOPDIR)/include/asm-$(ARCH)/offset.h; \
+	fi;
 	@$(MAKEBOOT) dep
diff --git a/arch/mips64/boot/Makefile b/arch/mips64/boot/Makefile
index 078918695..658908947 100644
--- a/arch/mips64/boot/Makefile
+++ b/arch/mips64/boot/Makefile
@@ -38,6 +38,11 @@ dep:
 clean:
 	rm -f vmlinux.ecoff
 
+mrproper:
+	rm -f vmlinux.ecoff
+ 	rm -f addinitrd
+ 	rm -f elf2ecoff
+
 dummy:
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips64/tools/Makefile b/arch/mips64/tools/Makefile
index 748c22039..3218bfe5f 100644
--- a/arch/mips64/tools/Makefile
+++ b/arch/mips64/tools/Makefile
@@ -19,10 +19,13 @@ $(TARGET): offset.h
 offset.h: offset.s
 	sed -n '/^@@@/s///p' $^ >$@
 
-offset.s: offset.c $(TOPDIR)/.config
+offset.s: offset.c $(TOPDIR)/include/linux/autoconf.h
 
 clean:
 	rm -f offset.[hs] $(TARGET).new
+	
+mrproper:	
+	rm -f offset.[hs] $(TARGET).new
 	rm -f $(TARGET)
 
 include $(TOPDIR)/Rules.make
-- 
cgit v1.2.3