Changeset 5c1b3cd in mainline for kernel/Makefile

Timestamp:

2013-03-16T21:48:33Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6b0cfa1

Parents:

71fe7e9d (diff), f597bc4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes

File:

• kernel/Makefile (modified) (7 diffs)

kernel/Makefile

@@ -36 +36 @@
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
 COMMON_HEADER = $(ROOT_PATH)/common.h
-COMMON_HEADER_ARCH = arch/$(KARCH)/include/common.h
+COMMON_HEADER_ARCH = arch/$(KARCH)/include/arch/common.h
 
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
@@ -59 +59 @@
 REAL_MAP = generic/src/debug/real_map
 
-ABI_INCLUDE = generic/include/abi
-ARCH_INCLUDE = generic/include/arch
-GENARCH_INCLUDE = generic/include/genarch
-
 GENMAP = tools/genmap.py
 JOBFILE = $(ROOT_PATH)/tools/jobfile.py
@@ -76 +72 @@
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld arch/*/include/common.h
+        rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* arch/*/_link.ld arch/*/include/arch/common.h
         find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
 
@@ -82 +78 @@
 #
 
-INCLUDES = generic/include
+INCLUDES = generic/include genarch/include arch/$(KARCH)/include ../abi/include
+INCLUDES_FLAGS = $(addprefix -I,$(INCLUDES))
 
 ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y)
@@ -92 +89 @@
 DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
 
-GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+GCC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
@@ -99 +96 @@
         -pipe
 
-ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+ICC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
         -Werror-implicit-function-declaration -wd170
 
-CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
@@ -435 +432 @@
         $(GENMAP) $(MAP_PREV) $(DUMP) $@
 
-$(DEPEND): $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH)
+$(DEPEND): $(COMMON_HEADER_ARCH)
         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
 
-$(ABI_INCLUDE): ../abi/include/
-        ln -sfn ../../$< $@
-
-$(ARCH_INCLUDE): arch/$(KARCH)/include/
-        ln -sfn ../../$< $@
-
-$(GENARCH_INCLUDE): genarch/include/
-        ln -sfn ../../$< $@
-
 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)
-        ln -sfn ../../../$< $@
+        ln -sfn ../../../../$< $@