diff options
83 files changed, 3 insertions, 208 deletions
diff --git a/app/lkboot/rules.mk b/app/lkboot/rules.mk index 911e70c3..1ee13766 100644 --- a/app/lkboot/rules.mk +++ b/app/lkboot/rules.mk @@ -16,6 +16,4 @@ MODULE_SRCS += \ $(LOCAL_DIR)/inet.c \ $(LOCAL_DIR)/lkboot.c \ -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - include make/module.mk diff --git a/app/pcitests/rules.mk b/app/pcitests/rules.mk index 27a9841d..5d27fcf0 100644 --- a/app/pcitests/rules.mk +++ b/app/pcitests/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -#GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/pci_tests.c diff --git a/app/tests/rules.mk b/app/tests/rules.mk index 915b71b4..35e4ee2e 100644 --- a/app/tests/rules.mk +++ b/app/tests/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/benchmarks.c \ $(LOCAL_DIR)/cache_tests.c \ diff --git a/app/usbtest/rules.mk b/app/usbtest/rules.mk index 6e531257..67c77175 100644 --- a/app/usbtest/rules.mk +++ b/app/usbtest/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -#GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_DEPS += \ dev/usb diff --git a/arch/arm/rules.mk b/arch/arm/rules.mk index 985aaf78..e1bab0ef 100644 --- a/arch/arm/rules.mk +++ b/arch/arm/rules.mk @@ -174,7 +174,6 @@ THUMBINTERWORK := -mthumb-interwork endif GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include \ $(LOCAL_DIR)/$(SUBARCH)/include ifeq ($(SUBARCH),arm) diff --git a/arch/arm64/rules.mk b/arch/arm64/rules.mk index 28d08da8..ecf51eae 100644 --- a/arch/arm64/rules.mk +++ b/arch/arm64/rules.mk @@ -7,9 +7,6 @@ GLOBAL_DEFINES += \ ARM_ISA_ARMV8=1 \ IS_64BIT=1 -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/arch.c \ $(LOCAL_DIR)/asm.S \ diff --git a/arch/microblaze/rules.mk b/arch/microblaze/rules.mk index 7c3ebe21..1af9d8f1 100644 --- a/arch/microblaze/rules.mk +++ b/arch/microblaze/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/start.S \ $(LOCAL_DIR)/arch.c \ diff --git a/arch/or1k/rules.mk b/arch/or1k/rules.mk index 046b9bf4..8c25a8a6 100644 --- a/arch/or1k/rules.mk +++ b/arch/or1k/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/start.S \ $(LOCAL_DIR)/arch.c \ diff --git a/arch/x86-64/rules.mk b/arch/x86-64/rules.mk index aeec529a..620a2d58 100644 --- a/arch/x86-64/rules.mk +++ b/arch/x86-64/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - WITH_KERNEL_VM=1 GLOBAL_DEFINES += \ MEMBASE=0x00200000U \ diff --git a/arch/x86/rules.mk b/arch/x86/rules.mk index a005f44d..5260abb2 100644 --- a/arch/x86/rules.mk +++ b/arch/x86/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - WITH_KERNEL_VM=1 GLOBAL_DEFINES += \ diff --git a/dev/cache/pl310/rules.mk b/dev/cache/pl310/rules.mk index aa0c1138..36fef288 100644 --- a/dev/cache/pl310/rules.mk +++ b/dev/cache/pl310/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - GLOBAL_DEFINES += MODULE_SRCS += \ diff --git a/dev/interrupt/arm_gic/rules.mk b/dev/interrupt/arm_gic/rules.mk index 8d85b0e1..d77ca24a 100644 --- a/dev/interrupt/arm_gic/rules.mk +++ b/dev/interrupt/arm_gic/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/arm_gic.c diff --git a/dev/interrupt/or1k_pic/rules.mk b/dev/interrupt/or1k_pic/rules.mk index 08e39fa2..1148b7f2 100644 --- a/dev/interrupt/or1k_pic/rules.mk +++ b/dev/interrupt/or1k_pic/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/or1k_pic.c diff --git a/dev/net/pcnet/rules.mk b/dev/net/pcnet/rules.mk index 151d3b4a..979a6117 100644 --- a/dev/net/pcnet/rules.mk +++ b/dev/net/pcnet/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/pcnet.c diff --git a/dev/net/smc91c96/rules.mk b/dev/net/smc91c96/rules.mk index daff4bad..4f237b59 100644 --- a/dev/net/smc91c96/rules.mk +++ b/dev/net/smc91c96/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/smc91c96.c diff --git a/dev/pmic/twl4030/rules.mk b/dev/pmic/twl4030/rules.mk index 848c3157..a5646b2f 100644 --- a/dev/pmic/twl4030/rules.mk +++ b/dev/pmic/twl4030/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/twl4030.c diff --git a/dev/timer/arm_cortex_a9/rules.mk b/dev/timer/arm_cortex_a9/rules.mk index 429599bc..1345ddff 100644 --- a/dev/timer/arm_cortex_a9/rules.mk +++ b/dev/timer/arm_cortex_a9/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - GLOBAL_DEFINES += \ PLATFORM_HAS_DYNAMIC_TIMER=1 diff --git a/dev/timer/arm_generic/rules.mk b/dev/timer/arm_generic/rules.mk index aae920c7..7331312c 100644 --- a/dev/timer/arm_generic/rules.mk +++ b/dev/timer/arm_generic/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - GLOBAL_DEFINES += \ PLATFORM_HAS_DYNAMIC_TIMER=1 diff --git a/dev/timer/or1k_ticktimer/rules.mk b/dev/timer/or1k_ticktimer/rules.mk index 9dda5826..5525f657 100644 --- a/dev/timer/or1k_ticktimer/rules.mk +++ b/dev/timer/or1k_ticktimer/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - #GLOBAL_DEFINES += \ # PLATFORM_HAS_DYNAMIC_TIMER=1 diff --git a/dev/virtio/block/rules.mk b/dev/virtio/block/rules.mk index 14f06b89..f744bcb2 100644 --- a/dev/virtio/block/rules.mk +++ b/dev/virtio/block/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/virtio-block.c \ diff --git a/dev/virtio/gpu/rules.mk b/dev/virtio/gpu/rules.mk index 358ee97a..8210208e 100644 --- a/dev/virtio/gpu/rules.mk +++ b/dev/virtio/gpu/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/virtio-gpu.c \ diff --git a/dev/virtio/net/rules.mk b/dev/virtio/net/rules.mk index 14343423..2f782d21 100644 --- a/dev/virtio/net/rules.mk +++ b/dev/virtio/net/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/virtio-net.c diff --git a/dev/virtio/rules.mk b/dev/virtio/rules.mk index 988b2109..22c8c0b1 100644 --- a/dev/virtio/rules.mk +++ b/dev/virtio/rules.mk @@ -2,9 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/virtio.c diff --git a/lib/aes/rules.mk b/lib/aes/rules.mk index 8a1f695b..939fa455 100644 --- a/lib/aes/rules.mk +++ b/lib/aes/rules.mk @@ -3,9 +3,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - - MODULE_SRCS := \ $(LOCAL_DIR)/aes_core.c diff --git a/lib/bootargs/rules.mk b/lib/bootargs/rules.mk index cb912576..16a33135 100644 --- a/lib/bootargs/rules.mk +++ b/lib/bootargs/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_DEPS := \ MODULE_SRCS := \ diff --git a/lib/bootimage/rules.mk b/lib/bootimage/rules.mk index a45da2a6..e75cfcef 100644 --- a/lib/bootimage/rules.mk +++ b/lib/bootimage/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_DEPS := \ lib/mincrypt diff --git a/lib/buildsig/rules.mk b/lib/buildsig/rules.mk index 12fb1e1d..e88ea824 100644 --- a/lib/buildsig/rules.mk +++ b/lib/buildsig/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_DEPS := \ lib/version diff --git a/lib/cbuf/rules.mk b/lib/cbuf/rules.mk index 644f1420..c04ea5e4 100644 --- a/lib/cbuf/rules.mk +++ b/lib/cbuf/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/cbuf.c diff --git a/lib/console/rules.mk b/lib/console/rules.mk index beaaa5d6..af44f0ae 100644 --- a/lib/console/rules.mk +++ b/lib/console/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/console.c diff --git a/lib/dlmalloc/rules.mk b/lib/dlmalloc/rules.mk index 1c629a4a..3a5ae667 100644 --- a/lib/dlmalloc/rules.mk +++ b/lib/dlmalloc/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/dlmalloc.c diff --git a/lib/elf/rules.mk b/lib/elf/rules.mk index e2a9944d..fc257b22 100644 --- a/lib/elf/rules.mk +++ b/lib/elf/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/elf.c diff --git a/lib/fdt/rules.mk b/lib/fdt/rules.mk index 24373155..040936e3 100644 --- a/lib/fdt/rules.mk +++ b/lib/fdt/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/fdt.c \ $(LOCAL_DIR)/fdt_addresses.c \ diff --git a/lib/ffs/rules.mk b/lib/ffs/rules.mk index fe2bb754..3a0853ed 100644 --- a/lib/ffs/rules.mk +++ b/lib/ffs/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/ff.c \ $(LOCAL_DIR)/option/ccsbcs.c \ diff --git a/lib/fixed_point/rules.mk b/lib/fixed_point/rules.mk index 058734b9..b30c452e 100644 --- a/lib/fixed_point/rules.mk +++ b/lib/fixed_point/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/fixed_point.c diff --git a/lib/iovec/rules.mk b/lib/iovec/rules.mk index fe3782b3..a8f2f987 100644 --- a/lib/iovec/rules.mk +++ b/lib/iovec/rules.mk @@ -2,10 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - -MODULE_DEPS := \ - MODULE_SRCS := \ $(LOCAL_DIR)/iovec.c \ diff --git a/lib/klog/rules.mk b/lib/klog/rules.mk index 481cc420..39ce61b2 100644 --- a/lib/klog/rules.mk +++ b/lib/klog/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_DEPS := \ lib/cksum diff --git a/lib/libm/rules.mk b/lib/libm/rules.mk index 92f890c9..02394537 100644 --- a/lib/libm/rules.mk +++ b/lib/libm/rules.mk @@ -4,8 +4,6 @@ MODULE := $(LOCAL_DIR) MODULE_CFLAGS += -Wno-unused-variable -Wno-sign-compare -Wno-parentheses -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/k_sin.c \ $(LOCAL_DIR)/s_sin.c \ diff --git a/lib/lwip/rules.mk b/lib/lwip/rules.mk index 38f8df07..a6f3f1fc 100644 --- a/lib/lwip/rules.mk +++ b/lib/lwip/rules.mk @@ -2,10 +2,7 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -MODULE_DEPS := \ - GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include \ $(LOCAL_DIR)/include/lwip \ $(LOCAL_DIR)/include/posix \ diff --git a/lib/mincrypt/rules.mk b/lib/mincrypt/rules.mk index a6866973..35694458 100644 --- a/lib/mincrypt/rules.mk +++ b/lib/mincrypt/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/sha.c \ $(LOCAL_DIR)/sha256.c diff --git a/lib/minip/rules.mk b/lib/minip/rules.mk index b36417a7..a2c3dc67 100644 --- a/lib/minip/rules.mk +++ b/lib/minip/rules.mk @@ -7,8 +7,6 @@ MODULE_DEPS := \ lib/iovec \ lib/pool -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/arp.c \ $(LOCAL_DIR)/chksum.c \ diff --git a/lib/miniz/rules.mk b/lib/miniz/rules.mk index 401596f6..20d7ffb4 100644 --- a/lib/miniz/rules.mk +++ b/lib/miniz/rules.mk @@ -2,10 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - -MODULE_DEPS += - MODULE_SRCS += \ $(LOCAL_DIR)/miniz.c diff --git a/lib/norfs/rules.mk b/lib/norfs/rules.mk index b84f3bca..b37b8800 100644 --- a/lib/norfs/rules.mk +++ b/lib/norfs/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_DEPS := \ lib/iovec \ lib/cksum diff --git a/lib/norfs/test/rules.mk b/lib/norfs/test/rules.mk index a11a7340..c0c0d105 100644 --- a/lib/norfs/test/rules.mk +++ b/lib/norfs/test/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_DEPS := \ lib/norfs \ lib/unittest diff --git a/lib/pool/rules.mk b/lib/pool/rules.mk index 2528d3d7..04fcc663 100644 --- a/lib/pool/rules.mk +++ b/lib/pool/rules.mk @@ -1,7 +1,5 @@ LOCAL_DIR := $(GET_LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE := $(LOCAL_DIR) MODULE_SRCS += \ diff --git a/lib/tftp/rules.mk b/lib/tftp/rules.mk index d8054e6c..3a80d910 100644 --- a/lib/tftp/rules.mk +++ b/lib/tftp/rules.mk @@ -5,9 +5,6 @@ MODULE := $(LOCAL_DIR) MODULE_DEPS := \ lib/minip \ - -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/tftp.c \ diff --git a/lib/unittest/app/rules.mk b/lib/unittest/app/rules.mk index 7290b3a1..594a42f4 100644 --- a/lib/unittest/app/rules.mk +++ b/lib/unittest/app/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_DEPS := \ lib/unittest diff --git a/lib/unittest/rules.mk b/lib/unittest/rules.mk index 35521934..0b034c3e 100644 --- a/lib/unittest/rules.mk +++ b/lib/unittest/rules.mk @@ -2,10 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - -MODULE_DEPS := \ - MODULE_SRCS := \ $(LOCAL_DIR)/unittest.c \ $(LOCAL_DIR)/all_tests.c \ diff --git a/lib/version/rules.mk b/lib/version/rules.mk index 9b34d822..8f9afa7f 100644 --- a/lib/version/rules.mk +++ b/lib/version/rules.mk @@ -2,8 +2,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/version.c diff --git a/lib/watchdog/rules.mk b/lib/watchdog/rules.mk index ff5c232c..b1aee7a5 100644 --- a/lib/watchdog/rules.mk +++ b/lib/watchdog/rules.mk @@ -1,7 +1,5 @@ LOCAL_DIR := $(GET_LOCAL_DIR) -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE := $(LOCAL_DIR) MODULE_SRCS := \ diff --git a/make/module.mk b/make/module.mk index ddcc363f..48921b3a 100644 --- a/make/module.mk +++ b/make/module.mk @@ -39,6 +39,9 @@ endif MODULE_SRCDIR := $(MODULE) MODULE_BUILDDIR := $(call TOBUILDDIR,$(MODULE_SRCDIR)) +# add a local include dir to the global include path +GLOBAL_INCLUDES += $(MODULE_SRCDIR)/include + # add the listed module deps to the global list MODULES += $(MODULE_DEPS) diff --git a/platform/alterasoc/rules.mk b/platform/alterasoc/rules.mk index 1122ea4c..c0a41592 100644 --- a/platform/alterasoc/rules.mk +++ b/platform/alterasoc/rules.mk @@ -11,9 +11,6 @@ MODULE_DEPS := \ dev/interrupt/arm_gic \ dev/timer/arm_cortex_a9 -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/clocks.c \ $(LOCAL_DIR)/debug.c \ diff --git a/platform/am335x/rules.mk b/platform/am335x/rules.mk index 0b2ac024..b3342564 100644 --- a/platform/am335x/rules.mk +++ b/platform/am335x/rules.mk @@ -9,7 +9,6 @@ CPU := generic ENABLE_THUMB := false GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include \ $(LOCAL_DIR)/ti/include \ $(LOCAL_DIR)/ti/include/hw \ $(LOCAL_DIR)/ti/include/armv7a \ diff --git a/platform/armemu/rules.mk b/platform/armemu/rules.mk index df4d187e..711a3db5 100644 --- a/platform/armemu/rules.mk +++ b/platform/armemu/rules.mk @@ -9,9 +9,6 @@ CPU := generic WITH_KERNEL_VM := 0 KERNEL_BASE := 0x0 -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/debug.c \ $(LOCAL_DIR)/interrupts.c \ diff --git a/platform/bcm2835/rules.mk b/platform/bcm2835/rules.mk index e67c3e47..26f2b7e1 100644 --- a/platform/bcm2835/rules.mk +++ b/platform/bcm2835/rules.mk @@ -17,9 +17,6 @@ MODULE_DEPS := \ dev/interrupt/arm_gic \ dev/timer/arm_cortex_a9 -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/intc.c \ $(LOCAL_DIR)/platform.c \ diff --git a/platform/lpc15xx/rules.mk b/platform/lpc15xx/rules.mk index 86c0d868..b17d5ceb 100644 --- a/platform/lpc15xx/rules.mk +++ b/platform/lpc15xx/rules.mk @@ -19,9 +19,6 @@ ifeq ($(MEMSIZE),) $(error need to define MEMSIZE) endif -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include \ - MODULE_SRCS += \ $(LOCAL_DIR)/init.c \ $(LOCAL_DIR)/debug.c \ diff --git a/platform/lpc43xx/rules.mk b/platform/lpc43xx/rules.mk index 58d813ea..d5d5c4e9 100644 --- a/platform/lpc43xx/rules.mk +++ b/platform/lpc43xx/rules.mk @@ -12,9 +12,6 @@ ARM_CPU := cortex-m4 GLOBAL_DEFINES += \ MEMSIZE=$(MEMSIZE) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c \ $(LOCAL_DIR)/gpio.c \ diff --git a/platform/microblaze/rules.mk b/platform/microblaze/rules.mk index 0cb726f7..492184ff 100644 --- a/platform/microblaze/rules.mk +++ b/platform/microblaze/rules.mk @@ -7,9 +7,6 @@ ARCH := microblaze MODULE_DEPS += \ lib/cbuf -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/intc.c \ $(LOCAL_DIR)/platform.c \ diff --git a/platform/omap3/rules.mk b/platform/omap3/rules.mk index 8550027a..68f2379b 100644 --- a/platform/omap3/rules.mk +++ b/platform/omap3/rules.mk @@ -10,9 +10,6 @@ CPU := generic GLOBAL_DEFINES += \ WITH_DEV_UART=1 -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/cpu_early_init.S \ $(LOCAL_DIR)/debug.c \ diff --git a/platform/or1ksim/rules.mk b/platform/or1ksim/rules.mk index fac536a8..fc644991 100644 --- a/platform/or1ksim/rules.mk +++ b/platform/or1ksim/rules.mk @@ -9,9 +9,6 @@ MODULE_DEPS += \ dev/interrupt/or1k_pic \ dev/timer/or1k_ticktimer -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/platform.c \ $(LOCAL_DIR)/uart.c diff --git a/platform/pc/rules.mk b/platform/pc/rules.mk index 34f7a2ac..38518bcd 100644 --- a/platform/pc/rules.mk +++ b/platform/pc/rules.mk @@ -7,9 +7,6 @@ CPU := generic MODULE_DEPS += \ lib/cbuf \ -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - ifeq ($(ARCH), x86) MODULE_SRCS += \ $(LOCAL_DIR)/interrupts.c \ diff --git a/platform/qemu-virt/rules.mk b/platform/qemu-virt/rules.mk index f0a6d890..f0702f74 100644 --- a/platform/qemu-virt/rules.mk +++ b/platform/qemu-virt/rules.mk @@ -13,9 +13,6 @@ ARM_CPU ?= cortex-a15 endif WITH_SMP ?= 1 -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/debug.c \ $(LOCAL_DIR)/platform.c \ diff --git a/platform/sam3/rules.mk b/platform/sam3/rules.mk index 168793e9..47b527b0 100644 --- a/platform/sam3/rules.mk +++ b/platform/sam3/rules.mk @@ -21,9 +21,6 @@ ifeq ($(MEMSIZE),) $(error need to define MEMSIZE) endif -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c \ $(LOCAL_DIR)/debug.c \ diff --git a/platform/stellaris/rules.mk b/platform/stellaris/rules.mk index 3f2c9879..a7a534c3 100644 --- a/platform/stellaris/rules.mk +++ b/platform/stellaris/rules.mk @@ -24,9 +24,6 @@ ifeq ($(MEMSIZE),) $(error need to define MEMSIZE) endif -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include \ - MODULE_SRCS += \ $(LOCAL_DIR)/debug.c \ $(LOCAL_DIR)/gpio.c \ diff --git a/platform/stm32f1xx/rules.mk b/platform/stm32f1xx/rules.mk index 75b35750..0a1d63e3 100644 --- a/platform/stm32f1xx/rules.mk +++ b/platform/stm32f1xx/rules.mk @@ -39,9 +39,6 @@ endif GLOBAL_DEFINES += \ MEMSIZE=$(MEMSIZE) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c \ $(LOCAL_DIR)/debug.c \ diff --git a/platform/stm32f2xx/rules.mk b/platform/stm32f2xx/rules.mk index aa529788..c11dc069 100644 --- a/platform/stm32f2xx/rules.mk +++ b/platform/stm32f2xx/rules.mk @@ -33,9 +33,6 @@ endif GLOBAL_DEFINES += \ MEMSIZE=$(MEMSIZE) -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c \ $(LOCAL_DIR)/vectab.c \ diff --git a/platform/stm32f4xx/rules.mk b/platform/stm32f4xx/rules.mk index 1c61982b..3dc67e14 100644 --- a/platform/stm32f4xx/rules.mk +++ b/platform/stm32f4xx/rules.mk @@ -30,7 +30,6 @@ GLOBAL_DEFINES += \ MEMSIZE=$(MEMSIZE) GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include \ $(LOCAL_DIR)/include/dev MODULE_SRCS += \ diff --git a/platform/stm32f7xx/rules.mk b/platform/stm32f7xx/rules.mk index 54d5490c..bc92d92b 100644 --- a/platform/stm32f7xx/rules.mk +++ b/platform/stm32f7xx/rules.mk @@ -27,9 +27,6 @@ GLOBAL_DEFINES += \ MEMSIZE=$(MEMSIZE) \ PLATFORM_SUPPORTS_PANIC_SHELL=1 -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/debug.c \ $(LOCAL_DIR)/eth.c \ diff --git a/platform/zynq/rules.mk b/platform/zynq/rules.mk index 542aa88f..230e6dfc 100644 --- a/platform/zynq/rules.mk +++ b/platform/zynq/rules.mk @@ -15,10 +15,6 @@ MODULE_DEPS := \ dev/interrupt/arm_gic \ dev/timer/arm_cortex_a9 - -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/clocks.c \ $(LOCAL_DIR)/debug.c \ diff --git a/target/adk2012/rules.mk b/target/adk2012/rules.mk index 4c7c2a72..634dd847 100644 --- a/target/adk2012/rules.mk +++ b/target/adk2012/rules.mk @@ -5,8 +5,6 @@ MODULE := $(LOCAL_DIR) SAM_CHIP := sam3x8h PLATFORM := sam3 -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c diff --git a/target/lpcexpresso1549/rules.mk b/target/lpcexpresso1549/rules.mk index 82c06e83..1dc5128d 100644 --- a/target/lpcexpresso1549/rules.mk +++ b/target/lpcexpresso1549/rules.mk @@ -8,8 +8,6 @@ LPC_CHIP := LPC1549 GLOBAL_DEFINES += \ TARGET_HAS_DEBUG_LED=1 -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c \ diff --git a/target/lpclink2/rules.mk b/target/lpclink2/rules.mk index 942ff75c..30722349 100644 --- a/target/lpclink2/rules.mk +++ b/target/lpclink2/rules.mk @@ -9,9 +9,6 @@ GLOBAL_DEFINES += \ TARGET_DEBUG_UART=3 \ TARGET_DEBUG_BAUDRATE=3000000 -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c diff --git a/target/lpcxpresso4337/rules.mk b/target/lpcxpresso4337/rules.mk index d5caa059..1e77f4ab 100644 --- a/target/lpcxpresso4337/rules.mk +++ b/target/lpcxpresso4337/rules.mk @@ -9,9 +9,6 @@ GLOBAL_DEFINES += \ TARGET_DEBUG_UART=1 \ TARGET_DEBUG_BAUDRATE=3000000 -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c diff --git a/target/sam3x-ek/rules.mk b/target/sam3x-ek/rules.mk index 28cfa611..d57459ab 100644 --- a/target/sam3x-ek/rules.mk +++ b/target/sam3x-ek/rules.mk @@ -5,8 +5,6 @@ MODULE := $(LOCAL_DIR) SAM_CHIP := sam3x8h PLATFORM := sam3 -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c diff --git a/target/stellaris-launchpad/rules.mk b/target/stellaris-launchpad/rules.mk index d7968e5e..3d24fa64 100644 --- a/target/stellaris-launchpad/rules.mk +++ b/target/stellaris-launchpad/rules.mk @@ -8,8 +8,6 @@ PLATFORM := stellaris GLOBAL_DEFINES += \ TARGET_HAS_DEBUG_LED=1 -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c \ $(LOCAL_DIR)/usb.c \ diff --git a/target/stm32-h103/rules.mk b/target/stm32-h103/rules.mk index 6893c34c..2baf4cd6 100644 --- a/target/stm32-h103/rules.mk +++ b/target/stm32-h103/rules.mk @@ -10,8 +10,6 @@ GLOBAL_DEFINES += \ ENABLE_UART1=1 \ TARGET_HAS_DEBUG_LED=1 -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c diff --git a/target/stm32-p107/rules.mk b/target/stm32-p107/rules.mk index 17091d8a..a14fc062 100644 --- a/target/stm32-p107/rules.mk +++ b/target/stm32-p107/rules.mk @@ -10,8 +10,6 @@ GLOBAL_DEFINES += \ ENABLE_UART3=1 \ TARGET_HAS_DEBUG_LED=1 -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c diff --git a/target/stm32-p407/rules.mk b/target/stm32-p407/rules.mk index 458257fd..e04ed2e4 100644 --- a/target/stm32-p407/rules.mk +++ b/target/stm32-p407/rules.mk @@ -10,8 +10,6 @@ GLOBAL_DEFINES += \ ENABLE_UART3=1 \ TARGET_HAS_DEBUG_LED=1 -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c diff --git a/target/stm3220g/rules.mk b/target/stm3220g/rules.mk index 5a61c657..281898ec 100644 --- a/target/stm3220g/rules.mk +++ b/target/stm3220g/rules.mk @@ -10,8 +10,6 @@ GLOBAL_DEFINES += \ ENABLE_UART3=1 \ TARGET_HAS_DEBUG_LED=1 -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c diff --git a/target/stm32746g-eval2/rules.mk b/target/stm32746g-eval2/rules.mk index 7e5ebdd4..0c67521b 100644 --- a/target/stm32746g-eval2/rules.mk +++ b/target/stm32746g-eval2/rules.mk @@ -36,8 +36,6 @@ GLOBAL_DEFINES += \ PLL_N_VALUE=336 \ PLL_P_VALUE=2 -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c \ $(LOCAL_DIR)/lcd.c \ diff --git a/target/stm32f4-discovery/rules.mk b/target/stm32f4-discovery/rules.mk index bbe497a9..5168e0d8 100644 --- a/target/stm32f4-discovery/rules.mk +++ b/target/stm32f4-discovery/rules.mk @@ -14,8 +14,6 @@ GLOBAL_DEFINES += \ PLL_N_VALUE=336 \ PLL_P_VALUE=2 -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c diff --git a/target/stm32f746g-disco/rules.mk b/target/stm32f746g-disco/rules.mk index 074b6974..ec2adf16 100644 --- a/target/stm32f746g-disco/rules.mk +++ b/target/stm32f746g-disco/rules.mk @@ -22,8 +22,6 @@ GLOBAL_DEFINES += \ PKTBUF_POOL_SIZE=16 -GLOBAL_INCLUDES += $(LOCAL_DIR)/include - MODULE_SRCS += \ $(LOCAL_DIR)/init.c \ $(LOCAL_DIR)/lcd.c diff --git a/target/uzed/rules.mk b/target/uzed/rules.mk index dde3b91a..a5bb54d6 100644 --- a/target/uzed/rules.mk +++ b/target/uzed/rules.mk @@ -9,9 +9,6 @@ ZYNQ_USE_SRAM ?= 1 ZYNQ_SDRAM_SIZE := 0x10000000 -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - GLOBAL_DEFINES += \ EXTERNAL_CLOCK_FREQ=33333333 \ TARGET_HAS_DEBUG_LED=1 \ diff --git a/target/zybo/rules.mk b/target/zybo/rules.mk index 955c8945..2df01d33 100644 --- a/target/zybo/rules.mk +++ b/target/zybo/rules.mk @@ -10,9 +10,6 @@ ZYNQ_USE_SRAM ?= 1 # we have sdram ZYNQ_SDRAM_SIZE := 0x20000000 -GLOBAL_INCLUDES += \ - $(LOCAL_DIR)/include - GLOBAL_DEFINES += \ EXTERNAL_CLOCK_FREQ=50000000 \ TARGET_HAS_DEBUG_LED=1 |