X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=Makefile;h=3d84df581cf23c287cff7a816c79afd3ec049c42;hb=a8c2190ee7da1a1dc68ff1a6b5f03feb61e523a5;hp=1fdace757e157fdf98177264e529df8113526214;hpb=3e0777b8fa96f7073ed5d13d3bc1d573b766bef9;p=linux-2.6-omap-h63xx.git diff --git a/Makefile b/Makefile index 1fdace757e1..3d84df581cf 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 12 +SUBLEVEL = 13 EXTRAVERSION = -NAME=Woozy Numbat +NAME=Affluent Albatross # *DOCUMENTATION* # To see a list of typical targets execute "make help" @@ -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' @@ -1149,7 +1153,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)/