diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2009-10-17 16:33:27 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2009-12-12 07:08:14 -0500 |
commit | 96f13045b6cb0c562bf3ffd3844871811e677e63 (patch) | |
tree | 24960e087e7806b11a682a694aa8fe163eb6edd5 | |
parent | 3252b11fc4790d046b93f300c898df2f7cd7c176 (diff) |
kbuild: drop include2/ used for O=... builds
There is no longer any use of the include2/ directory.
The generated files has moved to include/generated.
Drop all references to said directory.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r-- | Makefile | 9 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/Makefile | 6 |
2 files changed, 4 insertions, 11 deletions
@@ -335,7 +335,7 @@ CFLAGS_GCOV = -fprofile-arcs -ftest-coverage | |||
335 | # Use LINUXINCLUDE when you must reference the include/ directory. | 335 | # Use LINUXINCLUDE when you must reference the include/ directory. |
336 | # Needed to be compatible with the O= option | 336 | # Needed to be compatible with the O= option |
337 | LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ | 337 | LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ |
338 | $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \ | 338 | $(if $(KBUILD_SRC), -I$(srctree)/include) \ |
339 | -include include/linux/autoconf.h | 339 | -include include/linux/autoconf.h |
340 | 340 | ||
341 | KBUILD_CPPFLAGS := -D__KERNEL__ | 341 | KBUILD_CPPFLAGS := -D__KERNEL__ |
@@ -954,7 +954,6 @@ PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3 | |||
954 | # prepare3 is used to check if we are building in a separate output directory, | 954 | # prepare3 is used to check if we are building in a separate output directory, |
955 | # and if so do: | 955 | # and if so do: |
956 | # 1) Check that make has not been executed in the kernel src $(srctree) | 956 | # 1) Check that make has not been executed in the kernel src $(srctree) |
957 | # 2) Create the include2 directory, used for the second asm symlink | ||
958 | prepare3: include/config/kernel.release | 957 | prepare3: include/config/kernel.release |
959 | ifneq ($(KBUILD_SRC),) | 958 | ifneq ($(KBUILD_SRC),) |
960 | @$(kecho) ' Using $(srctree) as source for kernel' | 959 | @$(kecho) ' Using $(srctree) as source for kernel' |
@@ -963,10 +962,6 @@ ifneq ($(KBUILD_SRC),) | |||
963 | echo " in the '$(srctree)' directory.";\ | 962 | echo " in the '$(srctree)' directory.";\ |
964 | /bin/false; \ | 963 | /bin/false; \ |
965 | fi; | 964 | fi; |
966 | $(Q)if [ ! -d include2 ]; then \ | ||
967 | mkdir -p include2; \ | ||
968 | ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ | ||
969 | fi | ||
970 | endif | 965 | endif |
971 | 966 | ||
972 | # prepare2 creates a makefile if using a separate output directory | 967 | # prepare2 creates a makefile if using a separate output directory |
@@ -1193,7 +1188,7 @@ CLEAN_FILES += vmlinux System.map \ | |||
1193 | .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map | 1188 | .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map |
1194 | 1189 | ||
1195 | # Directories & files removed with 'make mrproper' | 1190 | # Directories & files removed with 'make mrproper' |
1196 | MRPROPER_DIRS += include/config include2 usr/include include/generated | 1191 | MRPROPER_DIRS += include/config usr/include include/generated |
1197 | MRPROPER_FILES += .config .config.old include/asm .version .old_version \ | 1192 | MRPROPER_FILES += .config .config.old include/asm .version .old_version \ |
1198 | include/linux/autoconf.h include/linux/version.h \ | 1193 | include/linux/autoconf.h include/linux/version.h \ |
1199 | include/linux/utsrelease.h \ | 1194 | include/linux/utsrelease.h \ |
diff --git a/arch/powerpc/platforms/cell/spufs/Makefile b/arch/powerpc/platforms/cell/spufs/Makefile index b93f877ba504..b9d5d678aa44 100644 --- a/arch/powerpc/platforms/cell/spufs/Makefile +++ b/arch/powerpc/platforms/cell/spufs/Makefile | |||
@@ -13,10 +13,8 @@ SPU_CC := $(SPU_CROSS)gcc | |||
13 | SPU_AS := $(SPU_CROSS)gcc | 13 | SPU_AS := $(SPU_CROSS)gcc |
14 | SPU_LD := $(SPU_CROSS)ld | 14 | SPU_LD := $(SPU_CROSS)ld |
15 | SPU_OBJCOPY := $(SPU_CROSS)objcopy | 15 | SPU_OBJCOPY := $(SPU_CROSS)objcopy |
16 | SPU_CFLAGS := -O2 -Wall -I$(srctree)/include \ | 16 | SPU_CFLAGS := -O2 -Wall -I$(srctree)/include -D__KERNEL__ |
17 | -I$(objtree)/include2 -D__KERNEL__ | 17 | SPU_AFLAGS := -c -D__ASSEMBLY__ -I$(srctree)/include -D__KERNEL__ |
18 | SPU_AFLAGS := -c -D__ASSEMBLY__ -I$(srctree)/include \ | ||
19 | -I$(objtree)/include2 -D__KERNEL__ | ||
20 | SPU_LDFLAGS := -N -Ttext=0x0 | 18 | SPU_LDFLAGS := -N -Ttext=0x0 |
21 | 19 | ||
22 | $(obj)/switch.o: $(obj)/spu_save_dump.h $(obj)/spu_restore_dump.h | 20 | $(obj)/switch.o: $(obj)/spu_save_dump.h $(obj)/spu_restore_dump.h |