From 7d11f36c4837c16ae0213627c5cd9588522b4335 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Tue, 13 Mar 2018 09:52:55 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11723
 110e8d01-0319-4d1e-a829-52ad28d1bb01

---
 os/nil/nil.mk | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

(limited to 'os/nil')

diff --git a/os/nil/nil.mk b/os/nil/nil.mk
index f3d144199..0d6350f56 100644
--- a/os/nil/nil.mk
+++ b/os/nil/nil.mk
@@ -3,34 +3,16 @@
 ifeq ($(USE_SMART_BUILD),yes)
 CHCONF := $(strip $(shell cat chconf.h | egrep -e "\#define"))
 KERNSRC := ${CHIBIOS}/os/nil/src/ch.c
-ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmboxes.c
-endif
-ifneq ($(findstring CH_CFG_USE_MEMCORE TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmemcore.c
-endif
-ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chheap.c
-endif
-ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmempools.c
-endif
-ifneq ($(findstring CH_CFG_USE_FACTORY TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chfactory.c
-endif
 else
-KERNSRC := ${CHIBIOS}/os/nil/src/ch.c \
-           $(CHIBIOS)/os/common/oslib/src/chmboxes.c \
-           $(CHIBIOS)/os/common/oslib/src/chmemcore.c \
-           $(CHIBIOS)/os/common/oslib/src/chheap.c \
-           $(CHIBIOS)/os/common/oslib/src/chmempools.c \
-           $(CHIBIOS)/os/common/oslib/src/chfactory.c
+KERNSRC := ${CHIBIOS}/os/nil/src/ch.c
 endif
 
 # Required include directories
-KERNINC := ${CHIBIOS}/os/nil/include \
-           ${CHIBIOS}/os/common/oslib/include
+KERNINC := ${CHIBIOS}/os/nil/include
 
 # Shared variables
 ALLCSRC += $(KERNSRC)
 ALLINC  += $(KERNINC)
+
+# OS Library
+include $(CHIBIOS)/os/lib/lib.mk
-- 
cgit v1.2.3