From ae67cd643e9e64217fd92457324625c67fec6e35 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Sat, 25 Jun 2005 14:55:36 -0700 Subject: [PATCH] Makefile: s/gcc-option/cc-option/ Fixes http://bugme.osdl.org/show_bug.cgi?id=4726 Signed-off-by: Alexey Dobriyan Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fad349724e9..1fdace757e1 100644 --- a/Makefile +++ b/Makefile @@ -281,7 +281,7 @@ export quiet Q KBUILD_VERBOSE # See documentation in Documentation/kbuild/makefiles.txt # cc-option -# Usage: cflags-y += $(call gcc-option, -march=winchip-c6, -march=i586) +# Usage: cflags-y += $(call cc-option, -march=winchip-c6, -march=i586) cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \ > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) -- cgit v1.2.3 From 4c91aedb75d1b87deccf16d58f67fb46402d7d44 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 28 Jun 2005 22:57:29 -0700 Subject: Linux v2.6.13-rc1 Ok, a lot of things were pending after the 2.6.12 release, let's try to start calming things down again. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1fdace757e1..77aab7bdde0 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 12 -EXTRAVERSION = +SUBLEVEL = 13 +EXTRAVERSION =-rc1 NAME=Woozy Numbat # *DOCUMENTATION* -- cgit v1.2.3 From a18bcb7450840f07a772a45229de4811d930f461 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 5 Jul 2005 20:46:33 -0700 Subject: Linux v2.6.13-rc3 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 77aab7bdde0..278d50992c7 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 13 -EXTRAVERSION =-rc1 +EXTRAVERSION =-rc2 NAME=Woozy Numbat # *DOCUMENTATION* -- cgit v1.2.3 From f182ae626189d8a346aae142e7b8b182663dac44 Mon Sep 17 00:00:00 2001 From: George Anzinger Date: Thu, 7 Jul 2005 17:56:06 -0700 Subject: [PATCH] kbuild: build TAGS problem with O= make O=/dir TAGS fails with: MAKE TAGS find: security/selinux/include: No such file or directory find: include: No such file or directory find: include/asm-i386: No such file or directory find: include/asm-generic: No such file or directory The problem is in this line: ifeq ($(KBUILD_OUTPUT),) KBUILD_OUTPUT is not defined (ever) after make reruns itself. This line is used in the TAGS, tags, and cscope makes. Signed-off-by: George Anzinger Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 278d50992c7..2717223d866 100644 --- a/Makefile +++ b/Makefile @@ -1149,7 +1149,7 @@ endif # KBUILD_EXTMOD #(which is the most common case IMHO) to avoid unneeded clutter in the big tags file. #Adding $(srctree) adds about 20M on i386 to the size of the output file! -ifeq ($(KBUILD_OUTPUT),) +ifeq ($(src),$(obj)) __srctree = else __srctree = $(srctree)/ -- cgit v1.2.3 From 155ad605b3c9c5874ff068f23c6ea8537190e0a8 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Thu, 7 Jul 2005 17:56:08 -0700 Subject: [PATCH] kbuild: build a single module using 'make dir/module.ko' Using the syntax: make dir/module.ko kbuild now allows one to build a module including the final link stage. This is usefull when one only wants to compile a single module and thus do not have to wait until a full kernel has finished compiling. Tested by: randy_dunlap Signed-off-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2717223d866..9cf07e7b9f8 100644 --- a/Makefile +++ b/Makefile @@ -792,6 +792,9 @@ export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH) $(Q)$(MAKE) $(build)=$(@D) $@ %.o: %.c scripts FORCE $(Q)$(MAKE) $(build)=$(@D) $@ +%.ko: scripts FORCE + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) $(build)=$(@D) $(@:.ko=.o) + $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modpost %/: scripts prepare FORCE $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) $(build)=$(@D) %.lst: %.c scripts FORCE @@ -1033,6 +1036,7 @@ help: @echo ' modules_install - Install all modules' @echo ' dir/ - Build all files in dir and below' @echo ' dir/file.[ois] - Build specified target only' + @echo ' dir/file.ko - Build module including final link' @echo ' rpm - Build a kernel as an RPM package' @echo ' tags/TAGS - Generate tags file for editors' @echo ' cscope - Generate cscope index' -- cgit v1.2.3 From c32511e2718618f0b53479eb36e07439aa363a74 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 12 Jul 2005 21:46:46 -0700 Subject: Linux 2.6.13-rc3 Yeah, this time hopefully I'm not confusing the version numbers. The last release was -rc2, _this_ is -rc3. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9cf07e7b9f8..cf34a6b5c6e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 13 -EXTRAVERSION =-rc2 +EXTRAVERSION =-rc3 NAME=Woozy Numbat # *DOCUMENTATION* -- cgit v1.2.3