1 files changed, 11 insertions, 14 deletions
diff --git a/testhal/AVR/XMEGA/TEST-SUITE-OSLIB/Makefile b/testhal/AVR/XMEGA/TEST-SUITE-OSLIB/Makefile
index 385c2e2b0..a0172e108 100644
--- a/testhal/AVR/XMEGA/TEST-SUITE-OSLIB/Makefile
+++ b/testhal/AVR/XMEGA/TEST-SUITE-OSLIB/Makefile
@@ -85,37 +85,34 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../../..
+
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
+
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/hal/boards/MT-DB-X4/board.mk
 include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/ATXMEGAxxxA4U/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
+
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk
+
 # Other files (optional).
 include $(CHIBIOS)/test/lib/test.mk
 include $(CHIBIOS)/test/oslib/oslib_test.mk
 
-#include $(CHIBIOS)/os/hal/lib/streams/streams.mk
-
 # List C source files here. (C dependencies are automatically generated.)
-CSRC =  $(KERNSRC)                      \
-        $(PORTSRC)                      \
-        $(OSALSRC)                      \
-        $(HALSRC)                       \
-        $(PLATFORMSRC)                  \
-        $(BOARDSRC)                     \
-        $(CHIBIOS)/os/various/evtimer.c \
-        $(TESTSRC)                      \
+CSRC =  $(ALLCSRC) \
+        $(TESTSRC) \
         main.c
 
 # List C++ sources file here.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
-INCDIR =  $(CHIBIOS)/os/license $(PORTINC) $(KERNINC)     \
-          $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC)  \
-          $(BOARDINC) $(CHIBIOS)/os/various
+# Header files here.
+INCDIR = $(ALLINC) $(TESTINC)
 
 #
 # Project, sources and paths.