Merge

7 files changed, 32 insertions, 25 deletions

diff --git a/scripts/Makefile b/scripts/Makefile
index 3e2ef3dd9a985f..658b93f061ac97 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -8,11 +8,11 @@
 # docproc: 	 Preprocess .tmpl file in order to generate .sgml docs
 # conmakehash:	 Create arrays for initializing the kernel console tables
 
-host-progs    := fixdep split-include conmakehash docproc kallsyms modpost \
-		 mk_elfconfig pnmtologo
-build-targets := $(host-progs) empty.o
+host-progs	:= fixdep split-include conmakehash docproc kallsyms modpost \
+		   mk_elfconfig
+always		:= $(host-progs) empty.o
 
-modpost-objs  := modpost.o file2alias.o
+modpost-objs	:= modpost.o file2alias.o
 
 subdir-$(CONFIG_MODVERSIONS)	+= genksyms
 
@@ -20,7 +20,7 @@ subdir-$(CONFIG_MODVERSIONS)	+= genksyms
 subdir-	+= lxdialog kconfig
 
 # fixdep is needed to compile other host programs
-$(addprefix $(obj)/,$(filter-out fixdep,$(build-targets)) $(subdir-y)): $(obj)/fixdep
+$(addprefix $(obj)/,$(filter-out fixdep,$(always)) $(subdir-y)): $(obj)/fixdep
 
 # dependencies on generated files need to be listed explicitly
 
@@ -32,4 +32,4 @@ quiet_cmd_elfconfig = MKELF   $@
 $(obj)/elfconfig.h: $(obj)/empty.o $(obj)/mk_elfconfig FORCE
 	$(call if_changed,elfconfig)
 
-targets += $(obj)/elfconfig.h
+targets += elfconfig.h
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 7f5fbbd1111cc4..4f3f9e3346a9b5 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -15,6 +15,14 @@ include $(obj)/Makefile
 
 include scripts/Makefile.lib
 
+ifdef EXTRA_TARGETS
+$(warning kbuild: $(obj)/Makefile - Usage of EXTRA_TARGETS is obsolete in 2.5. Please fix!)
+endif
+
+ifdef build-targets
+$(warning kbuild: $(obj)/Makefile - Usage of build-targets is obsolete in 2.5. Please fix!)
+endif
+
 ifdef export-objs
 $(warning kbuild: $(obj)/Makefile - Usage of export-objs is obsolete in 2.5. Please fix!)
 endif
@@ -53,9 +61,9 @@ endif
 
 touch-module = @echo $(@:.o=.ko) > $(MODVERDIR)/$(@F:.o=.mod)
 
-__build: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS)) \
+__build: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(extra-y)) \
 	 $(if $(KBUILD_MODULES),$(obj-m)) \
-	 $(subdir-ym) $(build-targets)
+	 $(subdir-ym) $(always)
 	@:
 
 # Module versioning
@@ -198,8 +206,7 @@ cmd_as_o_S       = $(CC) $(a_flags) -c -o $@ $<
 %.o: %.S FORCE
 	$(call if_changed_dep,as_o_S)
 
-targets += $(real-objs-y) $(real-objs-m) $(EXTRA_TARGETS) $(MAKECMDGOALS) \
-	   $(build-targets)
+targets += $(real-objs-y) $(real-objs-m) $(extra-y) $(MAKECMDGOALS) $(always)
 
 # Build the compiled-in targets
 # ---------------------------------------------------------------------------
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index b88e5e494a499c..dc734426699f3d 100644
--- a/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
@@ -28,15 +28,13 @@ subdir-ymn      := $(sort $(subdir-ym) $(subdir-n) $(subdir-))
 
 # Add subdir path
 
-EXTRA_TARGETS	:= $(addprefix $(obj)/,$(EXTRA_TARGETS))
-clean-files	:= $(addprefix $(obj)/,$(clean-files))
-host-progs	:= $(addprefix $(obj)/,$(host-progs))
 subdir-ymn	:= $(addprefix $(obj)/,$(subdir-ymn))
+__clean-files	:= $(wildcard $(addprefix $(obj)/, \
+		   $(extra-y) $(EXTRA_TARGETS) $(always) $(host-progs) \
+		   $(targets) $(clean-files)))
 
 # ==========================================================================
 
-__clean-files := $(wildcard $(EXTRA_TARGETS) $(host-progs) $(clean-files) $(targets))
-
 quiet_cmd_clean = CLEAN   $(obj)
       cmd_clean = rm -f $(__clean-files); $(clean-rule)
 
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 6877b8bd9c850e..5d4b44b7150abb 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -8,6 +8,8 @@ comma   := ,
 empty   :=
 space   := $(empty) $(empty)
 
+# Backward compatibility - to be removed...
+extra-y	+= $(EXTRA_TARGETS)
 # Figure out what we need to build from the various variables
 # ===========================================================================
 
@@ -51,7 +53,7 @@ multi-objs   := $(multi-objs-y) $(multi-objs-m)
 subdir-obj-y := $(foreach o,$(obj-y),$(if $(filter-out $(o),$(notdir $(o))),$(o)))
 
 # Replace multi-part objects by their individual parts, look at local dir only
-real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m))) $(EXTRA_TARGETS)
+real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m))) $(extra-y)
 real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m)))
 
 # C code
@@ -84,8 +86,9 @@ host-cshobjs	:= $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
 
 # Add subdir path
 
-EXTRA_TARGETS	:= $(addprefix $(obj)/,$(EXTRA_TARGETS))
-build-targets	:= $(addprefix $(obj)/,$(build-targets))
+extra-y		:= $(addprefix $(obj)/,$(extra-y))
+always		:= $(addprefix $(obj)/,$(always))
+targets		:= $(addprefix $(obj)/,$(targets))
 obj-y		:= $(addprefix $(obj)/,$(obj-y))
 obj-m		:= $(addprefix $(obj)/,$(obj-m))
 subdir-obj-y	:= $(addprefix $(obj)/,$(subdir-obj-y))
diff --git a/scripts/genksyms/Makefile b/scripts/genksyms/Makefile
index 771d2dc303cf8d..6d9e57472fc1fe 100644
--- a/scripts/genksyms/Makefile
+++ b/scripts/genksyms/Makefile
@@ -1,6 +1,6 @@
 
 host-progs	:= genksyms
-build-targets	:= $(host-progs)
+always		:= $(host-progs)
 
 genksyms-objs	:= genksyms.o parse.o lex.o
 
diff --git a/scripts/lxdialog/Makefile b/scripts/lxdialog/Makefile
index f4b40f078ee8ed..fe959bd22a6ad1 100644
--- a/scripts/lxdialog/Makefile
+++ b/scripts/lxdialog/Makefile
@@ -15,8 +15,8 @@ endif
 endif
 endif
 
-host-progs    := lxdialog
-build-targets := $(host-progs)
+host-progs	:= lxdialog
+always		:= $(host-progs)
 
 lxdialog-objs := checklist.o menubox.o textbox.o yesno.o inputbox.o \
 		 util.o lxdialog.o msgbox.o
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index e3247cb98d3b93..85f6a6f94aa9db 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -10,7 +10,7 @@ CC=$4
 # do "compiled by root"
 
 if [ -r $TARGET -a ! -O include/linux/autoconf.h ]; then
-  echo ' (not modified)'
+  echo "  SKIPPED $TARGET"
   exit 0
 fi
 
@@ -70,10 +70,9 @@ if [ -r $TARGET ] && \
       grep -v 'UTS_VERSION\|LINUX_COMPILE_TIME' $TARGET > .tmpver.1 && \
       grep -v 'UTS_VERSION\|LINUX_COMPILE_TIME' .tmpcompile > .tmpver.2 && \
       cmp -s .tmpver.1 .tmpver.2; then
-   echo ' (unchanged)'
    rm -f .tmpcompile
 else
-   echo ' (updated)'
+   echo "  UPD     $TARGET"
    mv -f .tmpcompile $TARGET
 fi
-#rm -f .tmpver.1 .tmpver.2
+rm -f .tmpver.1 .tmpver.2