Update to 3.4-final.

[linux-flexiantxendom0-3.2.10.git] / scripts / Makefile

diff --git a/scripts/Makefile b/scripts/Makefile
index 287694d..3626666 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -2,32 +2,36 @@
 # scripts contains sources for various helper programs used throughout
 # the kernel for the build process.
 # ---------------------------------------------------------------------------
-# fix-dep:      Used to generate dependency information during build process
-# split-include: Divide all config symbols up in a number of files in
-#                include/config/...
-# 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
+# docproc:       Used in Documentation/DocBook
 
-host-progs    := fixdep split-include conmakehash docproc kallsyms modpost \
-                mk_elfconfig
-build-targets := $(host-progs) empty.o
+HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 
-modpost-objs  := modpost.o file2alias.o
+hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
+hostprogs-$(CONFIG_LOGO)         += pnmtologo
+hostprogs-$(CONFIG_VT)           += conmakehash
+hostprogs-$(CONFIG_IKCONFIG)     += bin2c
+hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount
 
-# Let clean descend into subdirs
-subdir-        := lxdialog kconfig
-
-# fixdep is needed to compile other host programs
-$(addprefix $(obj)/,$(filter-out fixdep,$(build-targets))): $(obj)/fixdep
+always         := $(hostprogs-y) $(hostprogs-m)
 
-# dependencies on generated files need to be listed explicitly
+# The following hostprogs-y programs are only build on demand
+hostprogs-y += unifdef docproc
 
-$(obj)/modpost.o $(obj)/file2alias.o: $(obj)/elfconfig.h
+# These targets are used internally to avoid "is up to date" messages
+PHONY += build_unifdef
+build_unifdef: scripts/unifdef FORCE
+       @:
+build_docproc: scripts/docproc FORCE
+       @:
 
-quiet_cmd_elfconfig = MKELF   $@
-      cmd_elfconfig = $(obj)/mk_elfconfig $(ARCH) < $< > $@
+subdir-$(CONFIG_MODVERSIONS) += genksyms
+subdir-y                     += mod
+subdir-$(CONFIG_SECURITY_SELINUX) += selinux
+subdir-$(CONFIG_DTC)         += dtc
 
-$(obj)/elfconfig.h: $(obj)/empty.o $(obj)/mk_elfconfig FORCE
-       $(call if_changed,elfconfig)
-
-targets += $(obj)/elfconfig.h
+# Let clean descend into subdirs
+subdir-        += basic kconfig package selinux