Adjust makefiles

makefiles/common.mk

@@ -1,4 +1,4 @@
-include config.mk
+include ./makefiles/config.mk
 
 .DEFAULT_GOAL := all
 
@@ -46,26 +46,26 @@ CFLAGS += -D__USER_NAME__=\"$(USER)\"
 REVISION = $(shell git rev-parse --short=10 HEAD)
 CFLAGS += -D__REVISION__=\"$(REVISION)\"
 
-CFLAGS += -I ./lib/CMSIS/ST/STM32F4xx/Include
-CFLAGS += -I ./lib/CMSIS/Include
-CFLAGS += -I $(ST_LIB)/inc
-
-CFLAGS += -I ./lib/mavlink
-CFLAGS += -I ./lib/mavlink/common
-
-CFLAGS += -I ./
-CFLAGS += -I ./platform
-CFLAGS += -I ./include
-CFLAGS += -I ./include/common
-CFLAGS += -I ./include/tenok
-CFLAGS += -I ./include/tenok/sys
-CFLAGS += -I ./include/kernel
-CFLAGS += -I ./include/kernel/arch
-CFLAGS += -I ./include/kernel/fs
-CFLAGS += -I ./include/filters
-CFLAGS += -I ./user
-CFLAGS += -I ./user/debug-link
-CFLAGS += -I ./build/msg
+CFLAGS += -I./lib/CMSIS/ST/STM32F4xx/Include
+CFLAGS += -I./lib/CMSIS/Include
+CFLAGS += -I$(ST_LIB)/inc
+
+CFLAGS += -I./lib/mavlink
+CFLAGS += -I./lib/mavlink/common
+
+CFLAGS += -I./
+CFLAGS += -I./platform
+CFLAGS += -I./include
+CFLAGS += -I./include/common
+CFLAGS += -I./include/tenok
+CFLAGS += -I./include/tenok/sys
+CFLAGS += -I./include/kernel
+CFLAGS += -I./include/kernel/arch
+CFLAGS += -I./include/kernel/fs
+CFLAGS += -I./include/filters
+CFLAGS += -I./user
+CFLAGS += -I./user/debug-link
+CFLAGS += -I./build/msg
 
 SRC += lib/CMSIS/DSP_Lib/Source/CommonTables/arm_common_tables.c \
        lib/CMSIS/DSP_Lib/Source/FastMathFunctions/arm_cos_f32.c \

makefiles/dynamics_wizard.mk

@@ -13,7 +13,7 @@ CFLAGS += -D STM32F427_437xx \
           -D DYNAMICS_WIZARD_F4 \
           -D __BOARD_NAME__=\"stm32f427\"
 
-CFLAGS += -I ./drivers/boards
+CFLAGS += -I./drivers/boards
 CFLAGS += -I./user/tasks
 
 # Board specific driver 

makefiles/qemu.mk

@@ -1,5 +1,3 @@
--include ../config.mk
-
 LD_SCRIPT += platform/stm32f407.ld
 
 CFLAGS += -D STM32F40_41xxx \

makefiles/stm32f429disc.mk

@@ -14,10 +14,10 @@ CFLAGS += -D STM32F429_439xx \
           -D __ARCH__=\"armv7m\" \
           -D __BOARD_NAME__=\"stm32f429\"
 
-CFLAGS += -I ./lib/STM32F429I-Discovery
-CFLAGS += -I ./lib/STM32F429I-Discovery/Common
+CFLAGS += -I./lib/STM32F429I-Discovery
+CFLAGS += -I./lib/STM32F429I-Discovery/Common
 
-CFLAGS += -I ./drivers/boards
+CFLAGS += -I./drivers/boards
 CFLAGS += -I./user/tasks
 
 SRC += $(ST_LIB)/src/stm32f4xx_fmc.c \

tools/mkromfs/Makefile

@@ -1,14 +1,13 @@
-include ../../config.mk
+include ../../makefiles/config.mk
 
 ROMFS := ./romfs.bin
 ROMFS_OBJ := ./romfs.o
 
 CFLAGS :=
-CFLAGS += -g
-CFLAGS += -Wall
+CFLAGS += -g -Wall
 
-CFLAGS += -I ../../ \
-          -I ../../include/common
+CFLAGS += -I../../ \
+          -I../../include/common
 
 SRC := ./mkromfs.c
 

tools/msggen/Makefile

@@ -1,14 +1,13 @@
-include ../../config.mk
+include ../../makefiles/config.mk
 
 ROMFS := ./romfs.bin
 ROMFS_OBJ := ./romfs.o
 
 CFLAGS :=
-CFLAGS +=-g
-CFLAGS += -Wall
+CFLAGS += -g -Wall
 
-CFLAGS += -I ../../ \
-	  -I ../../include/common
+CFLAGS += -I../../ \
+	  -I../../include/common
 
 SRC := ./msggen.c
 

tools/type_size/Makefile

@@ -1,17 +1,16 @@
-include ../../config.mk
+include ../../makefiles/config.mk
 
 ELF = type_size
 
 CFLAGS :=
-CFLAGS += -g
-CFLAGS += -m32
+CFLAGS += -g -m32
 
-CFLAGS += -I ../../ \
-          -I ../../include \
-          -I ../../include/common \
-          -I ../../include/kernel \
-          -I ../../include/tenok \
-          -I ../../include/tenok/sys
+CFLAGS += -I../../ \
+          -I../../include \
+          -I../../include/common \
+          -I../../include/kernel \
+          -I../../include/tenok \
+          -I../../include/tenok/sys
 
 SRC := ./main.c