diff --git a/Common/common.Makefile b/Common/common.Makefile
index d053c24e5..0ca31f893 100755
--- a/Common/common.Makefile
+++ b/Common/common.Makefile
@@ -271,46 +271,45 @@ endif
 OUTPUT_DIR 		:= ./.build/
 
 # 编译中间文件存放相对路径
-PLAT_ARM64_DIR		:= $(OUTPUT_DIR)$(TARGET_NAME)_$(TARGET_TYPE)_$(TARGET_OBJ)_arm64_$(BUILD_DIR)
-PLAT_LINUX_DIR		:= $(OUTPUT_DIR)$(TARGET_NAME)_$(TARGET_TYPE)_$(TARGET_OBJ)_linux_$(BUILD_DIR)
+ARM64_DIR		:= $(OUTPUT_DIR)$(TARGET_NAME)_$(TARGET_TYPE)_$(TARGET_OBJ)_arm64_$(BUILD_DIR)
+LINUX_DIR		:= $(OUTPUT_DIR)$(TARGET_NAME)_$(TARGET_TYPE)_$(TARGET_OBJ)_linux_$(BUILD_DIR)
 
 # 设置安装路径
 ifeq ($(TARGET_TYPE), SDK)
-PLAT_LINUX_PUBLISH_DIR			:= $(INSTALL_ROOT)/sdk/$(CPU_LINUX_DIR)/
-PLAT_LINUX_PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/sdk.debug/$(CPU_LINUX_DIR)/
+LINUX_PUBLISH_DIR		:= $(INSTALL_ROOT)/sdk/$(CPU_LINUX_DIR)/
+PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/sdk.debug/$(CPU_LINUX_DIR)/
 else
 ifeq ($(TARGET_BOX), )
-PLAT_ARM64_PUBLISH_DIR	:= $(INSTALL_ROOT)/targets/$(CPU_ARM64_DIR)/$(TARGET_BOX)/
-PLAT_ARM64_PUBLISH_DIR	:= $(INSTALL_ROOT)/targets/$(CPU_ARM64_DIR)/$(TARGET_BOX)/
+ARM64_PUBLISH_DIR	:= $(INSTALL_ROOT)/targets/$(CPU_ARM64_DIR)/$(TARGET_BOX)/
 
 ifeq ($(LINUX_USER_INS_DIR), )
-PLAT_LINUX_PUBLISH_DIR	:= $(INSTALL_ROOT)/targets/$(CPU_LINUX_DIR)/$(TARGET_BOX)/
+LINUX_PUBLISH_DIR	:= $(INSTALL_ROOT)/targets/$(CPU_LINUX_DIR)/$(TARGET_BOX)/
 else
-PLAT_LINUX_PUBLISH_DIR	:= $(INSTALL_ROOT)/$(LINUX_USER_INS_DIR)/$(CPU_LINUX_DIR)/$(TARGET_BOX)/
+LINUX_PUBLISH_DIR	:= $(INSTALL_ROOT)/$(LINUX_USER_INS_DIR)/$(CPU_LINUX_DIR)/$(TARGET_BOX)/
 endif
 
-PLAT_ARM64_PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/targets.debug/$(CPU_ARM64_DIR)/$(TARGET_BOX)/
+ARM64_PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/targets.debug/$(CPU_ARM64_DIR)/$(TARGET_BOX)/
 
 ifeq ($(LINUX_USER_INS_DIR), )
-PLAT_LINUX_PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/targets.debug/$(CPU_LINUX_DIR)/$(TARGET_BOX)/
+PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/targets.debug/$(CPU_LINUX_DIR)/$(TARGET_BOX)/
 else
-PLAT_LINUX_PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/$(LINUX_USER_INS_DIR).debug/$(CPU_LINUX_DIR)/$(TARGET_BOX)/
+PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/$(LINUX_USER_INS_DIR).debug/$(CPU_LINUX_DIR)/$(TARGET_BOX)/
 endif
 
 else
-PLAT_ARM64_PUBLISH_DIR	:= $(INSTALL_ROOT)/targets/$(CPU_ARM64_DIR)/$(TARGET_BOX)-arm64/
+ARM64_PUBLISH_DIR	:= $(INSTALL_ROOT)/targets/$(CPU_ARM64_DIR)/$(TARGET_BOX)-arm64/
 
 ifeq ($(LINUX_USER_INS_DIR), )
-PLAT_LINUX_PUBLISH_DIR	:= $(INSTALL_ROOT)/targets/$(CPU_LINUX_DIR)/$(TARGET_BOX)-linux/
+LINUX_PUBLISH_DIR	:= $(INSTALL_ROOT)/targets/$(CPU_LINUX_DIR)/$(TARGET_BOX)-linux/
 else
-PLAT_LINUX_PUBLISH_DIR	:= $(INSTALL_ROOT)/$(LINUX_USER_INS_DIR)/$(CPU_LINUX_DIR)/$(TARGET_BOX)-linux/
+LINUX_PUBLISH_DIR	:= $(INSTALL_ROOT)/$(LINUX_USER_INS_DIR)/$(CPU_LINUX_DIR)/$(TARGET_BOX)-linux/
 endif
-PLAT_ARM64_PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/targets.debug/$(CPU_ARM64_DIR)/$(TARGET_BOX)-arm64/
+ARM64_PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/targets.debug/$(CPU_ARM64_DIR)/$(TARGET_BOX)-arm64/
 
 ifeq ($(LINUX_USER_INS_DIR), )
-PLAT_LINUX_PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/targets.debug/$(CPU_LINUX_DIR)/$(TARGET_BOX)-linux/
+PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/targets.debug/$(CPU_LINUX_DIR)/$(TARGET_BOX)-linux/
 else
-PLAT_LINUX_PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/$(LINUX_USER_INS_DIR).debug/$(CPU_LINUX_DIR)/$(TARGET_BOX)-linux/
+PUBLISH_DEBUG_DIR	:= $(INSTALL_ROOT)/$(LINUX_USER_INS_DIR).debug/$(CPU_LINUX_DIR)/$(TARGET_BOX)-linux/
 endif
 endif
 
@@ -322,41 +321,41 @@ BUILD_TARGET :=
 ifneq ($(UNMAKE_PROCESS), TRUE)
 
 # 定义最终生成目标文件名
-PLAT_ARM64_TARGET			:= $(TARGET_PREFIX)$(TARGET_NAME)-$(ARM64_OBJ_TARGET)$(TARGET_EXT)
-PLAT_LINUX_TARGET			:= $(TARGET_PREFIX)$(TARGET_NAME)-$(LINUX_OBJ_TARGET)$(TARGET_EXT)
+ARM64_TARGET			:= $(TARGET_PREFIX)$(TARGET_NAME)-$(ARM64_OBJ_TARGET)$(TARGET_EXT)
+LINUX_TARGET			:= $(TARGET_PREFIX)$(TARGET_NAME)-$(LINUX_OBJ_TARGET)$(TARGET_EXT)
 
 # ARM64 平台生成目标、编译参数、链接参数、依赖库
 ifeq ($(PLAT_ARM64), TRUE)
-	BUILD_TARGET 			+= $(PLAT_ARM64_TARGET)
-	PLAT_ARM64_CFLAGS		+= -DPLATFORM_ARM64 $(ARM64_EXTFLAG)
-	PLAT_ARM64_LDFLAGS 		+= $(ARM64_DRV_LDFLAGS) -L ./debug
-	PLAT_ARM64_LIBFLAGS		:= $(ARM64_LIBFLAGS)
-	PLAT_ARM64_LIBS			:= $(ARM64_LIBS)
+	BUILD_TARGET 		+= $(ARM64_TARGET)
+	ARM64_CFLAGS		:= $(PLAT_ARM64_CFLAGS) -DPLATFORM_ARM64 $(ARM64_EXTFLAG)
+	ARM64_LDFLAGS 		:= $(PLAT_ARM64_LDFLAGS) $(ARM64_DRV_LDFLAGS) -L ./debug
+	ARM64_LIBFLAGS		:= $(PLAT_ARM64_LIBFLAGS)
+	ARM64_LIBS			:= $(PLAT_ARM64_LIBS)
 endif
 
 # ARM64 平台生成目标、编译参数、链接参数、依赖库
 ifeq ($(PLAT_LINUX), TRUE)
-	BUILD_TARGET 			+= $(PLAT_LINUX_TARGET)
-	PLAT_LINUX_CFLAGS		+= -DPLATFORM_LINUX $(LINUX_EXTFLAG)
-	PLAT_LINUX_LDFLAGS		+= $(LINUX_DRV_LDFLAGS) -L ./debug
-	PLAT_LINUX_LIBFLAGS		:= $(LINUX_LIBFLAGS)
-	PLAT_LINUX_LIBS			:= $(LINUX_LIBS)
+	BUILD_TARGET 		+= $(LINUX_TARGET)
+	LINUX_CFLAGS		:= $(PLAT_LINUX_CFLAGS) -DPLATFORM_LINUX $(LINUX_EXTFLAG)
+	LINUX_LDFLAGS		:= $(PLAT_LINUX_LDFLAGS) $(LINUX_DRV_LDFLAGS) -L ./debug
+	LINUX_LIBFLAGS		:= $(PLAT_LINUX_LIBFLAGS)
+	LINUX_LIBS			:= $(PLAT_LINUX_LIBS)
 endif
 
 # 根据源文件推算出生成目标的依赖项
 ifeq ($(PLAT_ARM64), TRUE)
-PLAT_ARM64_OBJS  	:= $(PLAT_ARM64_SRCS:%.c=$(PLAT_ARM64_DIR)/%.o)
-PLAT_ARM64_OBJS  	+= $(PLAT_ARM64_AS_SRCS:%.s=$(PLAT_ARM64_DIR)/%.o)
-PLAT_ARM64_DEPS  	:= $(PLAT_ARM64_SRCS:%.c=$(PLAT_ARM64_DIR)/%.d)
+PLAT_ARM64_OBJS  	:= $(PLAT_ARM64_SRCS:%.c=$(ARM64_DIR)/%.o)
+PLAT_ARM64_OBJS  	+= $(PLAT_ARM64_AS_SRCS:%.s=$(ARM64_DIR)/%.o)
+PLAT_ARM64_DEPS  	:= $(PLAT_ARM64_SRCS:%.c=$(ARM64_DIR)/%.d)
 else
 PLAT_ARM64_OBJS 	:=
 PLAT_ARM64_DEPS  	:=
 endif
 
 ifeq ($(PLAT_LINUX), TRUE)
-PLAT_LINUX_OBJS  	:= $(PLAT_LINUX_SRCS:%.c=$(PLAT_LINUX_DIR)/%.o)
-PLAT_LINUX_OBJS  	+= $(PLAT_LINUX_AS_SRCS:%.s=$(PLAT_LINUX_DIR)/%.o)
-PLAT_LINUX_DEPS  	:= $(PLAT_LINUX_SRCS:%.c=$(PLAT_LINUX_DIR)/%.d)
+PLAT_LINUX_OBJS  	:= $(PLAT_LINUX_SRCS:%.c=$(LINUX_DIR)/%.o)
+PLAT_LINUX_OBJS  	+= $(PLAT_LINUX_AS_SRCS:%.s=$(LINUX_DIR)/%.o)
+PLAT_LINUX_DEPS  	:= $(PLAT_LINUX_SRCS:%.c=$(LINUX_DIR)/%.d)
 else
 PLAT_LINUX_OBJS 	:=
 PLAT_LINUX_DEPS  	:=
@@ -402,17 +401,17 @@ endif
 all: $(BUILD_TARGET)
 # Build ARM64
 ifeq ($(PLAT_ARM64), TRUE)
-$(PLAT_ARM64_TARGET): $(PLAT_ARM64_OBJS)
+$(ARM64_TARGET): $(PLAT_ARM64_OBJS)
 # 创建构建需要的目录结构
 	-@test -d $(TARGET_OUT_DIR) || $(MKDIR) $(TARGET_OUT_DIR)
 ifeq ($(TARGET_TYPE), LIB)
 # 打包生成库文件
 	@$(ECHO_COLOR) "$(PLAT_ARM64_COLOR)   AR            $@"
-	$(MLOG)$(ARM64_CROSS_AR) $(PLAT_ARM64_LIBFLAGS) $(TARGET_OUT_DIR)$@ $+ $(PLAT_ARM64_LIBS)
+	$(MLOG)$(ARM64_CROSS_AR) $(ARM64_LIBFLAGS) $(TARGET_OUT_DIR)$@ $+ $(ARM64_LIBS)
 else
 # 链接生成可执行文件
 	@$(ECHO_COLOR) "$(PLAT_ARM64_COLOR)   LD            $@"
-	$(MLOG)$(ARM64_CROSS_LD) -o $(TARGET_OUT_DIR)$@ $(PLAT_ARM64_LDFLAGS) $+ $(PLAT_ARM64_LIBS)
+	$(MLOG)$(ARM64_CROSS_LD) -o $(TARGET_OUT_DIR)$@ $(ARM64_LDFLAGS) $+ $(ARM64_LIBS)
 ifeq ($(TARGET_STRIP), TRUE)
 # 将目标的调试信息复制到另外一个新文件中
 	@$(ECHO_COLOR) "$(PLAT_ARM64_COLOR)   OBJCOPY       $@.debug"
@@ -426,30 +425,30 @@ ifeq ($(TARGET_STRIP), TRUE)
 endif
 endif
 # C 源文件编译规则
-$(PLAT_ARM64_DIR)/%.o : %.c
+$(ARM64_DIR)/%.o : %.c
 	-@test -d $(dir $@) || $(MKDIR) $(dir $@)
 	@$(ECHO_COLOR) "$(PLAT_ARM64_COLOR)   CC            $<"
-	$(MLOG)$(ARM64_CROSS_CC) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" $(PLAT_ARM64_CFLAGS) -o $@ -c $<
+	$(MLOG)$(ARM64_CROSS_CC) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" $(ARM64_CFLAGS) -o $@ -c $<
 
 # 汇编文件编译规则
-$(PLAT_ARM64_DIR)/%.o : %.s
+$(ARM64_DIR)/%.o : %.s
 	@$(ECHO_COLOR) "$(PLAT_ARM64_COLOR)   CC            $<"
 	$(MLOG)$(ARM64_CROSS_CC) -c $< -o $@
 endif
 
 # Build LINUX Board
 ifeq ($(PLAT_LINUX), TRUE)
-$(PLAT_LINUX_TARGET): $(PLAT_LINUX_OBJS)
+$(LINUX_TARGET): $(PLAT_LINUX_OBJS)
 	-@test -d $(TARGET_OUT_DIR) || $(MKDIR) $(TARGET_OUT_DIR)
 
 ifeq ($(TARGET_TYPE), LIB)
 # 打包生成库文件
 	@$(ECHO_COLOR) "$(PLAT_LINUX_COLOR)   AR            $@"
-	$(MLOG)$(AR) $(PLAT_LINUX_LIBFLAGS) $(TARGET_OUT_DIR)$@ $+ $(PLAT_LINUX_LIBS)
+	$(MLOG)$(AR) $(LINUX_LIBFLAGS) $(TARGET_OUT_DIR)$@ $+ $(LINUX_LIBS)
 else
 # 链接生成可执行文件
 	@$(ECHO_COLOR) "$(PLAT_LINUX_COLOR)   LD            $@"
-	$(MLOG)$(LINUX_CROSS_LD) -o $(TARGET_OUT_DIR)$@ $(PLAT_LINUX_LDFLAGS) $+ $(PLAT_LINUX_LIBS)
+	$(MLOG)$(LINUX_CROSS_LD) -o $(TARGET_OUT_DIR)$@ $(LINUX_LDFLAGS) $+ $(LINUX_LIBS)
 ifeq ($(TARGET_STRIP), TRUE)
 # 将目标的调试信息复制到另外一个新文件中
 	@$(ECHO_COLOR) "$(PLAT_LINUX_COLOR)   OBJCOPY       $@.debug"
@@ -464,13 +463,13 @@ endif
 endif
 
 # C 源文件编译规则
-$(PLAT_LINUX_DIR)/%.o : %.c
+$(LINUX_DIR)/%.o : %.c
 	-@test -d $(dir $@) || $(MKDIR) $(dir $@)
 	@$(ECHO_COLOR) "$(PLAT_LINUX_COLOR)   CC            $<"
-	$(MLOG)$(CC) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" $(PLAT_LINUX_CFLAGS) -o $@ -c $<
+	$(MLOG)$(CC) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" $(LINUX_CFLAGS) -o $@ -c $<
 
 # 汇编文件编译规则
-$(PLAT_LINUX_DIR)/%.o : %.s
+$(LINUX_DIR)/%.o : %.s
 	@$(ECHO_COLOR) "$(PLAT_LINUX_COLOR)   CC            $<"
 	$(MLOG)$(CC) -c $< -o $@
 endif
@@ -485,16 +484,16 @@ endif
 ifneq ($(PLAT_ARM64_DONT_INSTALL), TRUE)
 # ARM64 targets install
 ifeq ($(PLAT_ARM64), TRUE)
-	-@test -d $(PLAT_ARM64_PUBLISH_DIR) || $(MKDIR) $(PLAT_ARM64_PUBLISH_DIR)
-	-@test -d $(PLAT_ARM64_PUBLISH_DEBUG_DIR) || $(MKDIR) $(PLAT_ARM64_PUBLISH_DEBUG_DIR)
+	-@test -d $(ARM64_PUBLISH_DIR) || $(MKDIR) $(ARM64_PUBLISH_DIR)
+	-@test -d $(ARM64_PUBLISH_DEBUG_DIR) || $(MKDIR) $(ARM64_PUBLISH_DEBUG_DIR)
 ifneq ($(UNMAKE_PROCESS), TRUE)
-	@$(ECHO_COLOR) "$(INSTALL_COLOR) $(PLAT_ARM64_COLOR) $(TARGET_OUT_DIR)$(PLAT_ARM64_TARGET) $(PLAT_ARM64_TARGET).debug $(INSTALL_PATH_COLOR)"
-	@$(CP) $(TARGET_OUT_DIR)/$(PLAT_ARM64_TARGET) $(PLAT_ARM64_PUBLISH_DIR)
-	@$(CP) $(TARGET_OUT_DIR)/$(PLAT_ARM64_TARGET).debug $(PLAT_ARM64_PUBLISH_DEBUG_DIR)
+	@$(ECHO_COLOR) "$(INSTALL_COLOR) $(PLAT_ARM64_COLOR) $(TARGET_OUT_DIR)$(ARM64_TARGET) $(ARM64_TARGET).debug $(INSTALL_PATH_COLOR)"
+	@$(CP) $(TARGET_OUT_DIR)/$(ARM64_TARGET) $(ARM64_PUBLISH_DIR)
+	@$(CP) $(TARGET_OUT_DIR)/$(ARM64_TARGET).debug $(ARM64_PUBLISH_DEBUG_DIR)
 endif
 ifneq ($(PLAT_ARM64_USER_INS_ITEMS), )
 	@$(ECHO_COLOR) "$(INSTALL_USER_ITEM_COLOR) $(PLAT_ARM64_COLOR) $(notdir $(PLAT_ARM64_USER_INS_ITEMS)) $(INSTALL_PATH_COLOR)"
-	@$(CP) $(PLAT_ARM64_USER_INS_ITEMS) $(PLAT_ARM64_PUBLISH_DIR)
+	@$(CP) $(PLAT_ARM64_USER_INS_ITEMS) $(ARM64_PUBLISH_DIR)
 endif
 endif
 endif
@@ -502,16 +501,16 @@ endif
 ifneq ($(PLAT_LINUX_DONT_INSTALL), TRUE)
 # LINUX board targets install
 ifeq ($(PLAT_LINUX), TRUE)
-	-@test -d $(PLAT_LINUX_PUBLISH_DIR) || $(MKDIR) $(PLAT_LINUX_PUBLISH_DIR)
-	-@test -d $(PLAT_LINUX_PUBLISH_DEBUG_DIR) || $(MKDIR) $(PLAT_LINUX_PUBLISH_DEBUG_DIR)
+	-@test -d $(LINUX_PUBLISH_DIR) || $(MKDIR) $(LINUX_PUBLISH_DIR)
+	-@test -d $(PUBLISH_DEBUG_DIR) || $(MKDIR) $(PUBLISH_DEBUG_DIR)
 ifneq ($(UNMAKE_PROCESS), TRUE)
-	@$(ECHO_COLOR) "$(INSTALL_COLOR) $(PLAT_LINUX_COLOR) $(TARGET_OUT_DIR)$(PLAT_LINUX_TARGET) $(PLAT_LINUX_TARGET).debug $(INSTALL_PATH_COLOR)"
-	@$(CP) $(TARGET_OUT_DIR)/$(PLAT_LINUX_TARGET) $(PLAT_LINUX_PUBLISH_DIR)
-	@$(CP) $(TARGET_OUT_DIR)/$(PLAT_LINUX_TARGET).debug $(PLAT_LINUX_PUBLISH_DEBUG_DIR)
+	@$(ECHO_COLOR) "$(INSTALL_COLOR) $(PLAT_LINUX_COLOR) $(TARGET_OUT_DIR)$(LINUX_TARGET) $(LINUX_TARGET).debug $(INSTALL_PATH_COLOR)"
+	@$(CP) $(TARGET_OUT_DIR)/$(LINUX_TARGET) $(LINUX_PUBLISH_DIR)
+	@$(CP) $(TARGET_OUT_DIR)/$(LINUX_TARGET).debug $(PUBLISH_DEBUG_DIR)
 endif
 ifneq ($(PLAT_LINUX_USER_INS_ITEMS), )
 	@$(ECHO_COLOR) "$(INSTALL_USER_ITEM_COLOR) $(PLAT_LINUX_COLOR) $(notdir $(PLAT_LINUX_USER_INS_ITEMS)) $(INSTALL_PATH_COLOR)"
-	@$(CP) $(PLAT_LINUX_USER_INS_ITEMS) $(PLAT_LINUX_PUBLISH_DIR)
+	@$(CP) $(PLAT_LINUX_USER_INS_ITEMS) $(LINUX_PUBLISH_DIR)
 endif
 ifneq ($(USER_MULTILE_PLATFORM_HEAD_ITEMS), )
 	@$(ECHO_COLOR) "$(INSTALL_MULT_PLAT_COLOR) $(PLAT_LINUX_COLOR) $(notdir $(USER_MULTILE_PLATFORM_HEAD_ITEMS)) $(INSTALL_PATH_COLOR)"
diff --git a/Makefile b/Makefile
index 574c8548f..0833f17b9 100755
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ endif
 
 .PHONY : demo database openrpc ulog klog klog_test conntrack netlink trace redismq usermanager configm webauth matchrule logging ulog_test
 
-all: demo database openrpc ulog klog klog_test conntrack netlink trace redismq usermanager configm webauth matchrule logging ulog_test
+all: database openrpc ulog klog klog_test conntrack netlink trace redismq usermanager configm webauth matchrule logging ulog_test
 
 ifeq ($(OPT), install)
 #$(shell `find ../release -name "*.zip" -delete`)
diff --git a/Platform/build/user.cfg2kernel.Makefile b/Platform/build/user.cfg2kernel.Makefile
index 571d939b8..c73c03c2e 100755
--- a/Platform/build/user.cfg2kernel.Makefile
+++ b/Platform/build/user.cfg2kernel.Makefile
@@ -42,8 +42,8 @@ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)
 PLAT_ARM64_LDFLAGS 	:=
 PLAT_LINUX_LDFLAGS	:= $(PLAT_ARM64_LDFLAGS)
 
-ARM64_LIBS		:= -lnetlinku-$(ARM64_OBJ_TARGET)
-LINUX_LIBS		:= -lnetlinku-$(LINUX_OBJ_TARGET)
+PLAT_ARM64_LIBS		:= -lnetlinku-$(ARM64_OBJ_TARGET)
+PLAT_LINUX_LIBS		:= -lnetlinku-$(LINUX_OBJ_TARGET)
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.configm.Makefile b/Platform/build/user.configm.Makefile
index 484edce3a..f98f326ef 100755
--- a/Platform/build/user.configm.Makefile
+++ b/Platform/build/user.configm.Makefile
@@ -93,11 +93,11 @@ PLAT_LINUX_LDFLAGS :=
 
 COMMON_STD_LIB	:= -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc -lev -ldl
 #gcc libs
-ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lnetlinku-$(ARM64_OBJ_TARGET) -lredismq-$(ARM64_OBJ_TARGET)
-ARM64_LIBS      += -lulogapi-$(ARM64_OBJ_TARGET) -ldatabase-$(ARM64_OBJ_TARGET) $(COMMON_STD_LIB)
+PLAT_ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lnetlinku-$(ARM64_OBJ_TARGET) -lredismq-$(ARM64_OBJ_TARGET)
+PLAT_ARM64_LIBS      += -lulogapi-$(ARM64_OBJ_TARGET) -ldatabase-$(ARM64_OBJ_TARGET) $(COMMON_STD_LIB)
 
-LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lnetlinku-$(LINUX_OBJ_TARGET) -lredismq-$(LINUX_OBJ_TARGET) 
-LINUX_LIBS      += -lulogapi-$(LINUX_OBJ_TARGET) -ldatabase-$(LINUX_OBJ_TARGET) $(COMMON_STD_LIB)
+PLAT_LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lnetlinku-$(LINUX_OBJ_TARGET) -lredismq-$(LINUX_OBJ_TARGET) 
+PLAT_LINUX_LIBS      += -lulogapi-$(LINUX_OBJ_TARGET) -ldatabase-$(LINUX_OBJ_TARGET) $(COMMON_STD_LIB)
 
 
 # this line must be at below of thus, because of...
diff --git a/Platform/build/user.configmapi.Makefile b/Platform/build/user.configmapi.Makefile
index be67dc2b3..08265c5c4 100644
--- a/Platform/build/user.configmapi.Makefile
+++ b/Platform/build/user.configmapi.Makefile
@@ -44,8 +44,8 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
 
 
 #gcc libs
-ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lpthread -lm -lev
-LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lpthread -lm -lev
+PLAT_ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lpthread -lm -lev
+PLAT_LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lpthread -lm -lev
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.configmtest.Makefile b/Platform/build/user.configmtest.Makefile
index df2ff7dfb..24decc8b5 100644
--- a/Platform/build/user.configmtest.Makefile
+++ b/Platform/build/user.configmtest.Makefile
@@ -43,8 +43,8 @@ PLAT_ARM64_LDFLAGS :=
 PLAT_LINUX_LDFLAGS :=
 
 #gcc libs
-ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lconfigmapi-$(ARM64_OBJ_TARGET) -lpthread -lm -lev
-LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lconfigmapi-$(LINUX_OBJ_TARGET) -lpthread -lm -lev
+PLAT_ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lconfigmapi-$(ARM64_OBJ_TARGET) -lpthread -lm -lev
+PLAT_LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lconfigmapi-$(LINUX_OBJ_TARGET) -lpthread -lm -lev
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.database.Makefile b/Platform/build/user.database.Makefile
index e569fc771..c6b95b5d0 100644
--- a/Platform/build/user.database.Makefile
+++ b/Platform/build/user.database.Makefile
@@ -44,8 +44,8 @@ PLAT_LINUX_LDFLAGS := -fPIC -shared
 
 
 #gcc libs
-ARM64_LIBS		:= -lodbc -lcjson
-LINUX_LIBS		:= -lodbc -lcjson
+PLAT_ARM64_LIBS		:= -lodbc -lcjson
+PLAT_LINUX_LIBS		:= -lodbc -lcjson
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.freeauth.Makefile b/Platform/build/user.freeauth.Makefile
index 6918171eb..957a80a02 100755
--- a/Platform/build/user.freeauth.Makefile
+++ b/Platform/build/user.freeauth.Makefile
@@ -44,11 +44,11 @@ PLAT_LINUX_LDFLAGS := $(PLAT_LINUX_LDFLAGS)
 
 COMMON_STD_LIB := -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lev
 #gcc libs
-ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lnetlinku-$(ARM64_OBJ_TARGET) -lredismq-$(ARM64_OBJ_TARGET)
-ARM64_LIBS      += -lulogapi-$(ARM64_OBJ_TARGET) -ldatabase-$(ARM64_OBJ_TARGET) $(COMMON_STD_LIB)
+PLAT_ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lnetlinku-$(ARM64_OBJ_TARGET) -lredismq-$(ARM64_OBJ_TARGET)
+PLAT_ARM64_LIBS      += -lulogapi-$(ARM64_OBJ_TARGET) -ldatabase-$(ARM64_OBJ_TARGET) $(COMMON_STD_LIB)
 
-LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lnetlinku-$(LINUX_OBJ_TARGET) -lredismq-$(LINUX_OBJ_TARGET)
-LINUX_LIBS      +=  -lulogapi-$(LINUX_OBJ_TARGET) -ldatabase-$(LINUX_OBJ_TARGET) $(COMMON_STD_LIB)
+PLAT_LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lnetlinku-$(LINUX_OBJ_TARGET) -lredismq-$(LINUX_OBJ_TARGET)
+PLAT_LINUX_LIBS      +=  -lulogapi-$(LINUX_OBJ_TARGET) -ldatabase-$(LINUX_OBJ_TARGET) $(COMMON_STD_LIB)
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.logging.Makefile b/Platform/build/user.logging.Makefile
index fdb7e0a2e..0aac56ef4 100755
--- a/Platform/build/user.logging.Makefile
+++ b/Platform/build/user.logging.Makefile
@@ -45,8 +45,8 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
 
 COMMON_STD_LIB	:=  -lpthread -lcjson -lev -lm
 #gcc libs
-ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lulogapi-$(ARM64_OBJ_TARGET) -lconfigmapi-$(ARM64_OBJ_TARGET) $(COMMON_STD_LIB)
-LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lulogapi-$(LINUX_OBJ_TARGET) -lconfigmapi-$(LINUX_OBJ_TARGET) $(COMMON_STD_LIB)
+PLAT_ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lulogapi-$(ARM64_OBJ_TARGET) -lconfigmapi-$(ARM64_OBJ_TARGET) $(COMMON_STD_LIB)
+PLAT_LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lulogapi-$(LINUX_OBJ_TARGET) -lconfigmapi-$(LINUX_OBJ_TARGET) $(COMMON_STD_LIB)
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.openrpc.Makefile b/Platform/build/user.openrpc.Makefile
index 19e50a6d1..0c4c6c0d1 100755
--- a/Platform/build/user.openrpc.Makefile
+++ b/Platform/build/user.openrpc.Makefile
@@ -44,8 +44,8 @@ PLAT_LINUX_LDFLAGS :=  $(PLAT_ARM64_LDFLAGS)
 
 
 #gcc libs
-ARM64_LIBS		:= -lpthread -lm -lev
-LINUX_LIBS		:= -lpthread -lm -lev
+PLAT_ARM64_LIBS		:= -lpthread -lm -lev
+PLAT_LINUX_LIBS		:= -lpthread -lm -lev
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.pdeliv.rcvtest.Makefile b/Platform/build/user.pdeliv.rcvtest.Makefile
index 5544ade56..ab4938924 100644
--- a/Platform/build/user.pdeliv.rcvtest.Makefile
+++ b/Platform/build/user.pdeliv.rcvtest.Makefile
@@ -42,8 +42,8 @@ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)
 PLAT_ARM64_LDFLAGS 	:=
 PLAT_LINUX_LDFLAGS	:= $(PLAT_ARM64_LDFLAGS)
 
-ARM64_LIBS		:= -lnetlinku-$(ARM64_OBJ_TARGET)
-LINUX_LIBS		:= -lnetlinku-$(LINUX_OBJ_TARGET)
+PLAT_ARM64_LIBS		:= -lnetlinku-$(ARM64_OBJ_TARGET)
+PLAT_LINUX_LIBS		:= -lnetlinku-$(LINUX_OBJ_TARGET)
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.pdeliv_u.Makefile b/Platform/build/user.pdeliv_u.Makefile
index c8c06f2ef..9fbe562b8 100755
--- a/Platform/build/user.pdeliv_u.Makefile
+++ b/Platform/build/user.pdeliv_u.Makefile
@@ -42,8 +42,8 @@ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)
 PLAT_ARM64_LDFLAGS 	:=
 PLAT_LINUX_LDFLAGS	:= $(PLAT_ARM64_LDFLAGS)
 
-ARM64_LIBS		:= -lnetlinku-$(ARM64_OBJ_TARGET)
-LINUX_LIBS		:= -lnetlinku-$(LINUX_OBJ_TARGET)
+PLAT_ARM64_LIBS		:= -lnetlinku-$(ARM64_OBJ_TARGET)
+PLAT_LINUX_LIBS		:= -lnetlinku-$(LINUX_OBJ_TARGET)
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.pdelivrcv.test.Makefile b/Platform/build/user.pdelivrcv.test.Makefile
index d2133d60d..c2b4127b6 100644
--- a/Platform/build/user.pdelivrcv.test.Makefile
+++ b/Platform/build/user.pdelivrcv.test.Makefile
@@ -42,8 +42,8 @@ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)
 PLAT_ARM64_LDFLAGS 	:=
 PLAT_LINUX_LDFLAGS	:= $(PLAT_ARM64_LDFLAGS)
 
-ARM64_LIBS		:=
-LINUX_LIBS		:=
+PLAT_ARM64_LIBS		:=
+PLAT_LINUX_LIBS		:=
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.redismq.Makefile b/Platform/build/user.redismq.Makefile
index 14bbdbdb1..c4aa5fe34 100644
--- a/Platform/build/user.redismq.Makefile
+++ b/Platform/build/user.redismq.Makefile
@@ -44,8 +44,8 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
 
 
 #gcc libs
-ARM64_LIBS		:=  -lhiredis -ljson-c -levent
-LINUX_LIBS		:=  -lhiredis -ljson-c -levent
+PLAT_ARM64_LIBS		:=  -lhiredis -ljson-c -levent
+PLAT_LINUX_LIBS		:=  -lhiredis -ljson-c -levent
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.rpdb.Makefile b/Platform/build/user.rpdb.Makefile
index f17a52c3c..bd8039f02 100644
--- a/Platform/build/user.rpdb.Makefile
+++ b/Platform/build/user.rpdb.Makefile
@@ -44,8 +44,8 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
 
 
 #gcc libs
-ARM64_LIBS		:=  
-LINUX_LIBS		:=  
+PLAT_ARM64_LIBS		:=  
+PLAT_LINUX_LIBS		:=  
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.trace.api.Makefile b/Platform/build/user.trace.api.Makefile
index 741818d2a..e5be1bb82 100755
--- a/Platform/build/user.trace.api.Makefile
+++ b/Platform/build/user.trace.api.Makefile
@@ -44,8 +44,8 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
 
 
 #gcc libs
-ARM64_LIBS		:= -lnetlinku-$(ARM64_OBJ_TARGET)
-LINUX_LIBS		:= -lnetlinku-$(LINUX_OBJ_TARGET)
+PLAT_ARM64_LIBS		:= -lnetlinku-$(ARM64_OBJ_TARGET)
+PLAT_LINUX_LIBS		:= -lnetlinku-$(LINUX_OBJ_TARGET)
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.trace.test.Makefile b/Platform/build/user.trace.test.Makefile
index 825b46468..c292bcc68 100755
--- a/Platform/build/user.trace.test.Makefile
+++ b/Platform/build/user.trace.test.Makefile
@@ -42,8 +42,8 @@ PLAT_ARM64_LDFLAGS :=
 PLAT_LINUX_LDFLAGS :=
 
 #gcc libs
-ARM64_LIBS		:= -ltraceapi-$(ARM64_OBJ_TARGET) -lnetlinku-$(ARM64_OBJ_TARGET) -lpthread
-LINUX_LIBS		:= -ltraceapi-$(LINUX_OBJ_TARGET) -lnetlinku-$(LINUX_OBJ_TARGET) -lpthread
+PLAT_ARM64_LIBS		:= -ltraceapi-$(ARM64_OBJ_TARGET) -lnetlinku-$(ARM64_OBJ_TARGET) -lpthread
+PLAT_LINUX_LIBS		:= -ltraceapi-$(LINUX_OBJ_TARGET) -lnetlinku-$(LINUX_OBJ_TARGET) -lpthread
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.ulog.log_sched.Makefile b/Platform/build/user.ulog.log_sched.Makefile
index 17b204275..cec1c16bb 100755
--- a/Platform/build/user.ulog.log_sched.Makefile
+++ b/Platform/build/user.ulog.log_sched.Makefile
@@ -43,8 +43,8 @@ PLAT_ARM64_LDFLAGS  :=
 PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
 
 #gcc libs
-ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lulogapi-$(ARM64_OBJ_TARGET) -lpthread -lm -lev
-LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lulogapi-$(LINUX_OBJ_TARGET) -lpthread  -lm -lev
+PLAT_ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lulogapi-$(ARM64_OBJ_TARGET) -lpthread -lm -lev
+PLAT_LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lulogapi-$(LINUX_OBJ_TARGET) -lpthread  -lm -lev
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Platform/build/user.ulog.ulog-test.Makefile b/Platform/build/user.ulog.ulog-test.Makefile
index ce5b2b291..d0afd8d33 100644
--- a/Platform/build/user.ulog.ulog-test.Makefile
+++ b/Platform/build/user.ulog.ulog-test.Makefile
@@ -43,8 +43,8 @@ PLAT_ARM64_LDFLAGS  :=
 PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
 
 #gcc libs
-ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lulogapi-$(ARM64_OBJ_TARGET) -lpthread -lm -lev
-LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lulogapi-$(LINUX_OBJ_TARGET) -lpthread  -lm -lev
+PLAT_ARM64_LIBS		:= -lopenrpc-$(ARM64_OBJ_TARGET) -lulogapi-$(ARM64_OBJ_TARGET) -lpthread -lm -lev
+PLAT_LINUX_LIBS		:= -lopenrpc-$(LINUX_OBJ_TARGET) -lulogapi-$(LINUX_OBJ_TARGET) -lpthread  -lm -lev
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Product/build/user.demo.Makefile b/Product/build/user.demo.Makefile
index 05e4cfc79..be131effe 100755
--- a/Product/build/user.demo.Makefile
+++ b/Product/build/user.demo.Makefile
@@ -40,8 +40,8 @@ PLAT_LINUX_CFLAGS		+= $(COMMON_CFLAGS)
 PLAT_ARM64_CFLAGS		+= $(COMMON_CFLAGS)
 
 COMMON_LIBS				:= -lcjson
-LINUX_LIBS				:= $(COMMON_LIBS)
-ARM64_LIBS				:= $(COMMON_LIBS)
+PLAT_LINUX_LIBS				:= $(COMMON_LIBS)
+PLAT_ARM64_LIBS				:= $(COMMON_LIBS)
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Product/build/user.usermanager-auth.Makefile b/Product/build/user.usermanager-auth.Makefile
index dd7a06c7f..437eb6c59 100644
--- a/Product/build/user.usermanager-auth.Makefile
+++ b/Product/build/user.usermanager-auth.Makefile
@@ -45,8 +45,8 @@ PLATLIB_DIR  := ../../Platform/build/debug
 
 COMMON_STD_LIB  := -lcjson -lpthread -lm -lodbc
 #gcc libs
-ARM64_LIBS		:= -ldatabase-$(ARM64_OBJ_TARGET) $(COMMON_STD_LIB)
-LINUX_LIBS		:= -ldatabase-$(LINUX_OBJ_TARGET) $(COMMON_STD_LIB)
+PLAT_ARM64_LIBS		:= -ldatabase-$(ARM64_OBJ_TARGET) $(COMMON_STD_LIB)
+PLAT_LINUX_LIBS		:= -ldatabase-$(LINUX_OBJ_TARGET) $(COMMON_STD_LIB)
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Product/build/user.usermanager-test.Makefile b/Product/build/user.usermanager-test.Makefile
index cb92ccb0d..020db27e3 100644
--- a/Product/build/user.usermanager-test.Makefile
+++ b/Product/build/user.usermanager-test.Makefile
@@ -57,11 +57,11 @@ PLATLIB_DIR  := ../../Platform/build/debug
 
 COMMON_LIBS := -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc -ldl
 #gcc libs
-ARM64_LIBS		:= $(COMMON_LIBS)
-ARM64_LIBS      += -luserauthapi-$(ARM64_OBJ_TARGET) -lredismq-$(ARM64_OBJ_TARGET) -ldatabase-$(ARM64_OBJ_TARGET)
+PLAT_ARM64_LIBS		:= $(COMMON_LIBS)
+PLAT_ARM64_LIBS      += -luserauthapi-$(ARM64_OBJ_TARGET) -lredismq-$(ARM64_OBJ_TARGET) -ldatabase-$(ARM64_OBJ_TARGET)
 
-LINUX_LIBS		:= $(COMMON_LIBS)
-LINUX_LIBS		+= -luserauthapi-$(LINUX_OBJ_TARGET) -lredismq-$(LINUX_OBJ_TARGET) -ldatabase-$(LINUX_OBJ_TARGET)
+PLAT_LINUX_LIBS		:= $(COMMON_LIBS)
+PLAT_LINUX_LIBS		+= -luserauthapi-$(LINUX_OBJ_TARGET) -lredismq-$(LINUX_OBJ_TARGET) -ldatabase-$(LINUX_OBJ_TARGET)
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile
diff --git a/Product/build/user.web-auth.Makefile b/Product/build/user.web-auth.Makefile
index 9a1d05000..655794791 100644
--- a/Product/build/user.web-auth.Makefile
+++ b/Product/build/user.web-auth.Makefile
@@ -43,8 +43,8 @@ PLAT_ARM64_LDFLAGS := -L ../../Platform/build/debug
 PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
 
 #gcc libs
-ARM64_LIBS		:= -luserauthapi-$(ARM64_OBJ_TARGET) -ldatabase-$(ARM64_OBJ_TARGET)
-LINUX_LIBS		:= -lcjson -luserauthapi-$(LINUX_OBJ_TARGET) -ldatabase-$(LINUX_OBJ_TARGET)
+PLAT_ARM64_LIBS		:= -luserauthapi-$(ARM64_OBJ_TARGET) -ldatabase-$(ARM64_OBJ_TARGET)
+PLAT_LINUX_LIBS		:= -lcjson -luserauthapi-$(LINUX_OBJ_TARGET) -ldatabase-$(LINUX_OBJ_TARGET)
 
 # this line must be at below of thus, because of...
 include ../../Common/common.Makefile