aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 05:20:03 -0400
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 05:20:03 -0400
commit96a388de5dc53a8b234b3fd41f3ae2cedc9ffd42 (patch)
treed947a467aa2da3140279617bc4b9b101640d7bf4 /Makefile
parent27bd0c955648646abf2a353a8371d28c37bcd982 (diff)
i386/x86_64: move headers to include/asm-x86
Move the headers to include/asm-x86 and fixup the header install make rules Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 9 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index f2067e337d4d..2a30f5fd8294 100644
--- a/Makefile
+++ b/Makefile
@@ -863,7 +863,7 @@ ifneq ($(KBUILD_SRC),)
863 /bin/false; \ 863 /bin/false; \
864 fi; 864 fi;
865 $(Q)if [ ! -d include2 ]; then mkdir -p include2; fi; 865 $(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
866 $(Q)ln -fsn $(srctree)/include/asm-$(ARCH) include2/asm 866 $(Q)ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm
867endif 867endif
868 868
869# prepare2 creates a makefile if using a separate output directory 869# prepare2 creates a makefile if using a separate output directory
@@ -895,9 +895,9 @@ export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)
895# before switching between archs anyway. 895# before switching between archs anyway.
896 896
897include/asm: 897include/asm:
898 @echo ' SYMLINK $@ -> include/asm-$(ARCH)' 898 @echo ' SYMLINK $@ -> include/asm-$(SRCARCH)'
899 $(Q)if [ ! -d include ]; then mkdir -p include; fi; 899 $(Q)if [ ! -d include ]; then mkdir -p include; fi;
900 @ln -fsn asm-$(ARCH) $@ 900 @ln -fsn asm-$(SRCARCH) $@
901 901
902# Generate some files 902# Generate some files
903# --------------------------------------------------------------------------- 903# ---------------------------------------------------------------------------
@@ -937,7 +937,8 @@ depend dep:
937INSTALL_HDR_PATH=$(objtree)/usr 937INSTALL_HDR_PATH=$(objtree)/usr
938export INSTALL_HDR_PATH 938export INSTALL_HDR_PATH
939 939
940HDRARCHES=$(filter-out generic,$(patsubst $(srctree)/include/asm-%/Kbuild,%,$(wildcard $(srctree)/include/asm-*/Kbuild))) 940HDRFILTER=generic i386 x86_64
941HDRARCHES=$(filter-out $(HDRFILTER),$(patsubst $(srctree)/include/asm-%/Kbuild,%,$(wildcard $(srctree)/include/asm-*/Kbuild)))
941 942
942PHONY += headers_install_all 943PHONY += headers_install_all
943headers_install_all: include/linux/version.h scripts_basic FORCE 944headers_install_all: include/linux/version.h scripts_basic FORCE
@@ -948,11 +949,11 @@ headers_install_all: include/linux/version.h scripts_basic FORCE
948 949
949PHONY += headers_install 950PHONY += headers_install
950headers_install: include/linux/version.h scripts_basic FORCE 951headers_install: include/linux/version.h scripts_basic FORCE
951 @if [ ! -r $(srctree)/include/asm-$(ARCH)/Kbuild ]; then \ 952 @if [ ! -r $(srctree)/include/asm-$(SRCARCH)/Kbuild ]; then \
952 echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \ 953 echo '*** Error: Headers not exportable for this architecture ($(SRCARCH))'; \
953 exit 1 ; fi 954 exit 1 ; fi
954 $(Q)$(MAKE) $(build)=scripts scripts/unifdef 955 $(Q)$(MAKE) $(build)=scripts scripts/unifdef
955 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include 956 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst ARCH=$(SRCARCH) obj=include
956 957
957PHONY += headers_check_all 958PHONY += headers_check_all
958headers_check_all: headers_install_all 959headers_check_all: headers_install_all
@@ -962,7 +963,7 @@ headers_check_all: headers_install_all
962 963
963PHONY += headers_check 964PHONY += headers_check
964headers_check: headers_install 965headers_check: headers_install
965 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include HDRCHECK=1 966 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst ARCH=$(SRCARCH) obj=include HDRCHECK=1
966 967
967# --------------------------------------------------------------------------- 968# ---------------------------------------------------------------------------
968# Modules 969# Modules