X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2FMakefile;h=1c73c5aea66b06bcecff315356abcecc2a79522f;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=8de642c6e8b6089c4b2d56cf8bd5510b3d16f612;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/scripts/Makefile b/scripts/Makefile
index 8de642c6e..1c73c5aea 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -2,27 +2,24 @@
 # scripts contains sources for various helper programs used throughout
 # the kernel for the build process.
 # ---------------------------------------------------------------------------
-# docproc: 	 Preprocess .tmpl file in order to generate .sgml docs
+# kallsyms:      Find all symbols in vmlinux
+# pnmttologo:    Convert pnm files to logo files
+# conmakehash:   Create chartable
 # conmakehash:	 Create arrays for initializing the kernel console tables
 
-host-progs	:= conmakehash kallsyms modpost mk_elfconfig pnmtologo bin2c
-always		:= $(host-progs) empty.o
+hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
+hostprogs-$(CONFIG_LOGO)         += pnmtologo
+hostprogs-$(CONFIG_VT)           += conmakehash
+hostprogs-$(CONFIG_PROM_CONSOLE) += conmakehash
+hostprogs-$(CONFIG_IKCONFIG)     += bin2c
 
-modpost-objs	:= modpost.o file2alias.o sumversion.o
+always		:= $(hostprogs-y) $(hostprogs-m)
 
-subdir-$(CONFIG_MODVERSIONS)	+= genksyms
+# The following hostprogs-y programs are only build on demand
+hostprogs-y += unifdef
 
-# Let clean descend into subdirs
-subdir-	+= basic lxdialog kconfig
-
-# dependencies on generated files need to be listed explicitly
-
-$(obj)/modpost.o $(obj)/file2alias.o $(obj)/sumversion.o: $(obj)/elfconfig.h
+subdir-$(CONFIG_MODVERSIONS) += genksyms
+subdir-y                     += mod
 
-quiet_cmd_elfconfig = MKELF   $@
-      cmd_elfconfig = $(obj)/mk_elfconfig $(ARCH) < $< > $@
-
-$(obj)/elfconfig.h: $(obj)/empty.o $(obj)/mk_elfconfig FORCE
-	$(call if_changed,elfconfig)
-
-targets += elfconfig.h
+# Let clean descend into subdirs
+subdir-	+= basic kconfig package