diff --git a/app/aboot/rules.mk b/app/aboot/rules.mk
index e1332578..320b4e17 100644
--- a/app/aboot/rules.mk
+++ b/app/aboot/rules.mk
@@ -1,6 +1,9 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/aboot.o \
-	$(LOCAL_DIR)/fastboot.o
+MODULE := $(LOCAL_DIR)
 
+MODULE_SRCS += \
+	$(LOCAL_DIR)/aboot.c \
+	$(LOCAL_DIR)/fastboot.c
+
+include make/module.mk
diff --git a/app/pcitests/rules.mk b/app/pcitests/rules.mk
index a72aa490..c1e19a14 100644
--- a/app/pcitests/rules.mk
+++ b/app/pcitests/rules.mk
@@ -1,6 +1,10 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 #INCLUDES += -I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/pci_tests.o 
+MODULE_SRCS += \
+	$(LOCAL_DIR)/pci_tests.c 
+
+include make/module.mk
diff --git a/app/rules.mk b/app/rules.mk
index 74abd568..7de33dd5 100644
--- a/app/rules.mk
+++ b/app/rules.mk
@@ -1,5 +1,8 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/app.o
+MODULE := $(LOCAL_DIR)
 
+MODULE_SRCS += \
+	$(LOCAL_DIR)/app.c
+
+include make/module.mk
diff --git a/app/shell/rules.mk b/app/shell/rules.mk
index 5b7c919e..5ae267fd 100644
--- a/app/shell/rules.mk
+++ b/app/shell/rules.mk
@@ -1,7 +1,11 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-MODULES += \
+MODULE := $(LOCAL_DIR)
+
+MODULE_DEPS += \
 	lib/console
 
-OBJS += \
-	$(LOCAL_DIR)/shell.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/shell.c
+
+include make/module.mk
diff --git a/app/stringtests/rules.mk b/app/stringtests/rules.mk
index 853a4fa2..c14eb9ca 100644
--- a/app/stringtests/rules.mk
+++ b/app/stringtests/rules.mk
@@ -1,6 +1,10 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/string_tests.o \
-	$(LOCAL_DIR)/mymemcpy.o \
-	$(LOCAL_DIR)/mymemset.o
+MODULE := $(LOCAL_DIR)
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/string_tests.c \
+	$(LOCAL_DIR)/mymemcpy.S \
+	$(LOCAL_DIR)/mymemset.S
+
+include make/module.mk
diff --git a/app/tests/rules.mk b/app/tests/rules.mk
index 8f78eeda..d6198036 100644
--- a/app/tests/rules.mk
+++ b/app/tests/rules.mk
@@ -1,8 +1,12 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 INCLUDES += -I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/tests.o \
-	$(LOCAL_DIR)/thread_tests.o \
-	$(LOCAL_DIR)/printf_tests.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/tests.c \
+	$(LOCAL_DIR)/thread_tests.c \
+	$(LOCAL_DIR)/printf_tests.c
+
+include make/module.mk
diff --git a/arch/arm/rules.mk b/arch/arm/rules.mk
index 7f4d55a5..93952389 100644
--- a/arch/arm/rules.mk
+++ b/arch/arm/rules.mk
@@ -1,5 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 # can override this in local.mk
 ENABLE_THUMB?=true
 
@@ -18,7 +20,7 @@ DEFINES += \
 	ARM_ISA_ARMv7M=1 \
 	ARM_WITH_THUMB=1 \
 	ARM_WITH_THUMB2=1
-CFLAGS += -mcpu=$(ARM_CPU)
+GLOBAL_COMPILEFLAGS += -mcpu=$(ARM_CPU)
 HANDLED_CORE := true
 ENABLE_THUMB := true
 ONLY_THUMB := true
@@ -36,7 +38,7 @@ DEFINES += \
 	ARM_WITH_THUMB2=1 \
 	ARM_WITH_CACHE=1 \
 	ARM_WITH_L2=1
-CFLAGS += -mcpu=$(ARM_CPU)
+GLOBAL_COMPILEFLAGS += -mcpu=$(ARM_CPU)
 HANDLED_CORE := true
 #CFLAGS += -mfpu=neon -mfloat-abi=softfp
 endif
@@ -48,7 +50,7 @@ DEFINES += \
 	ARM_WITH_THUMB=1 \
 	ARM_WITH_CACHE=1 \
 	ARM_CPU_ARM1136=1
-CFLAGS += -mcpu=$(ARM_CPU)
+GLOBAL_COMPILEFLAGS += -mcpu=$(ARM_CPU)
 HANDLED_CORE := true
 endif
 ifeq ($(ARM_CPU),arm1176jzf-s)
@@ -60,7 +62,7 @@ DEFINES += \
 	ARM_WITH_THUMB=1 \
 	ARM_WITH_CACHE=1 \
 	ARM_CPU_ARM1136=1
-CFLAGS += -mcpu=$(ARM_CPU)
+GLOBAL_COMPILEFLAGS += -mcpu=$(ARM_CPU)
 HANDLED_CORE := true
 endif
 ifeq ($(ARM_CPU),arm926ej-s)
@@ -72,7 +74,7 @@ DEFINES += \
 	ARM_WITH_CACHE=1 \
 	ARM_CPU_ARM9=1 \
 	ARM_CPU_ARM926=1
-CFLAGS += -mcpu=$(ARM_CPU)
+GLOBAL_COMPILEFLAGS += -mcpu=$(ARM_CPU)
 HANDLED_CORE := true
 endif
 ifeq ($(ARM_CPU),arm7tdmi)
@@ -80,7 +82,7 @@ DEFINES += \
 	ARM_ISA_ARMv4=1 \
 	ARM_WITH_THUMB=1 \
 	ARM_CPU_ARM7=1
-CFLAGS += -mcpu=$(ARM_CPU)
+GLOBAL_COMPILEFLAGS += -mcpu=$(ARM_CPU)
 HANDLED_CORE := true
 endif
 
@@ -100,34 +102,34 @@ INCLUDES += \
 	-I$(LOCAL_DIR)/include \
 	-I$(LOCAL_DIR)/$(SUBARCH)/include
 
-OBJS += \
-
 ifeq ($(SUBARCH),arm)
-OBJS += \
-	$(LOCAL_DIR)/arm/start.o \
-	$(LOCAL_DIR)/arm/arch.Ao \
-	$(LOCAL_DIR)/arm/asm.o \
-	$(LOCAL_DIR)/arm/cache-ops.o \
-	$(LOCAL_DIR)/arm/cache.o \
-	$(LOCAL_DIR)/arm/ops.o \
-	$(LOCAL_DIR)/arm/exceptions.o \
-	$(LOCAL_DIR)/arm/faults.o \
-	$(LOCAL_DIR)/arm/mmu.o \
-	$(LOCAL_DIR)/arm/thread.o \
-	$(LOCAL_DIR)/arm/dcc.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/arm/start.S \
+	$(LOCAL_DIR)/arm/asm.S \
+	$(LOCAL_DIR)/arm/cache-ops.S \
+	$(LOCAL_DIR)/arm/cache.c \
+	$(LOCAL_DIR)/arm/ops.S \
+	$(LOCAL_DIR)/arm/exceptions.S \
+	$(LOCAL_DIR)/arm/faults.c \
+	$(LOCAL_DIR)/arm/mmu.c \
+	$(LOCAL_DIR)/arm/thread.c \
+	$(LOCAL_DIR)/arm/dcc.S
+
+MODULE_ARM_OVERRIDE_SRCS := \
+	$(LOCAL_DIR)/arm/arch.c
 
 DEFINES += \
 	ARCH_DEFAULT_STACK_SIZE=4096
 endif
 ifeq ($(SUBARCH),arm-m)
-OBJS += \
-	$(LOCAL_DIR)/arm-m/arch.o \
-	$(LOCAL_DIR)/arm-m/vectab.o \
-	$(LOCAL_DIR)/arm-m/start.o \
-	$(LOCAL_DIR)/arm-m/exceptions.o \
-	$(LOCAL_DIR)/arm-m/thread.o \
-	$(LOCAL_DIR)/arm-m/systick.o \
-	$(LOCAL_DIR)/arm-m/CMSIS/CM3/CoreSupport/core_cm3.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/arm-m/arch.c \
+	$(LOCAL_DIR)/arm-m/vectab.c \
+	$(LOCAL_DIR)/arm-m/start.c \
+	$(LOCAL_DIR)/arm-m/exceptions.c \
+	$(LOCAL_DIR)/arm-m/thread.c \
+	$(LOCAL_DIR)/arm-m/systick.c \
+	$(LOCAL_DIR)/arm-m/CMSIS/CM3/CoreSupport/core_cm3.c
 
 INCLUDES += \
 	-I$(LOCAL_DIR)/arm-m/CMSIS/CM3/CoreSupport
@@ -144,7 +146,7 @@ ifeq ($(TOOLCHAIN_PREFIX),arm-none-linux-gnueabi-)
 THUMBINTERWORK:=
 endif
 
-CFLAGS += $(THUMBINTERWORK)
+GLOBAL_COMPILEFLAGS += $(THUMBINTERWORK)
 
 # make sure some bits were set up
 MEMVARS_SET := 0
@@ -158,10 +160,10 @@ ifeq ($(MEMVARS_SET),0)
 $(error missing MEMBASE or MEMSIZE variable, please set in target rules.mk)
 endif
 
-LIBGCC := $(shell $(TOOLCHAIN_PREFIX)gcc $(CFLAGS) $(THUMBCFLAGS) -print-libgcc-file-name)
+LIBGCC := $(shell $(TOOLCHAIN_PREFIX)gcc $(GLOBAL_COMPILEFLAGS) $(THUMBCFLAGS) -print-libgcc-file-name)
 $(info LIBGCC = $(LIBGCC))
 
-$(info CFLAGS = $(CFLAGS) $(THUMBCFLAGS))
+$(info GLOBAL_COMPILEFLAGS = $(GLOBAL_COMPILEFLAGS) $(THUMBCFLAGS))
 
 # potentially generated files that should be cleaned out with clean make rule
 GENERATED += \
@@ -180,3 +182,4 @@ $(BUILDDIR)/system-twosegment.ld: $(LOCAL_DIR)/system-twosegment.ld
 	@$(MKDIR)
 	$(NOECHO)sed "s/%ROMBASE%/$(ROMBASE)/;s/%MEMBASE%/$(MEMBASE)/;s/%MEMSIZE%/$(MEMSIZE)/" < $< > $@
 
+include make/module.mk
diff --git a/arch/x86/rules.mk b/arch/x86/rules.mk
index e3d62e38..8be81771 100644
--- a/arch/x86/rules.mk
+++ b/arch/x86/rules.mk
@@ -1,19 +1,21 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 INCLUDES += \
 	-I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/crt0.o \
-	$(LOCAL_DIR)/arch.o \
-	$(LOCAL_DIR)/asm.o \
-	$(LOCAL_DIR)/cache.o \
-	$(LOCAL_DIR)/cache-ops.o \
-	$(LOCAL_DIR)/ops.o \
-	$(LOCAL_DIR)/thread.o \
-	$(LOCAL_DIR)/mmu.o \
-	$(LOCAL_DIR)/faults.o \
-	$(LOCAL_DIR)/descriptor.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/crt0.S \
+	$(LOCAL_DIR)/arch.S \
+	$(LOCAL_DIR)/asm.S \
+	$(LOCAL_DIR)/cache.c \
+	$(LOCAL_DIR)/cache-ops.S \
+	$(LOCAL_DIR)/ops.S \
+	$(LOCAL_DIR)/thread.c \
+	$(LOCAL_DIR)/mmu.c \
+	$(LOCAL_DIR)/faults.c \
+	$(LOCAL_DIR)/descriptor.c
 
 # set the default toolchain to x86 elf and set a #define
 TOOLCHAIN_PREFIX ?= i386-elf-
@@ -37,3 +39,5 @@ $(BUILDDIR)/kernel.ld: $(LOCAL_DIR)/kernel.ld
 	@echo generating $@
 	@$(MKDIR)
 	$(NOECHO)cp $< $@
+
+include make/module.mk
diff --git a/dev/fbcon/rules.mk b/dev/fbcon/rules.mk
index 85c678c3..18e10829 100644
--- a/dev/fbcon/rules.mk
+++ b/dev/fbcon/rules.mk
@@ -1,5 +1,8 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/fbcon.o
+MODULE := $(LOCAL_DIR)
 
+MODULE_SRCS += \
+	$(LOCAL_DIR)/fbcon.c
+
+include make/module.mk
diff --git a/dev/keys/rules.mk b/dev/keys/rules.mk
index 1e275277..8a30ea02 100644
--- a/dev/keys/rules.mk
+++ b/dev/keys/rules.mk
@@ -1,10 +1,14 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/keys.o
+MODULE := $(LOCAL_DIR)
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/keys.c
 
 ifeq ($(KEYS_USE_GPIO_KEYPAD),1)
-OBJS += \
-	$(LOCAL_DIR)/gpio_keypad.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/gpio_keypad.c
 endif
 
+include make/module.mk
+
diff --git a/dev/net/smc91c96/rules.mk b/dev/net/smc91c96/rules.mk
index d6751172..cb3c01ec 100644
--- a/dev/net/smc91c96/rules.mk
+++ b/dev/net/smc91c96/rules.mk
@@ -1,8 +1,11 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 INCLUDES += \
 	-I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/smc91c96.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/smc91c96.c
 
+include make/module.mk
diff --git a/dev/pmic/twl4030/rules.mk b/dev/pmic/twl4030/rules.mk
index e75e8ff6..2596a895 100644
--- a/dev/pmic/twl4030/rules.mk
+++ b/dev/pmic/twl4030/rules.mk
@@ -1,7 +1,10 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 INCLUDES += -I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/twl4030.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/twl4030.c
 
+include make/module.mk
diff --git a/dev/rules.mk b/dev/rules.mk
index cbc5ba74..a254e3e1 100644
--- a/dev/rules.mk
+++ b/dev/rules.mk
@@ -1,5 +1,8 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/dev.o
+MODULE := $(LOCAL_DIR)
 
+MODULE_SRCS += \
+	$(LOCAL_DIR)/dev.c
+
+include make/module.mk
diff --git a/dev/usb/rules.mk b/dev/usb/rules.mk
index 649f0c41..a66753dc 100644
--- a/dev/usb/rules.mk
+++ b/dev/usb/rules.mk
@@ -1,5 +1,8 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/usb.o
+MODULE := $(LOCAL_DIR)
 
+MODULE_SRCS += \
+	$(LOCAL_DIR)/usb.c
+
+include make/module.mk
diff --git a/kernel/rules.mk b/kernel/rules.mk
index 3f0a0e1f..93db014c 100644
--- a/kernel/rules.mk
+++ b/kernel/rules.mk
@@ -7,13 +7,13 @@ MODULE_DEPS := \
 	lib/debug \
 	lib/heap
 
-MODULE_OBJS := \
-	debug.o \
-	dpc.o \
-	event.o \
-	main.o \
-	mutex.o \
-	thread.o \
-	timer.o
+MODULE_SRCS := \
+	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/dpc.c \
+	$(LOCAL_DIR)/event.c \
+	$(LOCAL_DIR)/main.c \
+	$(LOCAL_DIR)/mutex.c \
+	$(LOCAL_DIR)/thread.c \
+	$(LOCAL_DIR)/timer.c
 
 include make/module.mk
diff --git a/lib/bcache/rules.mk b/lib/bcache/rules.mk
index 9927f1bf..e41fac92 100644
--- a/lib/bcache/rules.mk
+++ b/lib/bcache/rules.mk
@@ -1,6 +1,10 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-MODULES += lib/bio
+MODULE := $(LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/bcache.o
+MODULE_DEPS += lib/bio
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/bcache.c
+
+include make/module.mk
diff --git a/lib/bio/rules.mk b/lib/bio/rules.mk
index aaeb0261..aafffeeb 100644
--- a/lib/bio/rules.mk
+++ b/lib/bio/rules.mk
@@ -1,9 +1,11 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-MODULES +=
+MODULE := $(LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/bio.o \
-	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/mem.o \
-	$(LOCAL_DIR)/subdev.o 
+MODULE_SRCS += \
+	$(LOCAL_DIR)/bio.c \
+	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/mem.c \
+	$(LOCAL_DIR)/subdev.c 
+
+include make/module.mk
diff --git a/lib/cbuf/rules.mk b/lib/cbuf/rules.mk
index 2c57d481..c04ea5e4 100644
--- a/lib/cbuf/rules.mk
+++ b/lib/cbuf/rules.mk
@@ -1,4 +1,8 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/cbuf.o
+MODULE := $(LOCAL_DIR)
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/cbuf.c
+
+include make/module.mk
diff --git a/lib/console/rules.mk b/lib/console/rules.mk
index ac3487df..3b8f7339 100644
--- a/lib/console/rules.mk
+++ b/lib/console/rules.mk
@@ -1,6 +1,10 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 INCLUDES += -I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/console.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/console.c
+
+include make/module.mk
diff --git a/lib/debug/rules.mk b/lib/debug/rules.mk
index 5cc8926f..8f67f00e 100644
--- a/lib/debug/rules.mk
+++ b/lib/debug/rules.mk
@@ -1,4 +1,8 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/debug.o
+MODULE := $(LOCAL_DIR)
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/debug.c
+
+include make/module.mk
diff --git a/lib/debugcommands/rules.mk b/lib/debugcommands/rules.mk
index d4bac6e6..1cbd59c1 100644
--- a/lib/debugcommands/rules.mk
+++ b/lib/debugcommands/rules.mk
@@ -1,8 +1,12 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-MODULES += \
+MODULE := $(LOCAL_DIR)
+
+MODULE_DEPS += \
 	lib/debug \
 	lib/console
 
-OBJS += \
-	$(LOCAL_DIR)/debugcommands.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/debugcommands.c
+
+include make/module.mk
diff --git a/lib/font/rules.mk b/lib/font/rules.mk
index 71678d12..237d2976 100644
--- a/lib/font/rules.mk
+++ b/lib/font/rules.mk
@@ -1,6 +1,10 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-MODULES += lib/gfx
+MODULE := $(LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/font.o
+MODULE_DEPS += lib/gfx
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/font.c
+
+include make/module.mk
diff --git a/lib/fs/ext2/rules.mk b/lib/fs/ext2/rules.mk
index a4bb3834..2167847f 100644
--- a/lib/fs/ext2/rules.mk
+++ b/lib/fs/ext2/rules.mk
@@ -1,12 +1,16 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-MODULES += \
+MODULE := $(LOCAL_DIR)
+
+MODULE_DEPS += \
 	lib/fs \
 	lib/bcache \
 	lib/bio
 
-OBJS += \
-	$(LOCAL_DIR)/ext2.o \
-	$(LOCAL_DIR)/dir.o \
-	$(LOCAL_DIR)/io.o \
-	$(LOCAL_DIR)/file.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/ext2.c \
+	$(LOCAL_DIR)/dir.c \
+	$(LOCAL_DIR)/io.c \
+	$(LOCAL_DIR)/file.c
+
+include make/module.mk
diff --git a/lib/fs/rules.mk b/lib/fs/rules.mk
index c1aa7f4e..d424be71 100644
--- a/lib/fs/rules.mk
+++ b/lib/fs/rules.mk
@@ -1,9 +1,9 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-MODULES += \
+MODULE := $(LOCAL_DIR)
 
-#	lib/fs/ext2
+MODULE_SRCS += \
+	$(LOCAL_DIR)/fs.c \
+	$(LOCAL_DIR)/debug.c
 
-OBJS += \
-	$(LOCAL_DIR)/fs.o \
-	$(LOCAL_DIR)/debug.o
+include make/module.mk
diff --git a/lib/gfx/rules.mk b/lib/gfx/rules.mk
index 9527360c..f80afb8c 100644
--- a/lib/gfx/rules.mk
+++ b/lib/gfx/rules.mk
@@ -1,4 +1,8 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/gfx.o
+MODULE := $(LOCAL_DIR)
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/gfx.c
+
+include make/module.mk
diff --git a/lib/gfxconsole/rules.mk b/lib/gfxconsole/rules.mk
index a61382b2..53e8f43d 100644
--- a/lib/gfxconsole/rules.mk
+++ b/lib/gfxconsole/rules.mk
@@ -1,7 +1,12 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-MODULES += lib/gfx \
-			lib/font
+MODULE := $(LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/gfxconsole.o
+MODULE_DEPS += \
+	lib/gfx \
+	lib/font
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/gfxconsole.c
+
+include make/module.mk
diff --git a/lib/heap/rules.mk b/lib/heap/rules.mk
index c9307ab4..5c9d2d49 100644
--- a/lib/heap/rules.mk
+++ b/lib/heap/rules.mk
@@ -1,4 +1,8 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/heap.o
+MODULE := $(LOCAL_DIR)
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/heap.c
+
+include make/module.mk
diff --git a/lib/libc/rules.mk b/lib/libc/rules.mk
index e250cfe6..bd46216a 100644
--- a/lib/libc/rules.mk
+++ b/lib/libc/rules.mk
@@ -1,20 +1,23 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/atoi.o \
-	$(LOCAL_DIR)/ctype.o \
-	$(LOCAL_DIR)/printf.o \
-	$(LOCAL_DIR)/malloc.o \
-	$(LOCAL_DIR)/rand.o \
-	$(LOCAL_DIR)/eabi.o
+MODULE := $(LOCAL_DIR)
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/atoi.c \
+	$(LOCAL_DIR)/ctype.c \
+	$(LOCAL_DIR)/printf.c \
+	$(LOCAL_DIR)/malloc.c \
+	$(LOCAL_DIR)/rand.c \
+	$(LOCAL_DIR)/eabi.c
 
 
 include $(LOCAL_DIR)/string/rules.mk
 
 ifeq ($(WITH_CPP_SUPPORT),true)
-OBJS += \
-	$(LOCAL_DIR)/new.o \
-	$(LOCAL_DIR)/atexit.o \
-	$(LOCAL_DIR)/pure_virtual.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/new.c \
+	$(LOCAL_DIR)/atexit.c \
+	$(LOCAL_DIR)/pure_virtual.cpp
 endif
 
+include make/module.mk
diff --git a/lib/libc/string/arch/arm/rules.mk b/lib/libc/string/arch/arm/rules.mk
index 0fd7cc96..0494205e 100644
--- a/lib/libc/string/arch/arm/rules.mk
+++ b/lib/libc/string/arch/arm/rules.mk
@@ -4,9 +4,9 @@ ifeq ($(SUBARCH),arm)
 
 ASM_STRING_OPS := bcopy bzero memcpy memmove memset
 
-OBJS += \
-	$(LOCAL_DIR)/memcpy.o \
-	$(LOCAL_DIR)/memset.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/memcpy.S \
+	$(LOCAL_DIR)/memset.S
 
 # filter out the C implementation
 C_STRING_OPS := $(filter-out $(ASM_STRING_OPS),$(C_STRING_OPS))
diff --git a/lib/libc/string/arch/x86/rules.mk b/lib/libc/string/arch/x86/rules.mk
index b3a5aa98..3dc080bb 100644
--- a/lib/libc/string/arch/x86/rules.mk
+++ b/lib/libc/string/arch/x86/rules.mk
@@ -2,9 +2,9 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
 
 ASM_STRING_OPS := #bcopy bzero memcpy memmove memset
 
-OBJS += \
-	#$(LOCAL_DIR)/memcpy.o \
-	#$(LOCAL_DIR)/memset.o
+MODULE_SRCS += \
+	#$(LOCAL_DIR)/memcpy.S \
+	#$(LOCAL_DIR)/memset.S
 
 # filter out the C implementation
 C_STRING_OPS := $(filter-out $(ASM_STRING_OPS),$(C_STRING_OPS))
diff --git a/lib/libc/string/rules.mk b/lib/libc/string/rules.mk
index 1d038e61..4e28e3e2 100644
--- a/lib/libc/string/rules.mk
+++ b/lib/libc/string/rules.mk
@@ -37,6 +37,6 @@ LIBC_STRING_C_DIR := $(LOCAL_DIR)
 # the makefile may filter out implemented versions from the C_STRING_OPS variable
 include $(LOCAL_DIR)/arch/$(ARCH)/rules.mk
 
-OBJS += \
-	$(addprefix $(LIBC_STRING_C_DIR)/,$(addsuffix .o,$(C_STRING_OPS)))
+MODULE_SRCS += \
+	$(addprefix $(LIBC_STRING_C_DIR)/,$(addsuffix .c,$(C_STRING_OPS)))
 
diff --git a/lib/partition/rules.mk b/lib/partition/rules.mk
index f80eb44c..87fe9486 100644
--- a/lib/partition/rules.mk
+++ b/lib/partition/rules.mk
@@ -1,6 +1,10 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-MODULES += lib/bio
+MODULE := $(LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/partition.o
+MODULE_DEPS += lib/bio
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/partition.c
+
+include make/module.mk
diff --git a/lib/ptable/rules.mk b/lib/ptable/rules.mk
index d3ff3495..79e79c40 100644
--- a/lib/ptable/rules.mk
+++ b/lib/ptable/rules.mk
@@ -1,4 +1,8 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/ptable.o
+MODULE := $(LOCAL_DIR)
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/ptable.c
+
+include make/module.mk
diff --git a/lib/text/rules.mk b/lib/text/rules.mk
index 9555d001..4babc044 100644
--- a/lib/text/rules.mk
+++ b/lib/text/rules.mk
@@ -1,6 +1,10 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-MODULES += lib/font
+MODULE := $(LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/text.o
+MODULE_DEPS += lib/font
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/text.c
+
+include make/module.mk
diff --git a/lib/tga/rules.mk b/lib/tga/rules.mk
index 8538f471..3c63f5fd 100644
--- a/lib/tga/rules.mk
+++ b/lib/tga/rules.mk
@@ -1,4 +1,8 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/tga.o
+MODULE := $(LOCAL_DIR)
+
+MODULE_SRCS += \
+	$(LOCAL_DIR)/tga.c
+
+include make/module.mk
diff --git a/platform/armemu/rules.mk b/platform/armemu/rules.mk
index 99109605..c6a81fc6 100644
--- a/platform/armemu/rules.mk
+++ b/platform/armemu/rules.mk
@@ -1,5 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 ARCH := arm
 ARM_CPU := arm926ej-s
 CPU := generic
@@ -10,28 +12,27 @@ ENABLE_THUMB := false
 INCLUDES += \
 	-I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/interrupts.o \
-	$(LOCAL_DIR)/platform.o \
-	$(LOCAL_DIR)/timer.o \
-	$(LOCAL_DIR)/blkdev.o \
-	$(LOCAL_DIR)/display.o \
+MODULE_SRCS += \
+	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/interrupts.c \
+	$(LOCAL_DIR)/platform.c \
+	$(LOCAL_DIR)/timer.c \
+	$(LOCAL_DIR)/blkdev.c \
+	$(LOCAL_DIR)/display.c \
 
-
-#	$(LOCAL_DIR)/console.o \
-	$(LOCAL_DIR)/net.o \
+#	$(LOCAL_DIR)/console.c \
+	$(LOCAL_DIR)/net.c \
 
 DEFINES += \
 	WITH_DEV_DISPLAY=1
 
-MODULES += \
+MODULE_DEPS += \
 	lib/gfx
 
-
 MEMBASE := 0x0
 MEMSIZE := 0x400000	# 4MB
 
 LINKER_SCRIPT += \
 	$(BUILDDIR)/system-onesegment.ld
 
+include make/module.mk
diff --git a/platform/at91sam7/rules.mk b/platform/at91sam7/rules.mk
index 9186ef80..9cf35389 100644
--- a/platform/at91sam7/rules.mk
+++ b/platform/at91sam7/rules.mk
@@ -41,6 +41,8 @@ endif
 
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 ARCH := arm
 ARM_CPU := arm7tdmi
 
@@ -49,16 +51,16 @@ DEFINES += AT91_MCK_MHZ=48000000
 INCLUDES += \
 	-I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/interrupts.o \
-	$(LOCAL_DIR)/platform_early.o \
-	$(LOCAL_DIR)/platform.o \
-	$(LOCAL_DIR)/timer.o \
-	$(LOCAL_DIR)/init_clock.o \
-	$(LOCAL_DIR)/init_clock_48mhz.o \
-	$(LOCAL_DIR)/mux.o \
-	$(LOCAL_DIR)/emac_dev.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/interrupts.c \
+	$(LOCAL_DIR)/platform_early.S \
+	$(LOCAL_DIR)/platform.c \
+	$(LOCAL_DIR)/timer.c \
+	$(LOCAL_DIR)/init_clock.S \
+	$(LOCAL_DIR)/init_clock_48mhz.S \
+	$(LOCAL_DIR)/mux.c \
+	$(LOCAL_DIR)/emac_dev.c
 
 # use a two segment memory layout, where all of the read-only sections 
 # of the binary reside in rom, and the read/write are in memory. The 
@@ -68,3 +70,4 @@ OBJS += \
 LINKER_SCRIPT += \
 	$(BUILDDIR)/system-twosegment.ld
 
+include make/module.mk
diff --git a/platform/integrator/rules.mk b/platform/integrator/rules.mk
index a1891536..f6ef0766 100644
--- a/platform/integrator/rules.mk
+++ b/platform/integrator/rules.mk
@@ -1,5 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 ARCH := arm
 ARM_CPU := arm926ej-s
 CPU := generic
@@ -7,16 +9,16 @@ CPU := generic
 INCLUDES += \
 	-I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/platform.o \
-	$(LOCAL_DIR)/interrupts.o \
-	$(LOCAL_DIR)/timer.o \
+MODULE_SRCS += \
+	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/platform.c \
+	$(LOCAL_DIR)/interrupts.c \
+	$(LOCAL_DIR)/timer.c \
 
-#	$(LOCAL_DIR)/net.o \
+#	$(LOCAL_DIR)/net.c \
 
 
-#	$(LOCAL_DIR)/console.o \
+#	$(LOCAL_DIR)/console.c \
 
 MEMBASE ?= 0x0
 MEMSIZE ?= 0x08000000	# 128MB
@@ -24,3 +26,4 @@ MEMSIZE ?= 0x08000000	# 128MB
 LINKER_SCRIPT += \
 	$(BUILDDIR)/system-onesegment.ld
 
+include make/module.mk
diff --git a/platform/msm7k/rules.mk b/platform/msm7k/rules.mk
index 0523c4a7..784e6f3c 100644
--- a/platform/msm7k/rules.mk
+++ b/platform/msm7k/rules.mk
@@ -1,20 +1,23 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 ARCH := arm
 ARM_CPU := arm1136j-s
 CPU := generic
 
 INCLUDES += -I$(LOCAL_DIR)/include
 
-MODULES += dev/fbcon
+MODULE_DEPS := dev/fbcon
 
-OBJS += \
-	$(LOCAL_DIR)/platform.o \
-	$(LOCAL_DIR)/interrupts.o \
-	$(LOCAL_DIR)/mddi.o \
-	$(LOCAL_DIR)/gpio.o 
+MODULE_SRCS := \
+	$(LOCAL_DIR)/platform.c \
+	$(LOCAL_DIR)/interrupts.c \
+	$(LOCAL_DIR)/mddi.c \
+	$(LOCAL_DIR)/gpio.c 
 
-LINKER_SCRIPT += $(BUILDDIR)/system-onesegment.ld
+LINKER_SCRIPT := $(BUILDDIR)/system-onesegment.ld
 
 include platform/msm_shared/rules.mk
 
+include make/module.mk
diff --git a/platform/msm_shared/rules.mk b/platform/msm_shared/rules.mk
index c0de0b4b..75842dfe 100644
--- a/platform/msm_shared/rules.mk
+++ b/platform/msm_shared/rules.mk
@@ -1,12 +1,12 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/uart.o \
-	$(LOCAL_DIR)/timer.o \
-	$(LOCAL_DIR)/proc_comm.o \
-	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/smem.o \
-	$(LOCAL_DIR)/smem_ptable.o \
-	$(LOCAL_DIR)/hsusb.o \
-	$(LOCAL_DIR)/nand.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/uart.c \
+	$(LOCAL_DIR)/timer.c \
+	$(LOCAL_DIR)/proc_comm.c \
+	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/smem.c \
+	$(LOCAL_DIR)/smem_ptable.c \
+	$(LOCAL_DIR)/hsusb.c \
+	$(LOCAL_DIR)/nand.c
 
diff --git a/platform/omap3/rules.mk b/platform/omap3/rules.mk
index 8d80d4ba..1e6eef37 100644
--- a/platform/omap3/rules.mk
+++ b/platform/omap3/rules.mk
@@ -1,5 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 ARCH := arm
 ARM_CPU := cortex-a8
 CPU := generic
@@ -11,21 +13,21 @@ DEFINES += \
 	WITH_DEV_USBC=1 \
 	WITH_DEV_UART=1
 
-MODULES += \
+MODULE_DEPS += \
 	dev/usb
 
 INCLUDES += \
 	-I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/cpu_early_init.Ao \
-	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/i2c.o \
-	$(LOCAL_DIR)/interrupts.o \
-	$(LOCAL_DIR)/platform.o \
-	$(LOCAL_DIR)/timer.o \
-	$(LOCAL_DIR)/uart.o \
-	$(LOCAL_DIR)/usbc.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/cpu_early_init.S \
+	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/i2c.c \
+	$(LOCAL_DIR)/interrupts.c \
+	$(LOCAL_DIR)/platform.c \
+	$(LOCAL_DIR)/timer.c \
+	$(LOCAL_DIR)/uart.c \
+	$(LOCAL_DIR)/usbc.c
 
 MEMBASE := 0x80000000
 
@@ -35,3 +37,4 @@ DEFINES += MEMBASE=$(MEMBASE) \
 LINKER_SCRIPT += \
 	$(BUILDDIR)/system-onesegment.ld
 
+include make/module.mk
diff --git a/platform/omap5912/rules.mk b/platform/omap5912/rules.mk
index 2ab8cbeb..52e1276e 100644
--- a/platform/omap5912/rules.mk
+++ b/platform/omap5912/rules.mk
@@ -1,23 +1,25 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 ARCH := arm
 ARM_CPU := arm926ej-s
 CPU := generic
 
-MODULES += \
+MODULE_DEPS += \
 	lib/cbuf
 
 INCLUDES += \
 	-I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/interrupts.o \
-	$(LOCAL_DIR)/platform.o \
-	$(LOCAL_DIR)/timer.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/interrupts.c \
+	$(LOCAL_DIR)/platform.c \
+	$(LOCAL_DIR)/timer.c
 
 
-#	$(LOCAL_DIR)/console.o \
+#	$(LOCAL_DIR)/console.c \
 
 MEMBASE := 0x10000000
 #MEMSIZE := 0x02000000	# 32MB
@@ -25,3 +27,4 @@ MEMBASE := 0x10000000
 LINKER_SCRIPT += \
 	$(BUILDDIR)/system-onesegment.ld
 
+include make/module.mk
diff --git a/platform/pc/rules.mk b/platform/pc/rules.mk
index e10fb1b0..7f3a0cff 100644
--- a/platform/pc/rules.mk
+++ b/platform/pc/rules.mk
@@ -1,23 +1,27 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 ARCH := x86
 CPU := generic
 
-MODULES += \
+MODULE_DEPS += \
 	lib/cbuf
 
 INCLUDES += \
 	-I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/interrupts.o \
-	$(LOCAL_DIR)/platform.o \
-	$(LOCAL_DIR)/timer.o \
-	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/console.o \
-	$(LOCAL_DIR)/keyboard.o \
-	$(LOCAL_DIR)/pci.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/interrupts.c \
+	$(LOCAL_DIR)/platform.c \
+	$(LOCAL_DIR)/timer.c \
+	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/console.c \
+	$(LOCAL_DIR)/keyboard.c \
+	$(LOCAL_DIR)/pci.c
 
 LINKER_SCRIPT += \
 	$(BUILDDIR)/kernel.ld
 
+include make/module.mk
+
diff --git a/platform/qsd8k/rules.mk b/platform/qsd8k/rules.mk
index 93d80c8c..f69dda41 100644
--- a/platform/qsd8k/rules.mk
+++ b/platform/qsd8k/rules.mk
@@ -1,5 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 ARCH := arm
 ARM_CPU := cortex-a8
 #arm1136j-s
@@ -10,16 +12,18 @@ DEFINES += WITH_CPU_EARLY_INIT=1 MEMBASE=0
 INCLUDES += -I$(LOCAL_DIR)/include
 
 DEVS += fbcon
-MODULES += dev/fbcon
+MODULE_DEPS += dev/fbcon
 
-OBJS += \
-	$(LOCAL_DIR)/arch_init.o \
-	$(LOCAL_DIR)/platform.o \
-	$(LOCAL_DIR)/interrupts.o \
-	$(LOCAL_DIR)/gpio.o \
-	$(LOCAL_DIR)/lcdc.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/arch_init.S \
+	$(LOCAL_DIR)/platform.c \
+	$(LOCAL_DIR)/interrupts.c \
+	$(LOCAL_DIR)/gpio.c \
+	$(LOCAL_DIR)/lcdc.c
 
 LINKER_SCRIPT += $(BUILDDIR)/system-onesegment.ld
 
 include platform/msm_shared/rules.mk
 
+include make/module.mk
+
diff --git a/platform/rules.mk b/platform/rules.mk
index c1acc50e..4920896a 100644
--- a/platform/rules.mk
+++ b/platform/rules.mk
@@ -1,7 +1,12 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-# shared platform code
-OBJS += \
-	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/init.o
+MODULE := $(LOCAL_DIR)
+
+# shared platform code
+MODULE_SRCS += \
+	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/init.c
+
+include make/module.mk
+
 
diff --git a/platform/sam3/cmsis/sam3x/rules.mk b/platform/sam3/cmsis/sam3x/rules.mk
index dce06feb..dfa04aa6 100644
--- a/platform/sam3/cmsis/sam3x/rules.mk
+++ b/platform/sam3/cmsis/sam3x/rules.mk
@@ -3,7 +3,7 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
 INCLUDES += -I$(LOCAL_DIR)/include
 INCLUDES += -I$(LOCAL_DIR)/source/templates
 
-OBJS += \
-	$(LOCAL_DIR)/source/templates/system_sam3x.o \
-	$(LOCAL_DIR)/source/templates/exceptions.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/source/templates/system_sam3x.c \
+	$(LOCAL_DIR)/source/templates/exceptions.c
 
diff --git a/platform/sam3/drivers/rules.mk b/platform/sam3/drivers/rules.mk
index e0635ec3..99b8bf92 100644
--- a/platform/sam3/drivers/rules.mk
+++ b/platform/sam3/drivers/rules.mk
@@ -3,10 +3,10 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
 INCLUDES += \
 	-I$(LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/pio/pio.o \
-	$(LOCAL_DIR)/pmc/pmc.o \
-	$(LOCAL_DIR)/tc/tc.o \
-	$(LOCAL_DIR)/uart/uart.o \
-	$(LOCAL_DIR)/wdt/wdt.o \
+MODULE_SRCS += \
+	$(LOCAL_DIR)/pio/pio.c \
+	$(LOCAL_DIR)/pmc/pmc.c \
+	$(LOCAL_DIR)/tc/tc.c \
+	$(LOCAL_DIR)/uart/uart.c \
+	$(LOCAL_DIR)/wdt/wdt.c \
 
diff --git a/platform/sam3/rules.mk b/platform/sam3/rules.mk
index 0c8ebdf8..ddfbdd3a 100644
--- a/platform/sam3/rules.mk
+++ b/platform/sam3/rules.mk
@@ -1,5 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 # ROMBASE, MEMBASE, and MEMSIZE are required for the linker script
 ROMBASE := 0x80000
 MEMBASE := 0x20000000
@@ -22,21 +24,21 @@ endif
 INCLUDES += \
 	-I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/init.o \
-	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/vectab.o \
-	$(LOCAL_DIR)/timer.o \
+MODULE_SRCS += \
+	$(LOCAL_DIR)/init.c \
+	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/vectab.c \
+	$(LOCAL_DIR)/timer.c \
 
-#	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/interrupts.o \
-	$(LOCAL_DIR)/platform_early.o \
-	$(LOCAL_DIR)/platform.o \
-	$(LOCAL_DIR)/timer.o \
-	$(LOCAL_DIR)/init_clock.o \
-	$(LOCAL_DIR)/init_clock_48mhz.o \
-	$(LOCAL_DIR)/mux.o \
-	$(LOCAL_DIR)/emac_dev.o
+#	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/interrupts.c \
+	$(LOCAL_DIR)/platform_early.c \
+	$(LOCAL_DIR)/platform.c \
+	$(LOCAL_DIR)/timer.c \
+	$(LOCAL_DIR)/init_clock.c \
+	$(LOCAL_DIR)/init_clock_48mhz.c \
+	$(LOCAL_DIR)/mux.c \
+	$(LOCAL_DIR)/emac_dev.c
 
 # use a two segment memory layout, where all of the read-only sections 
 # of the binary reside in rom, and the read/write are in memory. The 
@@ -46,7 +48,9 @@ OBJS += \
 LINKER_SCRIPT += \
 	$(BUILDDIR)/system-twosegment.ld
 
-MODULES += \
+MODULE_DEPS += \
 	lib/cbuf
 
 include $(LOCAL_DIR)/cmsis/sam3x/rules.mk $(LOCAL_DIR)/drivers/rules.mk
+
+include make/module.mk
diff --git a/platform/stm32f1xx/STM32F10x_StdPeriph_Driver/rules.mk b/platform/stm32f1xx/STM32F10x_StdPeriph_Driver/rules.mk
index 1864739f..f2732b98 100644
--- a/platform/stm32f1xx/STM32F10x_StdPeriph_Driver/rules.mk
+++ b/platform/stm32f1xx/STM32F10x_StdPeriph_Driver/rules.mk
@@ -2,28 +2,28 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
 
 INCLUDES += -I$(LOCAL_DIR)/inc
 
-OBJS += \
-	$(LOCAL_DIR)/src/misc.o \
-	$(LOCAL_DIR)/src/stm32f10x_adc.o \
-	$(LOCAL_DIR)/src/stm32f10x_bkp.o \
-	$(LOCAL_DIR)/src/stm32f10x_can.o \
-	$(LOCAL_DIR)/src/stm32f10x_cec.o \
-	$(LOCAL_DIR)/src/stm32f10x_crc.o \
-	$(LOCAL_DIR)/src/stm32f10x_dac.o \
-	$(LOCAL_DIR)/src/stm32f10x_dbgmcu.o \
-	$(LOCAL_DIR)/src/stm32f10x_dma.o \
-	$(LOCAL_DIR)/src/stm32f10x_exti.o \
-	$(LOCAL_DIR)/src/stm32f10x_flash.o \
-	$(LOCAL_DIR)/src/stm32f10x_fsmc.o \
-	$(LOCAL_DIR)/src/stm32f10x_gpio.o \
-	$(LOCAL_DIR)/src/stm32f10x_i2c.o \
-	$(LOCAL_DIR)/src/stm32f10x_iwdg.o \
-	$(LOCAL_DIR)/src/stm32f10x_pwr.o \
-	$(LOCAL_DIR)/src/stm32f10x_rcc.o \
-	$(LOCAL_DIR)/src/stm32f10x_rtc.o \
-	$(LOCAL_DIR)/src/stm32f10x_sdio.o \
-	$(LOCAL_DIR)/src/stm32f10x_spi.o \
-	$(LOCAL_DIR)/src/stm32f10x_tim.o \
-	$(LOCAL_DIR)/src/stm32f10x_usart.o \
-	$(LOCAL_DIR)/src/stm32f10x_wwdg.o \
-	$(LOCAL_DIR)/src/system_stm32f10x.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/src/misc.c \
+	$(LOCAL_DIR)/src/stm32f10x_adc.c \
+	$(LOCAL_DIR)/src/stm32f10x_bkp.c \
+	$(LOCAL_DIR)/src/stm32f10x_can.c \
+	$(LOCAL_DIR)/src/stm32f10x_cec.c \
+	$(LOCAL_DIR)/src/stm32f10x_crc.c \
+	$(LOCAL_DIR)/src/stm32f10x_dac.c \
+	$(LOCAL_DIR)/src/stm32f10x_dbgmcu.c \
+	$(LOCAL_DIR)/src/stm32f10x_dma.c \
+	$(LOCAL_DIR)/src/stm32f10x_exti.c \
+	$(LOCAL_DIR)/src/stm32f10x_flash.c \
+	$(LOCAL_DIR)/src/stm32f10x_fsmc.c \
+	$(LOCAL_DIR)/src/stm32f10x_gpio.c \
+	$(LOCAL_DIR)/src/stm32f10x_i2c.c \
+	$(LOCAL_DIR)/src/stm32f10x_iwdg.c \
+	$(LOCAL_DIR)/src/stm32f10x_pwr.c \
+	$(LOCAL_DIR)/src/stm32f10x_rcc.c \
+	$(LOCAL_DIR)/src/stm32f10x_rtc.c \
+	$(LOCAL_DIR)/src/stm32f10x_sdio.c \
+	$(LOCAL_DIR)/src/stm32f10x_spi.c \
+	$(LOCAL_DIR)/src/stm32f10x_tim.c \
+	$(LOCAL_DIR)/src/stm32f10x_usart.c \
+	$(LOCAL_DIR)/src/stm32f10x_wwdg.c \
+	$(LOCAL_DIR)/src/system_stm32f10x.c
diff --git a/platform/stm32f1xx/rules.mk b/platform/stm32f1xx/rules.mk
index 1873710d..c2d23a7b 100644
--- a/platform/stm32f1xx/rules.mk
+++ b/platform/stm32f1xx/rules.mk
@@ -1,5 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 # ROMBASE, MEMBASE, and MEMSIZE are required for the linker script
 ROMBASE := 0x0
 MEMBASE := 0x20000000
@@ -40,23 +42,23 @@ DEFINES += \
 INCLUDES += \
 	-I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/init.o \
-	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/uart.o \
-	$(LOCAL_DIR)/timer.o \
-	$(LOCAL_DIR)/vectab.o \
-	$(LOCAL_DIR)/gpio.o \
+MODULE_SRCS += \
+	$(LOCAL_DIR)/init.c \
+	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/uart.c \
+	$(LOCAL_DIR)/timer.c \
+	$(LOCAL_DIR)/vectab.c \
+	$(LOCAL_DIR)/gpio.c \
 
-#	$(LOCAL_DIR)/debug.o \
-	$(LOCAL_DIR)/interrupts.o \
-	$(LOCAL_DIR)/platform_early.o \
-	$(LOCAL_DIR)/platform.o \
-	$(LOCAL_DIR)/timer.o \
-	$(LOCAL_DIR)/init_clock.o \
-	$(LOCAL_DIR)/init_clock_48mhz.o \
-	$(LOCAL_DIR)/mux.o \
-	$(LOCAL_DIR)/emac_dev.o
+#	$(LOCAL_DIR)/debug.c \
+	$(LOCAL_DIR)/interrupts.c \
+	$(LOCAL_DIR)/platform_early.c \
+	$(LOCAL_DIR)/platform.c \
+	$(LOCAL_DIR)/timer.c \
+	$(LOCAL_DIR)/init_clock.c \
+	$(LOCAL_DIR)/init_clock_48mhz.c \
+	$(LOCAL_DIR)/mux.c \
+	$(LOCAL_DIR)/emac_dev.c
 
 # use a two segment memory layout, where all of the read-only sections 
 # of the binary reside in rom, and the read/write are in memory. The 
@@ -66,7 +68,9 @@ OBJS += \
 LINKER_SCRIPT += \
 	$(BUILDDIR)/system-twosegment.ld
 
-MODULES += \
+MODULE_DEPS += \
 	lib/cbuf
 
 include $(LOCAL_DIR)/STM32F10x_StdPeriph_Driver/rules.mk $(LOCAL_DIR)/CMSIS/rules.mk
+
+include make/module.mk
diff --git a/target/adk2012/rules.mk b/target/adk2012/rules.mk
index 947d0165..6f955c9c 100644
--- a/target/adk2012/rules.mk
+++ b/target/adk2012/rules.mk
@@ -1,10 +1,13 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 SAM_CHIP := sam3x8h
 PLATFORM := sam3
 
 INCLUDES += -I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/init.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/init.c
 
+include make/module.mk
diff --git a/target/osk5912/rules.mk b/target/osk5912/rules.mk
index 1fe75def..40651bff 100644
--- a/target/osk5912/rules.mk
+++ b/target/osk5912/rules.mk
@@ -1,12 +1,14 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 PLATFORM := omap5912
 
-MODULES += \
+MODULE_DEPS += \
 	dev/net/smc91c96
 
-OBJS += \
-	$(LOCAL_DIR)/init.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/init.c
 
 MEMSIZE := 0x02000000	# 32MB
 
@@ -15,3 +17,4 @@ DEFINES += \
 	SMC91C96_BASE_ADDR=0x04800300 \
 	SMC91C96_IRQ=0
 
+include make/module.mk
diff --git a/target/rules.mk b/target/rules.mk
index 8f1d297b..0905d1bc 100644
--- a/target/rules.mk
+++ b/target/rules.mk
@@ -1,6 +1,9 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-OBJS += \
-	$(LOCAL_DIR)/init.o
+MODULE := $(LOCAL_DIR)
 
+MODULE_SRCS += \
+	$(LOCAL_DIR)/init.c
+
+include make/module.mk
 
diff --git a/target/sam3x-ek/rules.mk b/target/sam3x-ek/rules.mk
index 947d0165..c7bdc043 100644
--- a/target/sam3x-ek/rules.mk
+++ b/target/sam3x-ek/rules.mk
@@ -1,10 +1,14 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 SAM_CHIP := sam3x8h
 PLATFORM := sam3
 
 INCLUDES += -I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/init.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/init.c
+
+include make/module.mk
 
diff --git a/target/sam7ex256/rules.mk b/target/sam7ex256/rules.mk
index bcd3568a..7571110d 100644
--- a/target/sam7ex256/rules.mk
+++ b/target/sam7ex256/rules.mk
@@ -6,5 +6,5 @@ PLATFORM := at91sam7
 
 INCLUDES += -I$(LOCAL_DIR)/include
 
-OBJS += 
+#OBJS += 
 
diff --git a/target/stm32-h103/rules.mk b/target/stm32-h103/rules.mk
index 428fad6c..2fa279e4 100644
--- a/target/stm32-h103/rules.mk
+++ b/target/stm32-h103/rules.mk
@@ -1,5 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 STM32_CHIP := stm32f103_md
 
 PLATFORM := stm32f1xx
@@ -10,6 +12,8 @@ DEFINES += \
 
 INCLUDES += -I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/init.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/init.c
+
+include make/module.mk
 
diff --git a/target/stm32-p107/rules.mk b/target/stm32-p107/rules.mk
index 75376f7a..ac1a81e7 100644
--- a/target/stm32-p107/rules.mk
+++ b/target/stm32-p107/rules.mk
@@ -1,5 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 STM32_CHIP := stm32f107
 
 PLATFORM := stm32f1xx
@@ -10,6 +12,8 @@ DEFINES += \
 
 INCLUDES += -I$(LOCAL_DIR)/include
 
-OBJS += \
-	$(LOCAL_DIR)/init.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/init.c
+
+include make/module.mk
 
diff --git a/target/stm3210e/init.c b/target/stm3210e/init.c
new file mode 100644
index 00000000..e69de29b
diff --git a/target/stm3210e/rules.mk b/target/stm3210e/rules.mk
index 61be1729..067441c1 100644
--- a/target/stm3210e/rules.mk
+++ b/target/stm3210e/rules.mk
@@ -1,10 +1,15 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 STM32_CHIP := stm32f103_hd
 
 PLATFORM := stm32f1xx
 
 INCLUDES += -I$(LOCAL_DIR)/include
 
-OBJS += 
+MODULE_SRCS += \
+	$(LOCAL_DIR)/init.c
+
+include make/module.mk
 
diff --git a/target/surf-msm7k/rules.mk b/target/surf-msm7k/rules.mk
index 0e20b93b..b3e0ceee 100644
--- a/target/surf-msm7k/rules.mk
+++ b/target/surf-msm7k/rules.mk
@@ -1,5 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 INCLUDES += -I$(LOCAL_DIR)/include
 
 PLATFORM := msm7k
@@ -11,7 +13,7 @@ LINUX_MACHTYPE := 0x0000059F
 
 KEYS_USE_GPIO_KEYPAD := 1
 
-MODULES += \
+MODULE_DEPS += \
 	dev/keys \
 	lib/ptable
 
@@ -20,7 +22,9 @@ DEFINES += \
 	MEMBASE=$(MEMBASE) \
 	LINUX_MACHTYPE=$(LINUX_MACHTYPE)
 
-OBJS += \
-	$(LOCAL_DIR)/init.o \
-	$(LOCAL_DIR)/keypad.o \
-	$(LOCAL_DIR)/panel.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/init.c \
+	$(LOCAL_DIR)/keypad.c \
+	$(LOCAL_DIR)/panel.c
+
+include make/module.mk
diff --git a/target/surf-qsd8k/rules.mk b/target/surf-qsd8k/rules.mk
index 2c0a3207..5999fc83 100644
--- a/target/surf-qsd8k/rules.mk
+++ b/target/surf-qsd8k/rules.mk
@@ -1,5 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+MODULE := $(LOCAL_DIR)
+
 INCLUDES += -I$(LOCAL_DIR)/include
 
 PLATFORM := qsd8k
@@ -11,7 +13,7 @@ LINUX_MACHTYPE := 0x00000811
 
 KEYS_USE_GPIO_KEYPAD := 1
 
-MODULES += \
+MODULE_DEPS += \
 	dev/keys \
 	lib/ptable
 
@@ -19,6 +21,8 @@ DEFINES += \
 	SDRAM_SIZE=$(MEMSIZE) \
 	LINUX_MACHTYPE=$(LINUX_MACHTYPE)
 
-OBJS += \
-	$(LOCAL_DIR)/init.o \
-	$(LOCAL_DIR)/keypad.o
+MODULE_SRCS += \
+	$(LOCAL_DIR)/init.c \
+	$(LOCAL_DIR)/keypad.c
+
+include make/module.mk