[LV-commit] CVS: kernel-2.5 Makefile,1.61,1.62

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv7054

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.54


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- Makefile	16 Jul 2003 22:27:38 -0000	1.61
+++ Makefile	16 Jul 2003 22:59:25 -0000	1.62
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 53
+SUBLEVEL = 54
 EXTRAVERSION =
 
 # *DOCUMENTATION*
@@ -203,7 +203,7 @@
 
 .PHONY: scripts
 scripts:
-	$(Q)$(MAKE) -f scripts/Makefile.build obj=scripts
+	$(Q)$(MAKE) $(build)=scripts
 
 # Objects we will link into vmlinux / subdirs we need to visit
 # ---------------------------------------------------------------------------
@@ -313,9 +313,9 @@
 	set -e
 	$(if $(filter .tmp_kallsyms%,$^),,
 	  echo '  Generating build number'
-	  . scripts/mkversion > .tmp_version
+	  . $(src)/scripts/mkversion > .tmp_version
 	  mv -f .tmp_version .version
-	  $(Q)$(MAKE) -f scripts/Makefile.build obj=init
+	  $(Q)$(MAKE) $(build)=init
 	)
 	$(call cmd,vmlinux__)
 	echo 'cmd_$@ := $(cmd_vmlinux__)' > $(@D)/.$(@F).cmd
@@ -329,7 +329,7 @@
 ifdef CONFIG_SMP
 define rule_vmlinux
 	$(rule_vmlinux_no_percpu)
-	$(AWK) -f scripts/per-cpu-check.awk < System.map
+	$(AWK) -f $(srctree)/scripts/per-cpu-check.awk < System.map
 endef
 else
 define rule_vmlinux
@@ -385,7 +385,7 @@
 
 .PHONY: $(SUBDIRS)
 $(SUBDIRS): .hdepend prepare
-	$(Q)$(MAKE) -f scripts/Makefile.build obj=$@
+	$(Q)$(MAKE) $(build)=$@
 
 #	Things we need done before we descend to build or make
 #	module versions are listed in "prepare"
@@ -408,17 +408,19 @@
 # ---------------------------------------------------------------------------
 
 %.s: %.c scripts FORCE
-	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
+	$(Q)$(MAKE) $(build)=$(@D) $@
 %.i: %.c scripts FORCE
-	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
+	$(Q)$(MAKE) $(build)=$(@D) $@
 %.o: %.c scripts FORCE
-	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
+	$(Q)$(MAKE) $(build)=$(@D) $@
+%.ko: scripts FORCE
+	$(Q)$(MAKE) $(build)=$(@D) $@
 %.lst: %.c scripts FORCE
-	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
+	$(Q)$(MAKE) $(build)=$(@D) $@
 %.s: %.S scripts FORCE
-	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
+	$(Q)$(MAKE) $(build)=$(@D) $@
 %.o: %.S scripts FORCE
-	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
+	$(Q)$(MAKE) $(build)=$(@D) $@
 
 # 	FIXME: The asm symlink changes when $(ARCH) changes. That's
 #	hard to detect, but I suppose "make mrproper" is a good idea
@@ -439,7 +441,7 @@
 # 	with it and forgot to run make oldconfig
 
 include/linux/autoconf.h: .config
-	$(Q)$(MAKE) -f scripts/Makefile.build obj=scripts/kconfig scripts/kconfig/conf
+	$(Q)$(MAKE) $(build)=scripts/kconfig scripts/kconfig/conf
 	./scripts/kconfig/conf -s arch/$(ARCH)/Kconfig
 
 # Generate some files
@@ -619,7 +621,7 @@
 	tar -cvz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \
 	rm $(KERNELPATH) ; \
 	cd $(TOPDIR) ; \
-	. scripts/mkversion > .version ; \
+	$(CONFIG_SHELL) $(srctree)/scripts/mkversion > .version ; \
 	rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
 	rm $(TOPDIR)/../$(KERNELPATH).tar.gz
 
@@ -657,13 +659,13 @@
 	make_with_config
 
 scripts/kconfig/conf scripts/kconfig/mconf scripts/kconfig/qconf: scripts/fixdep FORCE
-	$(Q)$(MAKE) -f scripts/Makefile.build obj=scripts/kconfig $@
+	$(Q)$(MAKE) $(build)=scripts/kconfig $@
 
 xconfig: scripts/kconfig/qconf
 	./scripts/kconfig/qconf arch/$(ARCH)/Kconfig
 
 menuconfig: scripts/kconfig/mconf
-	$(Q)$(MAKE) -f scripts/Makefile.build obj=scripts/lxdialog
+	$(Q)$(MAKE) $(build)=scripts/lxdialog
 	./scripts/kconfig/mconf arch/$(ARCH)/Kconfig
 
 config: scripts/kconfig/conf
@@ -719,7 +721,7 @@
 clean-dirs += $(ALL_SUBDIRS) Documentation/DocBook scripts
 
 $(addprefix _clean_,$(clean-dirs)):
-	$(Q)$(MAKE) -f scripts/Makefile.clean obj=$(patsubst _clean_%,%,$@)
+	$(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)
 
 quiet_cmd_rmclean = RM  $$(CLEAN_FILES)
 cmd_rmclean	  = rm -f $(CLEAN_FILES)
@@ -811,7 +813,8 @@
 	@$(MAKE) --no-print-directory -f Documentation/DocBook/Makefile dochelp
 	@echo  ''
 	@echo  'Architecture specific targets ($(ARCH)):'
-	@$(MAKE) --no-print-directory -f arch/$(ARCH)/boot/Makefile archhelp
+	@$(if $(archhelp),$(archhelp),\
+		echo '  No architecture specific help defined for $(ARCH)')
 	@echo  ''
 	@echo  'Execute "make" or "make all" to build all targets marked with [*] '
 	@echo  'For further info browse Documentation/kbuild/*'
@@ -820,7 +823,7 @@
 # Documentation targets
 # ---------------------------------------------------------------------------
 sgmldocs psdocs pdfdocs htmldocs: scripts
-	$(Q)$(MAKE) -f scripts/Makefile.build obj=Documentation/DocBook $@
+	$(Q)$(MAKE) $(build)=Documentation/DocBook $@
 
 # Scripts to check various things for consistency
 # ---------------------------------------------------------------------------
@@ -908,9 +911,20 @@
 		mv -f $@.tmp $@; \
 	fi
 endef
+
+# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=
+# Usage:
+# $(Q)$(MAKE) $(build)=dir
+build := -f scripts/Makefile.build obj
+
+# Shorthand for $(Q)$(MAKE) scripts/Makefile.clean obj=dir
+# Usage:
+# $(Q)$(MAKE) $(clean)=dir
+clean := -f scripts/Makefile.clean obj
+
 #	$(call descend,<dir>,<target>)
 #	Recursively call a sub-make in <dir> with target <target>
-
+# Usage is deprecated, because make do not see this as an invocation of make.
 descend =$(Q)$(MAKE) -f scripts/Makefile.build obj=$(1) $(2)
 
 FORCE: