From 3b2e1451423559764ab8e21e99bdbfd57f3981e1 Mon Sep 17 00:00:00 2001
From: GuEe-GUI <2991707448@qq.com>
Date: Sun, 18 Feb 2024 22:05:50 +0800
Subject: [PATCH] Support build yes/no in Makefile

Example: build a module like `CONFIG_XHYP` who is a boolean:
    src-$(CONFIG_XHYP) += xhyp.c

if `CONFIG_XHYP=y`, `SRC` will append `src-y` will xhyp.c.
if `CONFIG_XHYP=n`, `SRC` will ignore `src-n`.

Signed-off-by: GuEe-GUI <2991707448@qq.com>
---
 scripts/xbuild/build.mk                 |  2 ++
 src/drivers/Makefile                    | 24 ++++++++++++------------
 src/drivers/block/romdisk.c             |  4 ----
 src/drivers/cpuinfo/cpuinfo.c           |  4 ----
 src/drivers/dtree/drv-dtree.c           |  4 ----
 src/drivers/dummy/dummy.c               |  4 ----
 src/drivers/meminfo/meminfo.c           |  4 ----
 src/drivers/null/null.c                 |  4 ----
 src/drivers/pmem/pmem.c                 |  5 -----
 src/drivers/vmem/vmem.c                 |  5 -----
 src/drivers/zero/zero.c                 |  4 ----
 src/fs/Makefile                         |  8 ++++----
 src/fs/cpio/Makefile                    |  2 +-
 src/fs/cpio/cpio.c                      |  4 ----
 src/fs/devfs/Makefile                   |  2 +-
 src/fs/devfs/devfs.c                    |  3 ---
 src/fs/fat/Makefile                     |  2 +-
 src/test/Makefile                       |  9 ++++-----
 src/test/integration.c                  |  4 ----
 src/test/integrations/ipc/Makefile      |  2 +-
 src/test/integrations/ipc/msgqueue.c    |  4 ----
 src/test/integrations/mm/Makefile       |  4 +++-
 src/test/integrations/mm/heap_cache.c   |  4 ----
 src/test/integrations/mm/page.c         |  4 ----
 src/test/integrations/mm/page_cache.c   |  4 ----
 src/test/integrations/sched/Makefile    |  6 +++++-
 src/test/integrations/sched/condition.c |  4 ----
 src/test/integrations/sched/mutex.c     |  4 ----
 src/test/integrations/sched/semaphore.c |  4 ----
 src/test/integrations/sched/thread.c    |  4 ----
 src/test/integrations/sched/thread_id.c |  4 ----
 src/test/integrations/time/Makefile     |  2 +-
 src/test/integrations/time/timer.c      |  4 ----
 src/test/utest.c                        |  4 ----
 src/test/utests/io/Makefile             |  3 ++-
 src/test/utests/io/driver.c             |  4 ----
 src/test/utests/io/ioqueue.c            |  4 ----
 src/test/utests/ipc/Makefile            |  2 +-
 src/test/utests/ipc/msgqueue.c          |  4 ----
 src/test/utests/mm/Makefile             |  2 +-
 src/test/utests/mm/heap_cache.c         |  4 ----
 src/test/utests/sched/Makefile          |  6 +++++-
 src/test/utests/sched/condition.c       |  4 ----
 src/test/utests/sched/mutex.c           |  4 ----
 src/test/utests/sched/process.c         |  4 ----
 src/test/utests/sched/semaphore.c       |  4 ----
 src/test/utests/sched/spin.c            |  4 ----
 src/test/utests/sched/thread.c          |  4 ----
 src/test/utests/time/Makefile           |  2 +-
 src/test/utests/time/timer.c            |  4 ----
 src/test/utests/utest/Makefile          |  2 +-
 src/test/utests/utest/utest.c           |  4 ----
 src/test/utests/utils/Makefile          |  2 +-
 src/test/utests/utils/string.c          |  4 ----
 src/test/utests/xbook/Makefile          |  2 +-
 src/test/utests/xbook/atomic.c          |  4 ----
 src/utils/Makefile                      |  4 +++-
 src/utils/json.c                        |  4 ----
 58 files changed, 51 insertions(+), 190 deletions(-)

diff --git a/scripts/xbuild/build.mk b/scripts/xbuild/build.mk
index 7521a0a..6dd49da 100644
--- a/scripts/xbuild/build.mk
+++ b/scripts/xbuild/build.mk
@@ -26,6 +26,8 @@ else
 SRC			:=	*.S *.c *.asm
 endif # ifneq ($(wildcard $(srctree)/$(src)/Makefile),)
 
+SRC			+= $(src-y)
+
 ifeq ($(ISMODULE),0)
 X_BUILTIN	:=	$(obj)/built-in.o
 endif
diff --git a/src/drivers/Makefile b/src/drivers/Makefile
index 04d31df..2c46053 100644
--- a/src/drivers/Makefile
+++ b/src/drivers/Makefile
@@ -1,12 +1,12 @@
-SRC += null/
-SRC += zero/
-SRC += dummy/
-SRC += console/
-SRC += block/
-SRC += meminfo/
-SRC += cpuinfo/
-SRC += udriver/
-SRC += pmem/
-SRC += vmem/
-SRC += cpustat/
-SRC += dtree/
+src-$(CONFIG_NX_DRIVER_NULL)	+= null/
+src-$(CONFIG_NX_DRIVER_ZERO)	+= zero/
+src-$(CONFIG_NX_DRIVER_DUMMY)	+= dummy/
+src-y							+= console/
+src-$(CONFIG_NX_DRIVER_ROMDISK)	+= block/
+src-$(CONFIG_NX_DRIVER_MEMINFO)	+= meminfo/
+src-$(CONFIG_NX_DRIVER_CPUINFO)	+= cpuinfo/
+src-y							+= udriver/
+src-$(CONFIG_NX_DRIVER_PMEM)	+= pmem/
+src-$(CONFIG_NX_DRIVER_VMEM)	+= vmem/
+src-y							+= cpustat/
+src-$(CONFIG_NX_DRIVER_DTREE)	+= dtree/
diff --git a/src/drivers/block/romdisk.c b/src/drivers/block/romdisk.c
index 55736f6..549a0f1 100644
--- a/src/drivers/block/romdisk.c
+++ b/src/drivers/block/romdisk.c
@@ -13,8 +13,6 @@
 #include <base/block.h>
 #include <base/memory.h>
 
-#ifdef CONFIG_NX_DRIVER_ROMDISK
-
 #define NX_LOG_NAME "romdisk driver"
 #include <base/log.h>
 
@@ -99,5 +97,3 @@ NX_PRIVATE void RomdiskDriverExit(void)
 
 NX_DRV_INIT(RomdiskDriverInit);
 NX_DRV_EXIT(RomdiskDriverExit);
-
-#endif
diff --git a/src/drivers/cpuinfo/cpuinfo.c b/src/drivers/cpuinfo/cpuinfo.c
index 62825cb..a8be4db 100644
--- a/src/drivers/cpuinfo/cpuinfo.c
+++ b/src/drivers/cpuinfo/cpuinfo.c
@@ -11,8 +11,6 @@
 
 #include <base/driver.h>
 
-#ifdef CONFIG_NX_DRIVER_CPUINFO
-
 #define NX_LOG_NAME "cpu info driver"
 #include <base/log.h>
 #include <base/memory.h>
@@ -89,5 +87,3 @@ NX_PRIVATE void CpuInfoDriverExit(void)
 
 NX_DRV_INIT(CpuInfoDriverInit);
 NX_DRV_EXIT(CpuInfoDriverExit);
-
-#endif
diff --git a/src/drivers/dtree/drv-dtree.c b/src/drivers/dtree/drv-dtree.c
index 1d9bd8e..556a508 100644
--- a/src/drivers/dtree/drv-dtree.c
+++ b/src/drivers/dtree/drv-dtree.c
@@ -11,8 +11,6 @@
 
 #include <base/driver.h>
 
-#ifdef CONFIG_NX_DRIVER_DTREE
-
 #define NX_LOG_NAME "tree"
 #include <base/log.h>
 #include <base/memory.h>
@@ -139,5 +137,3 @@ NX_PRIVATE void TreeDriverExit(void)
 
 NX_DRV_INIT(TreeDriverInit);
 NX_DRV_EXIT(TreeDriverExit);
-
-#endif
diff --git a/src/drivers/dummy/dummy.c b/src/drivers/dummy/dummy.c
index bd47ed0..970fb56 100644
--- a/src/drivers/dummy/dummy.c
+++ b/src/drivers/dummy/dummy.c
@@ -11,8 +11,6 @@
 
 #include <base/driver.h>
 
-#ifdef CONFIG_NX_DRIVER_DUMMY
-
 #define NX_LOG_NAME "dummy driver"
 #include <base/log.h>
 
@@ -105,5 +103,3 @@ NX_PRIVATE void DummyDriverExit(void)
 
 NX_DRV_INIT(DummyDriverInit);
 NX_DRV_EXIT(DummyDriverExit);
-
-#endif
diff --git a/src/drivers/meminfo/meminfo.c b/src/drivers/meminfo/meminfo.c
index 5de55be..3974ca9 100644
--- a/src/drivers/meminfo/meminfo.c
+++ b/src/drivers/meminfo/meminfo.c
@@ -11,8 +11,6 @@
 
 #include <base/driver.h>
 
-#ifdef CONFIG_NX_DRIVER_MEMINFO
-
 #define NX_LOG_NAME "mem info driver"
 #include <base/log.h>
 #include <base/memory.h>
@@ -92,5 +90,3 @@ NX_PRIVATE void MemInfoDriverExit(void)
 
 NX_DRV_INIT(MemInfoDriverInit);
 NX_DRV_EXIT(MemInfoDriverExit);
-
-#endif
diff --git a/src/drivers/null/null.c b/src/drivers/null/null.c
index d34b0bc..9266961 100644
--- a/src/drivers/null/null.c
+++ b/src/drivers/null/null.c
@@ -11,8 +11,6 @@
 
 #include <base/driver.h>
 
-#ifdef CONFIG_NX_DRIVER_NULL
-
 #define NX_LOG_NAME "null driver"
 #include <base/log.h>
 
@@ -69,5 +67,3 @@ NX_PRIVATE void NullDriverExit(void)
 
 NX_DRV_INIT(NullDriverInit);
 NX_DRV_EXIT(NullDriverExit);
-
-#endif
diff --git a/src/drivers/pmem/pmem.c b/src/drivers/pmem/pmem.c
index a09d9a3..f1d186d 100644
--- a/src/drivers/pmem/pmem.c
+++ b/src/drivers/pmem/pmem.c
@@ -10,9 +10,6 @@
  */
 
 #include <base/driver.h>
-
-#ifdef CONFIG_NX_DRIVER_PMEM
-
 #include <base/page.h>
 #include <base/uaccess.h>
 #include <drvfw/pmem.h>
@@ -162,5 +159,3 @@ NX_PRIVATE void PmemDriverExit(void)
 
 NX_DRV_INIT(PmemDriverInit);
 NX_DRV_EXIT(PmemDriverExit);
-
-#endif
diff --git a/src/drivers/vmem/vmem.c b/src/drivers/vmem/vmem.c
index 5aa261a..44d8b43 100644
--- a/src/drivers/vmem/vmem.c
+++ b/src/drivers/vmem/vmem.c
@@ -10,9 +10,6 @@
  */
 
 #include <base/driver.h>
-
-#ifdef CONFIG_NX_DRIVER_VMEM
-
 #include <base/page.h>
 #include <base/uaccess.h>
 #include <arch/process.h>
@@ -106,5 +103,3 @@ NX_PRIVATE void VmemDriverExit(void)
 
 NX_DRV_INIT(VmemDriverInit);
 NX_DRV_EXIT(VmemDriverExit);
-
-#endif
diff --git a/src/drivers/zero/zero.c b/src/drivers/zero/zero.c
index d6e7f74..371403c 100644
--- a/src/drivers/zero/zero.c
+++ b/src/drivers/zero/zero.c
@@ -11,8 +11,6 @@
 
 #include <base/driver.h>
 
-#ifdef CONFIG_NX_DRIVER_ZERO
-
 #define NX_LOG_NAME "zero driver"
 #include <base/log.h>
 #include <base/memory.h>
@@ -71,5 +69,3 @@ NX_PRIVATE void ZeroDriverExit(void)
 
 NX_DRV_INIT(ZeroDriverInit);
 NX_DRV_EXIT(ZeroDriverExit);
-
-#endif
diff --git a/src/fs/Makefile b/src/fs/Makefile
index 3b61bc1..6822124 100644
--- a/src/fs/Makefile
+++ b/src/fs/Makefile
@@ -1,4 +1,4 @@
-SRC	+= *.c
-SRC	+= cpio/
-SRC	+= devfs/
-SRC	+= fat/
+src-y						+= fs.c
+src-$(CONFIG_NX_FS_CPIO)	+= cpio/
+src-$(CONFIG_NX_FS_DEVFS)	+= devfs/
+src-$(CONFIG_NX_FS_FATFS)	+= fat/
diff --git a/src/fs/cpio/Makefile b/src/fs/cpio/Makefile
index 7858e65..33e5510 100644
--- a/src/fs/cpio/Makefile
+++ b/src/fs/cpio/Makefile
@@ -1 +1 @@
-SRC	+= *.c
+src-y	+= cpio.c
diff --git a/src/fs/cpio/cpio.c b/src/fs/cpio/cpio.c
index dd1c979..2ad983e 100644
--- a/src/fs/cpio/cpio.c
+++ b/src/fs/cpio/cpio.c
@@ -16,8 +16,6 @@
 
 #include <nxos_mini.h>
 
-#ifdef CONFIG_NX_FS_CPIO
-
 #include <base/fs.h>
 #include <base/string.h>
 #include <base/memory.h>
@@ -476,5 +474,3 @@ NX_PRIVATE void NX_FileSystemCpioExit(void)
 
 NX_FS_INIT(NX_FileSystemCpioInit);
 NX_FS_EXIT(NX_FileSystemCpioExit);
-
-#endif
diff --git a/src/fs/devfs/Makefile b/src/fs/devfs/Makefile
index 7858e65..34a928e 100644
--- a/src/fs/devfs/Makefile
+++ b/src/fs/devfs/Makefile
@@ -1 +1 @@
-SRC	+= *.c
+src-y	+= devfs.c
diff --git a/src/fs/devfs/devfs.c b/src/fs/devfs/devfs.c
index 38125cf..d2ae3eb 100644
--- a/src/fs/devfs/devfs.c
+++ b/src/fs/devfs/devfs.c
@@ -11,7 +11,6 @@
 
 #include <nxos_mini.h>
 
-#ifdef CONFIG_NX_FS_DEVFS
 #include <base/fs.h>
 #include <base/string.h>
 #define NX_LOG_NAME "devfs"
@@ -223,5 +222,3 @@ NX_PRIVATE void NX_FileSystemDevExit(void)
 
 NX_FS_INIT(NX_FileSystemDevInit);
 NX_FS_EXIT(NX_FileSystemDevExit);
-
-#endif /* CONFIG_NX_FS_DEVFS */
diff --git a/src/fs/fat/Makefile b/src/fs/fat/Makefile
index 7858e65..ac25864 100644
--- a/src/fs/fat/Makefile
+++ b/src/fs/fat/Makefile
@@ -1 +1 @@
-SRC	+= *.c
+src-y	+= fat.c fat-node.c fat-control.c
diff --git a/src/test/Makefile b/src/test/Makefile
index f36d404..d589ba7 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -1,5 +1,4 @@
-SRC	+= *.c
-ifeq ($(TC),y)
-SRC	+= utests/
-SRC	+= integrations/
-endif
\ No newline at end of file
+src-$(CONFIG_NX_ENABLE_TEST_INTEGRATION)	+= integration.c
+src-$(CONFIG_NX_ENABLE_TEST_UTEST)			+= utest.c
+src-$(TC)									+= utests/
+src-$(TC)									+= integrations/
\ No newline at end of file
diff --git a/src/test/integration.c b/src/test/integration.c
index 00fc165..cf58a4f 100644
--- a/src/test/integration.c
+++ b/src/test/integration.c
@@ -11,8 +11,6 @@
 
 #include <test/integration.h>
 
-#ifdef CONFIG_NX_ENABLE_TEST_INTEGRATION
-
 #include <base/string.h>
 #include <base/memory.h>
 #include <base/log.h>
@@ -70,5 +68,3 @@ NX_PRIVATE void IntegrationInit(void)
 }
 
 NX_INIT_TEST(IntegrationInit);
-
-#endif
diff --git a/src/test/integrations/ipc/Makefile b/src/test/integrations/ipc/Makefile
index 487d0cb..c2948f4 100644
--- a/src/test/integrations/ipc/Makefile
+++ b/src/test/integrations/ipc/Makefile
@@ -1 +1 @@
-SRC	+= *.c
\ No newline at end of file
+src-$(CONFIG_NX_TEST_INTEGRATION_MSG_QUEUE)	+= msgqueue.c
diff --git a/src/test/integrations/ipc/msgqueue.c b/src/test/integrations/ipc/msgqueue.c
index 122b52e..3d1ebba 100644
--- a/src/test/integrations/ipc/msgqueue.c
+++ b/src/test/integrations/ipc/msgqueue.c
@@ -17,8 +17,6 @@
 #include <base/debug.h>
 #include <base/string.h>
 
-#ifdef CONFIG_NX_TEST_INTEGRATION_MSG_QUEUE
-
 NX_PRIVATE NX_MsgQueue *mq0 = NX_NULL;
 
 NX_PRIVATE void Thread1(void *arg)
@@ -127,5 +125,3 @@ NX_INTEGRATION_TEST(NX_MsgQueue)
     NX_ThreadWait(t1, NX_NULL);
     return NX_EOK;
 }
-
-#endif
diff --git a/src/test/integrations/mm/Makefile b/src/test/integrations/mm/Makefile
index 487d0cb..a411d09 100644
--- a/src/test/integrations/mm/Makefile
+++ b/src/test/integrations/mm/Makefile
@@ -1 +1,3 @@
-SRC	+= *.c
\ No newline at end of file
+src-$(CONFIG_NX_TEST_INTEGRATION_HEAP_CACHE)	+= heap_cache.c
+src-$(CONFIG_NX_TEST_INTEGRATION_PAGE)			+= page.c
+src-$(CONFIG_NX_TEST_INTEGRATION_PAGE_CACHE)	+= page_cache.c
diff --git a/src/test/integrations/mm/heap_cache.c b/src/test/integrations/mm/heap_cache.c
index e39c769..2ded213 100644
--- a/src/test/integrations/mm/heap_cache.c
+++ b/src/test/integrations/mm/heap_cache.c
@@ -14,8 +14,6 @@
 #define NX_LOG_NAME "TestHeapCache"
 #include <base/log.h>
 
-#ifdef CONFIG_NX_TEST_INTEGRATION_HEAP_CACHE
-
 NX_PRIVATE void LargeObjectTest(void)
 {
     /* large object */
@@ -189,5 +187,3 @@ NX_INTEGRATION_TEST(NX_HeapCache)
     SmallObjectTest();
     return NX_EOK;
 }
-
-#endif
diff --git a/src/test/integrations/mm/page.c b/src/test/integrations/mm/page.c
index a85f566..a672762 100644
--- a/src/test/integrations/mm/page.c
+++ b/src/test/integrations/mm/page.c
@@ -15,8 +15,6 @@
 #include <base/log.h>
 #include <base/memory.h>
 
-#ifdef CONFIG_NX_TEST_INTEGRATION_PAGE
-
 NX_INTEGRATION_TEST(NX_PageAlloc)
 {
     /* alloc memory */
@@ -88,5 +86,3 @@ NX_INTEGRATION_TEST(NX_PageAlloc)
 
     return NX_EOK;
 }
-
-#endif
diff --git a/src/test/integrations/mm/page_cache.c b/src/test/integrations/mm/page_cache.c
index 41af030..4a14225 100644
--- a/src/test/integrations/mm/page_cache.c
+++ b/src/test/integrations/mm/page_cache.c
@@ -17,8 +17,6 @@
 #include <base/debug.h>
 #include <base/memory.h>
 
-#ifdef CONFIG_NX_TEST_INTEGRATION_PAGE_CACHE
-
 NX_PRIVATE void NX_PageCacheLarge(void)
 {
     void *span = NX_PageCacheAlloc(128);
@@ -196,5 +194,3 @@ NX_INTEGRATION_TEST(NX_PageCacheTest)
     NX_PageCacheOnePage();
     return NX_EOK;
 }
-
-#endif
diff --git a/src/test/integrations/sched/Makefile b/src/test/integrations/sched/Makefile
index 7858e65..686bc2e 100644
--- a/src/test/integrations/sched/Makefile
+++ b/src/test/integrations/sched/Makefile
@@ -1 +1,5 @@
-SRC	+= *.c
+src-$(CONFIG_NX_TEST_INTEGRATION_CONDITION)	+= condition.c
+src-$(CONFIG_NX_TEST_INTEGRATION_MUTEX)		+= mutex.c
+src-$(CONFIG_NX_TEST_INTEGRATION_SEMAPHORE)	+= semaphore.c
+src-$(CONFIG_NX_TEST_INTEGRATION_THREAD)	+= thread.c
+src-$(CONFIG_NX_TEST_INTEGRATION_THREAD_ID)	+= thread_id.c
diff --git a/src/test/integrations/sched/condition.c b/src/test/integrations/sched/condition.c
index 698bd08..5bcc766 100644
--- a/src/test/integrations/sched/condition.c
+++ b/src/test/integrations/sched/condition.c
@@ -14,8 +14,6 @@
 #include <base/log.h>
 #include <test/integration.h>
 
-#ifdef CONFIG_NX_TEST_INTEGRATION_CONDITION
-
 #define PRODUCT_NR 5
 #define WAIT_TIMES 15
 NX_PRIVATE int productNumber;
@@ -139,5 +137,3 @@ NX_INTEGRATION_TEST(NX_ConditionTest)
     ProducerConsumerTest2();
     return NX_EOK;
 }
-
-#endif
diff --git a/src/test/integrations/sched/mutex.c b/src/test/integrations/sched/mutex.c
index 7b7a234..0a645bb 100644
--- a/src/test/integrations/sched/mutex.c
+++ b/src/test/integrations/sched/mutex.c
@@ -18,8 +18,6 @@
 #include <test/integration.h>
 #include <base/clock.h>
 
-#ifdef CONFIG_NX_TEST_INTEGRATION_MUTEX
-
 #define MUTEX_THREAD_NR 10
 
 NX_PRIVATE NX_Mutex mutex;
@@ -174,5 +172,3 @@ NX_INTEGRATION_TEST(NX_Mutex)
 #endif
     return NX_EOK;
 }
-
-#endif
diff --git a/src/test/integrations/sched/semaphore.c b/src/test/integrations/sched/semaphore.c
index 7e34ec7..c76cc6f 100644
--- a/src/test/integrations/sched/semaphore.c
+++ b/src/test/integrations/sched/semaphore.c
@@ -16,8 +16,6 @@
 #include <base/log.h>
 #include <test/integration.h>
 
-#ifdef CONFIG_NX_TEST_INTEGRATION_SEMAPHORE
-
 /* Producer And Consumer test */
 #define PC_TEST_TIME 10 /* 10 s */
 
@@ -181,5 +179,3 @@ NX_INTEGRATION_TEST(NX_Semaphore)
     ProducerAndConsumer();
     return NX_EOK;
 }
-
-#endif
diff --git a/src/test/integrations/sched/thread.c b/src/test/integrations/sched/thread.c
index de50eb7..278134b 100644
--- a/src/test/integrations/sched/thread.c
+++ b/src/test/integrations/sched/thread.c
@@ -16,8 +16,6 @@
 #include <base/thread.h>
 #include <test/integration.h>
 
-#ifdef CONFIG_NX_TEST_INTEGRATION_THREAD
-
 NX_PRIVATE NX_VOLATILE int threadTick = 0;
 
 NX_PRIVATE void TestThread1(void *arg)
@@ -171,5 +169,3 @@ NX_INTEGRATION_TEST(TestThread)
     NX_LOG_D("thread test done.");    
     return NX_EOK;
 }
-
-#endif
diff --git a/src/test/integrations/sched/thread_id.c b/src/test/integrations/sched/thread_id.c
index 602cc09..331facf 100644
--- a/src/test/integrations/sched/thread_id.c
+++ b/src/test/integrations/sched/thread_id.c
@@ -13,8 +13,6 @@
 #include <base/log.h>
 #include <test/integration.h>
 
-#ifdef CONFIG_NX_TEST_INTEGRATION_THREAD_ID
-
 NX_INTEGRATION_TEST(TestThreadID)
 {
     int i;
@@ -33,5 +31,3 @@ NX_INTEGRATION_TEST(TestThreadID)
     }
     return NX_EOK;
 }
-
-#endif
diff --git a/src/test/integrations/time/Makefile b/src/test/integrations/time/Makefile
index 487d0cb..d7eabf7 100644
--- a/src/test/integrations/time/Makefile
+++ b/src/test/integrations/time/Makefile
@@ -1 +1 @@
-SRC	+= *.c
\ No newline at end of file
+src-$(CONFIG_NX_TEST_INTEGRATION_TIMER)	+= timer.c
diff --git a/src/test/integrations/time/timer.c b/src/test/integrations/time/timer.c
index 637c861..3ab8adf 100644
--- a/src/test/integrations/time/timer.c
+++ b/src/test/integrations/time/timer.c
@@ -15,8 +15,6 @@
 #include <base/log.h>
 #include <base/thread.h>
 
-#ifdef CONFIG_NX_TEST_INTEGRATION_TIMER
-
 NX_PRIVATE NX_Bool NX_TimerHandler1(NX_Timer *timer, void *arg)
 {
     NX_LOG_I("Timer#%s timeout\n", (char *)arg);
@@ -90,5 +88,3 @@ NX_INTEGRATION_TEST(NX_Timer)
     NX_LOG_I("timerCounter:%d", timerCounter);
     return NX_EOK;
 }
-
-#endif
diff --git a/src/test/utest.c b/src/test/utest.c
index 7d8eb5f..d117f85 100644
--- a/src/test/utest.c
+++ b/src/test/utest.c
@@ -11,8 +11,6 @@
 
 #include <test/utest.h>
 
-#ifdef CONFIG_NX_ENABLE_TEST_UTEST
-
 #include <base/string.h>
 #include <base/memory.h>
 #include <base/debug.h>
@@ -235,5 +233,3 @@ NX_PRIVATE void NX_UTestInit(void)
 }
 
 NX_INIT_TEST(NX_UTestInit);
-
-#endif
diff --git a/src/test/utests/io/Makefile b/src/test/utests/io/Makefile
index 487d0cb..40d9442 100644
--- a/src/test/utests/io/Makefile
+++ b/src/test/utests/io/Makefile
@@ -1 +1,2 @@
-SRC	+= *.c
\ No newline at end of file
+src-$(CONFIG_NX_UTEST_IO_DRIVER)	+= driver.c
+src-$(CONFIG_NX_UTEST_IO_QUEUE)		+= ioqueue.c
diff --git a/src/test/utests/io/driver.c b/src/test/utests/io/driver.c
index e613ab0..4046733 100644
--- a/src/test/utests/io/driver.c
+++ b/src/test/utests/io/driver.c
@@ -12,8 +12,6 @@
 #include <test/utest.h>
 #include <base/driver.h>
 
-#ifdef CONFIG_NX_UTEST_IO_DRIVER
-
 #define DRV_NAME "utest_driver"
 #define DRV_NAME2 "utest_driver2"
 
@@ -526,5 +524,3 @@ NX_TEST_CASE_CLEAN(NX_Driver)
 }
 
 NX_TEST_CASE(NX_Driver);
-
-#endif
diff --git a/src/test/utests/io/ioqueue.c b/src/test/utests/io/ioqueue.c
index 2eff921..0e57d21 100644
--- a/src/test/utests/io/ioqueue.c
+++ b/src/test/utests/io/ioqueue.c
@@ -12,8 +12,6 @@
 #include <test/utest.h>
 #include <base/ioqueue.h>
 
-#ifdef CONFIG_NX_UTEST_IO_QUEUE
-
 NX_TEST(NX_IoQueueCreate)
 {
     NX_Error err;
@@ -134,5 +132,3 @@ NX_TEST_TABLE(NX_IoQueue)
 };
 
 NX_TEST_CASE(NX_IoQueue);
-
-#endif
diff --git a/src/test/utests/ipc/Makefile b/src/test/utests/ipc/Makefile
index 487d0cb..d723389 100644
--- a/src/test/utests/ipc/Makefile
+++ b/src/test/utests/ipc/Makefile
@@ -1 +1 @@
-SRC	+= *.c
\ No newline at end of file
+src-$(CONFIG_NX_UTEST_MSG_QUEUE)	+= msgqueue.c
diff --git a/src/test/utests/ipc/msgqueue.c b/src/test/utests/ipc/msgqueue.c
index eebc6dc..26405dc 100644
--- a/src/test/utests/ipc/msgqueue.c
+++ b/src/test/utests/ipc/msgqueue.c
@@ -14,8 +14,6 @@
 #include <base/string.h>
 #include <base/memory.h>
 
-#ifdef CONFIG_NX_UTEST_MSG_QUEUE
-
 NX_TEST(NX_MsgQueueCreate)
 {
     NX_MsgQueue *mq;
@@ -239,5 +237,3 @@ NX_TEST_TABLE(NX_MsgQueue)
 };
 
 NX_TEST_CASE(NX_MsgQueue);
-
-#endif
diff --git a/src/test/utests/mm/Makefile b/src/test/utests/mm/Makefile
index 487d0cb..0c83b6b 100644
--- a/src/test/utests/mm/Makefile
+++ b/src/test/utests/mm/Makefile
@@ -1 +1 @@
-SRC	+= *.c
\ No newline at end of file
+src-$(CONFIG_NX_UTEST_HEAP_CACHE)	+= heap_cache.c
diff --git a/src/test/utests/mm/heap_cache.c b/src/test/utests/mm/heap_cache.c
index 6313cb8..d7cb9f9 100644
--- a/src/test/utests/mm/heap_cache.c
+++ b/src/test/utests/mm/heap_cache.c
@@ -13,8 +13,6 @@
 #include <base/heap_cache.h>
 #include <base/memory.h>
 
-#ifdef CONFIG_NX_UTEST_HEAP_CACHE
-
 NX_TEST(HeapAllocAndFree)
 {
     NX_ASSERT_NULL(NX_HeapAlloc(0));
@@ -52,5 +50,3 @@ NX_TEST_TABLE(NX_HeapCache)
 };
 
 NX_TEST_CASE(NX_HeapCache);
-
-#endif
diff --git a/src/test/utests/sched/Makefile b/src/test/utests/sched/Makefile
index 487d0cb..b382040 100644
--- a/src/test/utests/sched/Makefile
+++ b/src/test/utests/sched/Makefile
@@ -1 +1,5 @@
-SRC	+= *.c
\ No newline at end of file
+src-$(CONFIG_NX_UTEST_SCHED_CONDITION)	+= condition.c
+src-$(CONFIG_NX_UTEST_SCHED_MUTEX)		+= mutex.c
+src-$(CONFIG_NX_UTEST_SCHED_SEMAPHORE)	+= semaphore.c
+src-$(CONFIG_NX_UTEST_SCHED_SPIN)		+= spin.c
+src-$(CONFIG_NX_UTEST_SCHED_THREAD)		+= thread.c
diff --git a/src/test/utests/sched/condition.c b/src/test/utests/sched/condition.c
index 9ba3398..c58bc88 100644
--- a/src/test/utests/sched/condition.c
+++ b/src/test/utests/sched/condition.c
@@ -12,8 +12,6 @@
 #include <base/condition.h>
 #include <test/utest.h>
 
-#ifdef CONFIG_NX_UTEST_SCHED_CONDITION
-
 NX_TEST(NX_ConditionInit)
 {
     NX_Condition cond;
@@ -77,5 +75,3 @@ NX_TEST_TABLE(NX_Condition)
 };
 
 NX_TEST_CASE(NX_Condition);
-
-#endif
diff --git a/src/test/utests/sched/mutex.c b/src/test/utests/sched/mutex.c
index c8fe892..f212158 100644
--- a/src/test/utests/sched/mutex.c
+++ b/src/test/utests/sched/mutex.c
@@ -12,8 +12,6 @@
 #include <base/mutex.h>
 #include <test/utest.h>
 
-#ifdef CONFIG_NX_UTEST_SCHED_MUTEX
-
 NX_TEST(NX_MutexInit)
 {
     NX_Mutex lock;
@@ -73,5 +71,3 @@ NX_TEST_TABLE(NX_Mutex)
 };
 
 NX_TEST_CASE(NX_Mutex);
-
-#endif
diff --git a/src/test/utests/sched/process.c b/src/test/utests/sched/process.c
index f14ee67..2d50f7c 100644
--- a/src/test/utests/sched/process.c
+++ b/src/test/utests/sched/process.c
@@ -13,8 +13,6 @@
 #include <base/process.h>
 #include <base/thread.h>
 
-#ifdef CONFIG_NX_UTEST_SCHED_PROCESS
-
 NX_TEST(ProcessExecute)
 {
     NX_EXPECT_EQ(NX_ProcessLaunch("/test", NX_THREAD_CREATE_NORMAL, NX_NULL,
@@ -27,5 +25,3 @@ NX_TEST_TABLE(Process)
 };
 
 NX_TEST_CASE(Process);
-
-#endif
diff --git a/src/test/utests/sched/semaphore.c b/src/test/utests/sched/semaphore.c
index 172997f..7093d85 100644
--- a/src/test/utests/sched/semaphore.c
+++ b/src/test/utests/sched/semaphore.c
@@ -12,8 +12,6 @@
 #include <base/semaphore.h>
 #include <test/utest.h>
 
-#ifdef CONFIG_NX_UTEST_SCHED_SEMAPHORE
-
 NX_TEST(NX_SemaphoreInit)
 {
     NX_Semaphore sem;
@@ -65,5 +63,3 @@ NX_TEST_TABLE(NX_Semaphore)
 };
 
 NX_TEST_CASE(NX_Semaphore);
-
-#endif
diff --git a/src/test/utests/sched/spin.c b/src/test/utests/sched/spin.c
index 27ab2a3..9608452 100644
--- a/src/test/utests/sched/spin.c
+++ b/src/test/utests/sched/spin.c
@@ -12,8 +12,6 @@
 #include <base/spin.h>
 #include <test/utest.h>
 
-#ifdef CONFIG_NX_UTEST_SCHED_SPIN
-
 NX_TEST(NX_SpinInit)
 {
     NX_Spin lock;
@@ -73,5 +71,3 @@ NX_TEST_TABLE(NX_Spin)
 };
 
 NX_TEST_CASE(NX_Spin);
-
-#endif
diff --git a/src/test/utests/sched/thread.c b/src/test/utests/sched/thread.c
index efbb2ea..46e2a80 100644
--- a/src/test/utests/sched/thread.c
+++ b/src/test/utests/sched/thread.c
@@ -12,8 +12,6 @@
 #include <test/utest.h>
 #include <base/thread.h>
 
-#ifdef CONFIG_NX_UTEST_SCHED_THREAD
-
 NX_TEST(NX_ThreadSleep)
 {
     NX_TimeVal s, e;
@@ -72,5 +70,3 @@ NX_TEST_TABLE(NX_Thread)
 };
 
 NX_TEST_CASE(NX_Thread);
-
-#endif
diff --git a/src/test/utests/time/Makefile b/src/test/utests/time/Makefile
index 487d0cb..4b60eac 100644
--- a/src/test/utests/time/Makefile
+++ b/src/test/utests/time/Makefile
@@ -1 +1 @@
-SRC	+= *.c
\ No newline at end of file
+src-$(CONFIG_NX_UTEST_MODS_TIMER)		+= timer.c
diff --git a/src/test/utests/time/timer.c b/src/test/utests/time/timer.c
index 8c37214..1d73fc7 100644
--- a/src/test/utests/time/timer.c
+++ b/src/test/utests/time/timer.c
@@ -13,8 +13,6 @@
 
 #include <base/timer.h>
 
-#ifdef CONFIG_NX_UTEST_MODS_TIMER
-
 NX_PRIVATE int timerOneshotFlags = 0;
 
 NX_PRIVATE NX_Bool NX_TimerHandler(NX_Timer *timer, void *arg)
@@ -125,5 +123,3 @@ NX_TEST_TABLE(NX_Timer)
 };
 
 NX_TEST_CASE(NX_Timer);
-
-#endif
diff --git a/src/test/utests/utest/Makefile b/src/test/utests/utest/Makefile
index 487d0cb..fce4e92 100644
--- a/src/test/utests/utest/Makefile
+++ b/src/test/utests/utest/Makefile
@@ -1 +1 @@
-SRC	+= *.c
\ No newline at end of file
+src-$(CONFIG_NX_UTEST_MODS_UTEST)		+= utest.c
diff --git a/src/test/utests/utest/utest.c b/src/test/utests/utest/utest.c
index 49a3096..9d3bd36 100644
--- a/src/test/utests/utest/utest.c
+++ b/src/test/utests/utest/utest.c
@@ -11,8 +11,6 @@
 
 #include <test/utest.h>
 
-#ifdef CONFIG_NX_UTEST_MODS_UTEST
-
 NX_TEST(Test)
 {
     NX_ASSERT_TRUE(1);
@@ -101,5 +99,3 @@ NX_TEST_CASE_CLEAN(UTest)
 }
 
 NX_TEST_CASE(UTest);
-
-#endif
diff --git a/src/test/utests/utils/Makefile b/src/test/utests/utils/Makefile
index 487d0cb..68d8b0b 100644
--- a/src/test/utests/utils/Makefile
+++ b/src/test/utests/utils/Makefile
@@ -1 +1 @@
-SRC	+= *.c
\ No newline at end of file
+src-$(CONFIG_NX_UTEST_UTILS_STRING)		+= string.c
diff --git a/src/test/utests/utils/string.c b/src/test/utests/utils/string.c
index fc5273f..f78cd40 100644
--- a/src/test/utests/utils/string.c
+++ b/src/test/utests/utils/string.c
@@ -13,8 +13,6 @@
 #include <base/string.h>
 #include <test/utest.h>
 
-#ifdef CONFIG_NX_UTEST_UTILS_STRING
-
 NX_TEST(NX_StrCmp)
 {
     const char *str = "abc";
@@ -49,5 +47,3 @@ NX_TEST_TABLE(String)
 };
 
 NX_TEST_CASE(String);
-
-#endif
diff --git a/src/test/utests/xbook/Makefile b/src/test/utests/xbook/Makefile
index 487d0cb..b788941 100644
--- a/src/test/utests/xbook/Makefile
+++ b/src/test/utests/xbook/Makefile
@@ -1 +1 @@
-SRC	+= *.c
\ No newline at end of file
+src-$(CONFIG_NX_UTEST_XBOOK_ATOMIC)		+= atomic.c
diff --git a/src/test/utests/xbook/atomic.c b/src/test/utests/xbook/atomic.c
index 3b19e43..22c93a0 100644
--- a/src/test/utests/xbook/atomic.c
+++ b/src/test/utests/xbook/atomic.c
@@ -12,8 +12,6 @@
 #include <base/atomic.h>
 #include <test/utest.h>
 
-#ifdef CONFIG_NX_UTEST_XBOOK_ATOMIC
-
 NX_TEST(NX_AtomicSetAndGet)
 {
     NX_Atomic val;
@@ -141,5 +139,3 @@ NX_TEST_TABLE(NX_Atomic)
 };
 
 NX_TEST_CASE(NX_Atomic);
-
-#endif
diff --git a/src/utils/Makefile b/src/utils/Makefile
index 030603e..e7e10db 100644
--- a/src/utils/Makefile
+++ b/src/utils/Makefile
@@ -1 +1,3 @@
-SRC	+= *.c
+src-y	+= compatible.c ctype.c div.c fifo.c log.c memory.c sprintf.c string.c
+
+src-$(CONFIG_NX_DEVICE_TREE_SUPPORT)	+= json.c
diff --git a/src/utils/json.c b/src/utils/json.c
index 35a37e7..7199e44 100644
--- a/src/utils/json.c
+++ b/src/utils/json.c
@@ -10,9 +10,6 @@
  */
 
 #include <base/json.h>
-
-#ifdef CONFIG_NX_DEVICE_TREE_SUPPORT
-
 #include <base/ctype.h>
 #include <base/string.h>
 #include <base/memory.h>
@@ -885,4 +882,3 @@ void JSON_Free(struct JSON_Value * value)
 		NX_MemFree(v);
 	}
 }
-#endif
-- 
Gitee