kbuild: Remove archdep

Since we don't do dependencies up front anymore, archdep does not make
too much sense anymore. It was mostly unused now anyway, move the
remaining users to the "prepare" target, which is exactly what is wanted:
Do some work before the actual build gets started.

Makefile

@@ -330,18 +330,16 @@ scripts:
 # 	The targets are still named depend / dep for traditional
 #	reasons, but the only thing we do here is generating
 #	the module version checksums.
-#	FIXME: For now, we are also calling "archdep" from here,
-#	which should be replaced by a more sensible solution.
 
 .PHONY: depend dep $(patsubst %,_sfdep_%,$(SUBDIRS))
 
 depend dep: .hdepend
 
 #	.hdepend is our (misnomed) marker for whether we've run
-#	generated module versions and made archdep
+#	generated module versions
 
 .hdepend: $(if $(filter dep depend,$(MAKECMDGOALS)),FORCE)
-	@$(MAKE) archdep include/linux/modversions.h
+	@$(MAKE) include/linux/modversions.h
 	@touch $@
 
 ifdef CONFIG_MODVERSIONS

arch/alpha/Makefile

@@ -127,8 +127,6 @@ archmrproper:
 	rm -f arch/alpha/vmlinux.lds
 	rm -f include/asm-alpha/asm_offsets.h
 
-archdep:
-
 vmlinux: arch/alpha/vmlinux.lds
 
 arch/alpha/vmlinux.lds: arch/alpha/vmlinux.lds.in

arch/alpha/lib/Makefile

@@ -65,6 +65,4 @@ __divlu.o: $(ev6)divide.S
 __remlu.o: $(ev6)divide.S
 	$(CC) $(AFLAGS) -DREM -DINTSIZE -c -o __remlu.o $(ev6)divide.S
 
-dep:
-
 include $(TOPDIR)/Rules.make

arch/arm/boot/Makefile

@@ -125,7 +125,7 @@ zImage:	compressed/vmlinux
 bootpImage: bootp/bootp
 	$(OBJCOPY) -O binary -R .note -R .comment -S bootp/bootp $@
 
-compressed/vmlinux: $(TOPDIR)/vmlinux dep
+compressed/vmlinux: $(TOPDIR)/vmlinux
 	@$(MAKE) -C compressed vmlinux
 
 bootp/bootp: zImage initrd

arch/cris/Makefile

@@ -100,5 +100,3 @@ archclean:
 	rm -rf $(LD_SCRIPT).tmp
 
 archmrproper:
-
-archdep:

arch/i386/Makefile

@@ -108,7 +108,7 @@ MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
 vmlinux: arch/i386/vmlinux.lds
 
 .PHONY: zImage bzImage compressed zlilo bzlilo zdisk bzdisk install \
-		clean archclean archmrproper archdep
+		clean archclean archmrproper
 
 zImage: vmlinux
 	@$(MAKEBOOT) zImage
@@ -140,5 +140,3 @@ archclean:
 	@$(MAKEBOOT) clean
 
 archmrproper:
-
-archdep:

arch/ia64/Makefile

@@ -127,7 +127,11 @@ archmrproper:
 	rm -f arch/$(ARCH)/vmlinux.lds
 	@$(MAKE) -C arch/$(ARCH)/tools mrproper
 
-archdep:
-
 bootpfile:
 	@$(MAKEBOOT) bootpfile
+
+prepare: $(TOPDIR)/include/asm-ia64/offsets.h
+
+$(TOPDIR)/include/asm-ia64/offsets.h: include/asm include/linux/version.h \
+				      include/config/MARKER
+	@$(MAKE) -C arch/$(ARCH)/tools $@
\ No newline at end of file

arch/ia64/tools/Makefile

@@ -9,7 +9,7 @@ mrproper:
 clean:
 	rm -f print_offsets.s print_offsets offsets.h
 
-fastdep: offsets.h
+$(TARGET): offsets.h
 	@if ! cmp -s offsets.h ${TARGET}; then	\
 		echo -e "*** Updating ${TARGET}...";	\
 		cp offsets.h ${TARGET};		\

arch/m68k/Makefile

@@ -172,5 +172,3 @@ archclean:
 	rm -f arch/m68k/kernel/m68k_defs.h arch/m68k/kernel/m68k_defs.d
 
 archmrproper:
-
-archdep:

arch/mips/Makefile

@@ -308,5 +308,3 @@ archclean:
 archmrproper:
 	@$(MAKEBOOT) mrproper
 	$(MAKE) -C arch/$(ARCH)/tools mrproper
-
-archdep:

arch/mips64/Makefile

@@ -176,5 +176,3 @@ archclean:
 archmrproper:
 	@$(MAKEBOOT) mrproper
 	$(MAKE) -C arch/$(ARCH)/tools mrproper
-
-archdep:

arch/parisc/Makefile

@@ -78,5 +78,3 @@ install:
 archclean:
 
 archmrproper:
-
-archdep:

arch/ppc/Makefile

@@ -116,5 +116,3 @@ archclean:
 	@$(MAKEBOOT) clean
 
 archmrproper:
-
-archdep:

arch/ppc64/Makefile

@@ -66,5 +66,5 @@ archclean:
 
 archmrproper:
 
-archdep:
+prepare:
 	$(MAKEBOOT) dep

arch/s390/Makefile

@@ -58,7 +58,5 @@ archclean:
 
 archmrproper:
 
-archdep:
-
 install: vmlinux
 	@$(MAKEBOOT) BOOTIMAGE=image install

arch/s390x/Makefile

@@ -56,5 +56,3 @@ archclean:
 	$(MAKE) -C arch/$(ARCH)/kernel clean
 
 archmrproper:
-
-archdep:

arch/sh/Makefile

@@ -94,5 +94,3 @@ archclean:
 
 archmrproper:
 	rm -f arch/sh/vmlinux.lds
-
-archdep:

arch/sparc/Makefile

@@ -58,9 +58,9 @@ archclean:
 archmrproper:
 	rm -f $(TOPDIR)/include/asm-sparc/asm_offsets.h
 
-archdep: check_asm
+prepare: check_asm
 
-check_asm: include/linux/version.h
+check_asm: include/linux/version.h include/linux/asm include/config/MARKER
 	$(MAKE) -C arch/sparc/kernel check_asm
 
 tftpboot.img:

arch/sparc64/Makefile

@@ -85,7 +85,5 @@ archclean:
 
 archmrproper:
 
-archdep:
-
 tftpboot.img:
 	$(MAKE) -C arch/sparc64/boot tftpboot.img

arch/sparc64/boot/Makefile

@@ -18,6 +18,3 @@ tftpboot.img: piggyback $(TOPDIR)/vmlinux $(ROOT_IMG)
 
 piggyback: piggyback.c
 	$(HOSTCC) $(HOSTCFLAGS) -o piggyback piggyback.c
-
-dep:
-

arch/x86_64/Makefile

@@ -76,7 +76,7 @@ MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
 vmlinux: arch/x86_64/vmlinux.lds
 
 .PHONY: zImage bzImage compressed zlilo bzlilo zdisk bzdisk install \
-		clean archclean archmrproper archdep checkoffset
+		clean archclean archmrproper
 
 bzImage: vmlinux
 	@$(MAKEBOOT) bzImage
@@ -101,9 +101,6 @@ archclean:
 
 archmrproper:
 
-archdep:
-	@$(MAKEBOOT) dep
-
 
 prepare: include/asm-$(ARCH)/offset.h
 

arch/x86_64/boot/Makefile

@@ -100,12 +100,8 @@ bsetup.o: bsetup.s
 bsetup.s: setup.S video.S Makefile $(BOOT_INCL) $(TOPDIR)/include/linux/version.h $(TOPDIR)/include/linux/compile.h
 	$(IA32_CPP) $(CPPFLAGS) -D__BIG_KERNEL__ -D__ASSEMBLY__ -traditional $(SVGA_MODE) $(RAMDISK) $< -o $@
 
-dep:
-
 clean:
 	rm -f tools/build
 	rm -f setup bootsect zImage compressed/vmlinux.out
 	rm -f bsetup bbootsect bzImage compressed/bvmlinux.out
 	@$(MAKE) -C compressed clean
-
-