diff options
| -rw-r--r-- | config.mk | 4 | ||||
| -rwxr-xr-x | mkconfig | 14 | ||||
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/env/Makefile | 2 | ||||
| -rw-r--r-- | tools/imls/Makefile | 2 |
5 files changed, 11 insertions, 13 deletions
@@ -257,10 +257,10 @@ endif endif ifneq ($(OBJTREE),$(SRCTREE)) -CPPFLAGS += -I$(OBJTREE)/include2 -I$(OBJTREE)/include +CPPFLAGS += -I$(OBJTREE)/include endif -CPPFLAGS += -I$(TOPDIR)/include +CPPFLAGS += -I$(TOPDIR)/include -I$(SRCTREE)/arch/$(ARCH)/include CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \ -isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS) @@ -96,17 +96,11 @@ fi # if [ "$SRCTREE" != "$OBJTREE" ] ; then mkdir -p ${OBJTREE}/include - mkdir -p ${OBJTREE}/include2 - cd ${OBJTREE}/include2 - rm -f asm - ln -s ${SRCTREE}/arch/${arch}/include/asm asm LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/ - cd ../include + cd ${OBJTREE}/include mkdir -p asm else - cd ./include - rm -f asm - ln -s ../arch/${arch}/include/asm asm + cd arch/${arch}/include fi rm -f asm/arch @@ -122,6 +116,10 @@ if [ "${arch}" = "arm" ] ; then ln -s ${LNPREFIX}proc-armv asm/proc fi +if [ "$SRCTREE" = "$OBJTREE" ] ; then + cd ${SRCTREE}/include +fi + # # Create include file for Make # diff --git a/tools/Makefile b/tools/Makefile index ca76f947e5..14d94e39a0 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -160,7 +160,7 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_OBJ_FILES-y)) # HOSTCPPFLAGS = -include $(SRCTREE)/include/libfdt_env.h \ -idirafter $(SRCTREE)/include \ - -idirafter $(OBJTREE)/include2 \ + -idirafter $(SRCTREE)/arch/$(ARCH)/include \ -idirafter $(OBJTREE)/include \ -I $(SRCTREE)/lib/libfdt \ -I $(SRCTREE)/tools \ diff --git a/tools/env/Makefile b/tools/env/Makefile index 14d131b7b8..27892f74d0 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -14,7 +14,7 @@ HEADERS := fw_env.h $(OBJTREE)/include/config.h # Compile for a hosted environment on the target HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ - -idirafter $(OBJTREE)/include2 \ + -idirafter $(SRCTREE)/arch/$(ARCH)/include \ -idirafter $(OBJTREE)/include \ -idirafter $(SRCTREE)/tools/env \ -DUSE_HOSTCC \ diff --git a/tools/imls/Makefile b/tools/imls/Makefile index e371983275..b045df2df0 100644 --- a/tools/imls/Makefile +++ b/tools/imls/Makefile @@ -37,7 +37,7 @@ LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y)) # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps # HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ - -idirafter $(OBJTREE)/include2 \ + -idirafter $(SRCTREE)/arch/$(ARCH)/include \ -idirafter $(OBJTREE)/include \ -I $(SRCTREE)/lib/libfdt \ -I $(SRCTREE)/tools \ |