From be2bf2dfcf1b07e52876149737bcd48acc8d334f Mon Sep 17 00:00:00 2001 From: Kai Germaschewski Date: Mon, 10 Feb 2003 09:17:10 -0600 Subject: kbuild: cosmetics From ram : > Appended below is a small patch to the top-level makefile; it > -- replaces a call to $(shell/echo/sed) with $(subst) and adds a > comment > -- fixes some typos. --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b5e07fce90cb..e7ff4512591d 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,8 @@ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) ARCH := $(SUBARCH) -KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g") +# Remove hyphens since they have special meaning in RPM filenames +KERNELPATH=kernel-$(subst -,,$(KERNELRELEASE)) UTS_MACHINE := $(ARCH) @@ -355,7 +356,7 @@ LDFLAGS_vmlinux += -T arch/$(ARCH)/vmlinux.lds.s # It's a three stage process: # o .tmp_vmlinux1 has all symbols and sections, but __kallsyms is # empty -# Running kallsyms on that gives as .tmp_kallsyms1.o with +# Running kallsyms on that gives us .tmp_kallsyms1.o with # the right size # o .tmp_vmlinux2 now has a __kallsyms section of the right size, # but due to the added section, some addresses have shifted @@ -689,7 +690,7 @@ defconfig: scripts/kconfig/conf # make clean Delete all automatically generated files, including # tools and firmware. # make mrproper Delete the current configuration, and related files -# Any core files spread around is deleted as well +# Any core files spread around are deleted as well # make distclean Remove editor backup files, patch leftover files and the like # Files removed with 'make clean' @@ -913,19 +914,19 @@ define update-if-changed fi endef -# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj= +# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=dir # Usage: # $(Q)$(MAKE) $(build)=dir build := -f scripts/Makefile.build obj -# Shorthand for $(Q)$(MAKE) scripts/Makefile.clean obj=dir +# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=dir # Usage: # $(Q)$(MAKE) $(clean)=dir clean := -f scripts/Makefile.clean obj # $(call descend,,) # Recursively call a sub-make in with target -# Usage is deprecated, because make do not see this as an invocation of make. +# Usage is deprecated, because make does not see this as an invocation of make. descend =$(Q)$(MAKE) -f scripts/Makefile.build obj=$(1) $(2) FORCE: -- cgit v1.2.3