[PATCH 5/28] kbuild: use in-kernel unifdef

sam
2006-09-24T21:13:13Z

From: Sam Ravnborg <sam@mars.ravnborg.org>

Let headers_install use in-kernel unifdef

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
Makefile | 4 ++--
scripts/Makefile | 3 +++
scripts/Makefile.headersinst | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index edfc2fd..b06b1ea 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 6f6b48f..d531a1f 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -15,6 +15,9 @@ hostprogs-$(CONFIG_IKCONFIG) += bin2

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 12e1daf..8c02d2d 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -7,7 +7,7 @@ # objhdr-y are generated files that will
#
# ==========================================================================

-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" \
--
1.4.1