Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[sfrench/cifs-2.6.git] / scripts / Makefile

diff --git a/scripts/Makefile b/scripts/Makefile
index 6f6b48f39f0ae1517fe7485c3883f9cc127f20fe..1c73c5aea66b06bcecff315356abcecc2a79522f 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -13,10 +13,13 @@ hostprogs-$(CONFIG_VT)           += conmakehash
 hostprogs-$(CONFIG_PROM_CONSOLE) += conmakehash
 hostprogs-$(CONFIG_IKCONFIG)     += bin2c
 
-always         := $(hostprogs-y)
+always         := $(hostprogs-y) $(hostprogs-m)
+
+# The following hostprogs-y programs are only build on demand
+hostprogs-y += unifdef
 
 subdir-$(CONFIG_MODVERSIONS) += genksyms
-subdir-$(CONFIG_MODULES)     += mod
+subdir-y                     += mod
 
 # Let clean descend into subdirs
 subdir-        += basic kconfig package