From 07aea3a71fc6b07744691eec2dfea705a7b30280 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg <sam@mars.ravnborg.org> Date: Sun, 23 Jul 2006 20:47:50 +0200 Subject: [PATCH] kbuild: use in-kernel unifdef 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 edfc2fdf76c95..b06b1ea46fe58 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 6f6b48f39f0ae..d531a1fcef0c9 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 12e1daf875c83..8c02d2df42782 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" \ -- GitLab