summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Ravnborg <sam@mars.ravnborg.org>2006-07-23 22:47:50 +0400
committerSam Ravnborg <sam@neptun.ravnborg.org>2006-09-25 11:00:01 +0400
commit07aea3a71fc6b07744691eec2dfea705a7b30280 (patch)
treef1bb88857e93b28679674f4fa66bdef3a6c84c29
parent14a036d2dc304797f3624c06bd6d2a1e9b59e45a (diff)
downloadlinux-07aea3a71fc6b07744691eec2dfea705a7b30280.tar.xz
kbuild: use in-kernel unifdef
Let headers_install use in-kernel unifdef Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--Makefile4
-rw-r--r--scripts/Makefile3
-rw-r--r--scripts/Makefile.headersinst2
3 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index edfc2fdf76c9..b06b1ea46fe5 100644
--- a/Makefile
+++ b/Makefile
@@ -893,8 +893,8 @@ INSTALL_HDR_PATH=$(objtree)/usr
export INSTALL_HDR_PATH
PHONY += headers_install
-headers_install: include/linux/version.h
- $(Q)unifdef -Ux /dev/null
+headers_install: include/linux/version.h scripts_basic FORCE
+ $(Q)$(MAKE) $(build)=scripts scripts/unifdef
$(Q)rm -rf $(INSTALL_HDR_PATH)/include
$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include
diff --git a/scripts/Makefile b/scripts/Makefile
index 6f6b48f39f0a..d531a1fcef0c 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -15,6 +15,9 @@ hostprogs-$(CONFIG_IKCONFIG) += bin2c
always := $(hostprogs-y)
+# The following hostprogs-y programs are only build on demand
+hostprogs-y += unifdef
+
subdir-$(CONFIG_MODVERSIONS) += genksyms
subdir-$(CONFIG_MODULES) += mod
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 12e1daf875c8..8c02d2df4278 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -7,7 +7,7 @@
#
# ==========================================================================
-UNIFDEF := unifdef -U__KERNEL__
+UNIFDEF := scripts/unifdef -U__KERNEL__
# Eliminate the contents of (and inclusions of) compiler.h
HDRSED := sed -e "s/ inline / __inline__ /g" \