[4/12] kbuild: Selective compile of targets in scripts/

[Sam Ravnborg]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/08/08 21:01:05+02:00 sam@xxxxxxxxxxxxxxxxx 
#   kbuild: Selective compile of targets in scripts/
#   
#   Do not build executables unless needed.
#   Same goes for scripts/mod/, descend only when CONFIG_MODULES are enabled.
#   With inputs form: Russell King <rmk+lkml@xxxxxxxxxxxxxxxx> and  Brian Gerst <bgerst@xxxxxxxxxxxxxxxxxxx>
#   
#   Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
# 
# scripts/Makefile
#   2004/08/08 21:00:50+02:00 sam@xxxxxxxxxxxxxxxxx +12 -4
#   Only build required host-progs.
#   Descend into mod/ only when modules are enabled
# 
# Makefile
#   2004/08/08 21:00:50+02:00 sam@xxxxxxxxxxxxxxxxx +1 -1
#   Add dependency on kallsyms, so recompile is done when script changes
# 
diff -Nru a/Makefile b/Makefile
--- a/Makefile	2004-08-13 21:09:00 +02:00
+++ b/Makefile	2004-08-13 21:09:00 +02:00
@@ -584,7 +584,7 @@
 .tmp_kallsyms1.o .tmp_kallsyms2.o .tmp_kallsyms3.o: %.o: %.S scripts FORCE
 	$(call if_changed_dep,as_o_S)
 
-.tmp_kallsyms%.S: .tmp_vmlinux%
+.tmp_kallsyms%.S: .tmp_vmlinux% $(KALLSYMS)
 	$(call cmd,kallsyms)
 
 .tmp_vmlinux1: $(vmlinux-objs) arch/$(ARCH)/kernel/vmlinux.lds.s FORCE
diff -Nru a/scripts/Makefile b/scripts/Makefile
--- a/scripts/Makefile	2004-08-13 21:09:00 +02:00
+++ b/scripts/Makefile	2004-08-13 21:09:00 +02:00
@@ -2,14 +2,22 @@
 # 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
+hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
+hostprogs-$(CONFIG_LOGO)         += pnmtologo
+hostprogs-$(CONFIG_VT)           += conmakehash
+hostprogs-$(CONFIG_PROM_CONSOLE) += conmakehash
+hostprogs-$(CONFIG_IKCONFIG)     += bin2c
+
+host-progs	:= $(sort $(hostprogs-y))
 always		:= $(host-progs)
 
-subdir-$(CONFIG_MODVERSIONS)	+= genksyms
-subdir-y	+= mod
+subdir-$(CONFIG_MODVERSIONS) += genksyms
+subdir-$(CONFIG_MODULES)     += mod
 
 # Let clean descend into subdirs
 subdir-	+= basic lxdialog kconfig package
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/