disable UML, fixup the release

[linux-2.6.git] / scripts / Makefile

diff --git a/scripts/Makefile b/scripts/Makefile
index 81c913c..1c73c5a 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -2,14 +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 pnmtologo bin2c
-always         := $(host-progs)
+hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
+hostprogs-$(CONFIG_LOGO)         += pnmtologo
+hostprogs-$(CONFIG_VT)           += conmakehash
+hostprogs-$(CONFIG_PROM_CONSOLE) += conmakehash
+hostprogs-$(CONFIG_IKCONFIG)     += bin2c
 
-subdir-$(CONFIG_MODVERSIONS)   += genksyms
-subdir-y       += mod
+always         := $(hostprogs-y) $(hostprogs-m)
+
+# The following hostprogs-y programs are only build on demand
+hostprogs-y += unifdef
+
+subdir-$(CONFIG_MODVERSIONS) += genksyms
+subdir-y                     += mod
 
 # Let clean descend into subdirs
-subdir-        += basic lxdialog kconfig package
+subdir-        += basic kconfig package