2 files changed, 14 insertions, 10 deletions
diff --git a/demos/ARM7-LPC214x-G++/Makefile b/demos/ARM7-LPC214x-G++/Makefile
index 6c04023a8..f54c1ba2d 100644
--- a/demos/ARM7-LPC214x-G++/Makefile
+++ b/demos/ARM7-LPC214x-G++/Makefile
@@ -67,15 +67,17 @@ UDEFS =
 # Define ASM defines here
 UADEFS =
 
+# Imported source files
+include ../../src/kernel.mk
+include ../../test/test.mk
+
 # List ARM-mode C source files here
 ACSRC = ../../ports/ARM7-LPC214x/chcore.c \
         ../../ports/ARM7-LPC214x/vic.c  \
         ../../ports/ARM7-LPC214x/lpc214x_serial.c  \
-        ../../src/chinit.c ../../src/chdebug.c ../../src/chlists.c ../../src/chdelta.c \
-        ../../src/chschd.c ../../src/chthreads.c ../../src/chsem.c ../../src/chmtx.c \
-        ../../src/chevents.c ../../src/chmsg.c ../../src/chsleep.c ../../src/chqueues.c \
-        ../../src/chserial.c \
-        ../../src/lib/evtimer.c ../../test/test.c \
+       ${KERNSRC} \
+       ${TESTSRC} \
+        ../../src/lib/evtimer.c \
         board.c
 
 # List ARM-mode C++ source files here
diff --git a/demos/ARM7-LPC214x-G++/Makefile.thumb b/demos/ARM7-LPC214x-G++/Makefile.thumb
index 9171d2b72..4e2fd2f7c 100644
--- a/demos/ARM7-LPC214x-G++/Makefile.thumb
+++ b/demos/ARM7-LPC214x-G++/Makefile.thumb
@@ -67,6 +67,10 @@ UDEFS =
 # Define ASM defines here
 UADEFS =
 
+# Imported source files
+include ../../src/kernel.mk
+include ../../test/test.mk
+
 # List ARM-mode C source files here
 ACSRC =
 
@@ -77,11 +81,9 @@ ACPPSRC =
 TCSRC = ../../ports/ARM7-LPC214x/chcore.c \
         ../../ports/ARM7-LPC214x/vic.c  \
         ../../ports/ARM7-LPC214x/lpc214x_serial.c  \
-        ../../src/chinit.c ../../src/chdebug.c ../../src/chlists.c ../../src/chdelta.c \
-        ../../src/chschd.c ../../src/chthreads.c ../../src/chsem.c ../../src/chmtx.c \
-        ../../src/chevents.c ../../src/chmsg.c ../../src/chsleep.c ../../src/chqueues.c \
-        ../../src/chserial.c \
-        ../../src/lib/evtimer.c ../../test/test.c \
+       ${KERNSRC} \
+       ${TESTSRC} \
+        ../../src/lib/evtimer.c \
         board.c
 
 # List THUMB-mode C++ source files here