From 5aeb82adcdbb15c7de6c30a9ea7b04188cc96938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=98=95?= Date: Wed, 14 Aug 2019 11:33:47 +0800 Subject: [PATCH] =?UTF-8?q?Mod=20aaa-12=20=E4=BF=AE=E6=94=B9=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=82=E6=95=B0=EF=BC=8C=E7=94=B1./libxxxx.so=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20-L=20.=20-lxxxx=20RCA=EF=BC=9A=20SOL?= =?UTF-8?q?=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9Ahuangxin=20?= =?UTF-8?q?=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9Ahuangxin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Common/common.Makefile | 4 +-- Platform/build/user.cfg2kernel.Makefile | 14 ++++---- Platform/build/user.configm.Makefile | 26 +++++++------- Platform/build/user.configmapi.Makefile | 18 +++++----- Platform/build/user.configmtest.Makefile | 22 ++++++------ Platform/build/user.database.Makefile | 26 +++++++------- Platform/build/user.freeauth.Makefile | 37 +++++++++----------- Platform/build/user.logging.Makefile | 14 ++++---- Platform/build/user.netlink_uapi.Makefile | 8 ++--- Platform/build/user.openrpc.Makefile | 20 +++++------ Platform/build/user.pdeliv.rcvtest.Makefile | 14 ++++---- Platform/build/user.pdeliv_u.Makefile | 14 ++++---- Platform/build/user.pdelivrcv.test.Makefile | 22 ++++++------ Platform/build/user.redismq.Makefile | 22 ++++++------ Platform/build/user.trace.api.Makefile | 14 ++++---- Platform/build/user.trace.test.Makefile | 18 +++++----- Platform/build/user.ulog.api.Makefile | 8 ++--- Platform/build/user.ulog.log_sched.Makefile | 14 ++++---- Product/build/user.usermanager-auth.Makefile | 12 +++---- Product/build/user.usermanager-test.Makefile | 30 ++++++++-------- Product/build/user.web-auth.Makefile | 4 +-- 21 files changed, 177 insertions(+), 184 deletions(-) diff --git a/Common/common.Makefile b/Common/common.Makefile index 02f81a941..872a30dbf 100755 --- a/Common/common.Makefile +++ b/Common/common.Makefile @@ -337,7 +337,7 @@ PLAT_LINUX_TARGET := $(TARGET_PREFIX)$(TARGET_NAME)-linux$(TARGET_EXT) ifeq ($(PLAT_ARM64), TRUE) BUILD_TARGET += $(PLAT_ARM64_TARGET) PLAT_ARM64_CFLAGS += -DPLATFORM_ARM64 $(ARM64_EXTFLAG) - PLAT_ARM64_LDFLAGS += $(ARM64_DRV_LDFLAGS) + PLAT_ARM64_LDFLAGS += $(ARM64_DRV_LDFLAGS) -L . PLAT_ARM64_LIBFLAGS := $(ARM64_LIBFLAGS) PLAT_ARM64_LIBS := $(ARM64_LIBS) endif @@ -346,7 +346,7 @@ endif ifeq ($(PLAT_LINUX), TRUE) BUILD_TARGET += $(PLAT_LINUX_TARGET) PLAT_LINUX_CFLAGS += -DPLATFORM_LINUX $(LINUX_EXTFLAG) - PLAT_LINUX_LDFLAGS += $(LINUX_DRV_LDFLAGS) + PLAT_LINUX_LDFLAGS += $(LINUX_DRV_LDFLAGS) -L . PLAT_LINUX_LIBFLAGS := $(LINUX_LIBFLAGS) PLAT_LINUX_LIBS := $(LINUX_LIBS) endif diff --git a/Platform/build/user.cfg2kernel.Makefile b/Platform/build/user.cfg2kernel.Makefile index 5767cbb74..a35db0f4b 100755 --- a/Platform/build/user.cfg2kernel.Makefile +++ b/Platform/build/user.cfg2kernel.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=cfgchannel_sample -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = EXE - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -38,11 +38,11 @@ PLAT_ARM64_CFLAGS := -I../../Common -I../user/netlink_uapi PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) -PLAT_ARM64_LDFLAGS := +PLAT_ARM64_LDFLAGS := PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) -ARM64_LIBS := ./libnetlinku-arm64.so -LINUX_LIBS := ./libnetlinku-linux.so +ARM64_LIBS := -lnetlinku-arm64 +LINUX_LIBS := -lnetlinku-linux @@ -57,7 +57,7 @@ USER_CLEAN_ITEMS += ./libnetlinku-linux.so endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.configm.Makefile b/Platform/build/user.configm.Makefile index 76964e179..576978ab2 100755 --- a/Platform/build/user.configm.Makefile +++ b/Platform/build/user.configm.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=configm -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = EXE - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -40,34 +40,34 @@ COMMON_SRCS = configserver.c \ PLAT_LINUX_SRCS = $(COMMON_SRCS) PLAT_ARM64_SRCS = $(COMMON_SRCS) -COMMOM_CFLAGS = -I../user/configm/config-server/include -I../../Common -I../common/redismq -I../common/database -I../common/configm -I../common/rpc -I../common/rpc/hashtable -I../common/ulog -I../user/configm/config-server/netconfig/ -I../user/configm/config-server/netconfig/bridge/include +COMMOM_CFLAGS = -I../user/configm/config-server/include -I../../Common -I../common/redismq -I../common/database -I../common/configm -I../common/rpc -I../common/rpc/hashtable -I../common/ulog -I../user/configm/config-server/netconfig/ -I../user/configm/config-server/netconfig/bridge/include # gcc CFLAGS PLAT_ARM64_CFLAGS := $(COMMOM_CFLAGS) -I../thirdparty/arm64/usr/local/include PLAT_LINUX_CFLAGS := $(COMMOM_CFLAGS) -I../thirdparty/x86_64/usr/local/include -PLAT_ARM64_LDFLAGS := -PLAT_LINUX_LDFLAGS := +PLAT_ARM64_LDFLAGS := +PLAT_LINUX_LDFLAGS := #gcc libs -ARM64_LIBS := ../thirdparty/arm64/libev-arm64.so ./libopenrpc-arm64.so ./libnetlinku-arm64.so ./libredismq-arm64.so ./libulogapi-arm64.so ./libdatabase-arm64.so -ARM64_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc +ARM64_LIBS := -lopenrpc-arm64 -lnetlinku-arm64 -lredismq-arm64 -lulogapi-arm64 -ldatabase-arm64 +ARM64_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc -lev -LINUX_LIBS := ../thirdparty/x86_64/libev-linux.so ./libopenrpc-linux.so ./libnetlinku-linux.so ./libredismq-linux.so ./libulogapi-linux.so ./libdatabase-linux.so -LINUX_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc +LINUX_LIBS := -lopenrpc-linux -lnetlinku-linux -lredismq-linux -lulogapi-linux -ldatabase-linux +LINUX_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc -lev ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ../thirdparty/arm64/libev-arm64.so ./debug/libopenrpc-arm64.so ./debug/libnetlinku-arm64.so ./debug/libredismq-arm64.so ./debug/libdatabase-arm64.so +DEPEND_LIB += ./debug/libopenrpc-arm64.so ./debug/libnetlinku-arm64.so ./debug/libredismq-arm64.so ./debug/libdatabase-arm64.so USER_CLEAN_ITEMS += ./libopenrpc-arm64.so ./libnetlinku-arm64.so ./libredismq-arm64.so ./libdatabase-arm64.so endif ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ../thirdparty/x86_64/libev-linux.so ./debug/libopenrpc-linux.so ./libnetlinku-linux.so ./debug/libredismq-linux.so ./debug/libdatabase-linux.so +DEPEND_LIB += ./debug/libopenrpc-linux.so ./libnetlinku-linux.so ./debug/libredismq-linux.so ./debug/libdatabase-linux.so USER_CLEAN_ITEMS += ./libopenrpc-linux.so ./libnetlinku-linux.so ./libredismq-linux.so ./libdatabase-linux.so endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.configmapi.Makefile b/Platform/build/user.configmapi.Makefile index 177f5341d..09721d752 100644 --- a/Platform/build/user.configmapi.Makefile +++ b/Platform/build/user.configmapi.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=libconfigmapi -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = DLL - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -38,25 +38,25 @@ PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common/configm -I../common/rpc - PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) -PLAT_ARM64_LDFLAGS := -fPIC -shared +PLAT_ARM64_LDFLAGS := -fPIC -shared PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) #gcc libs -ARM64_LIBS := ../thirdparty/arm64/libev-arm64.so ./libopenrpc-arm64.so -lpthread -lm -LINUX_LIBS := ../thirdparty/x86_64/libev-linux.so ./libopenrpc-linux.so -lpthread -lm +ARM64_LIBS := -lopenrpc-arm64 -lpthread -lm -lev +LINUX_LIBS := -lopenrpc-linux -lpthread -lm -lev ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ../thirdparty/arm64/libev-arm64.so ./debug/libopenrpc-arm64.so +DEPEND_LIB += ./debug/libopenrpc-arm64.so USER_CLEAN_ITEMS += ./libopenrpc-arm64.so endif ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ../thirdparty/x86_64/libev-linux.so ./debug/libopenrpc-linux.so +DEPEND_LIB += ./debug/libopenrpc-linux.so USER_CLEAN_ITEMS += ./libopenrpc-linux.so endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.configmtest.Makefile b/Platform/build/user.configmtest.Makefile index 4b446d8f2..4db2c1a23 100644 --- a/Platform/build/user.configmtest.Makefile +++ b/Platform/build/user.configmtest.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=configmtest -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = EXE - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -27,7 +27,7 @@ VPATH = ../user/configm/config-test # set the source file, don't used .o because of ... -COMMON_SRCS = configtest.c +COMMON_SRCS = configtest.c # MRS Board Source Files PLAT_LINUX_SRCS = $(COMMON_SRCS) @@ -38,25 +38,25 @@ PLAT_ARM64_CFLAGS := -I../user/configm/config-server/include -I../../Common -I.. PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) -PLAT_ARM64_LDFLAGS := -PLAT_LINUX_LDFLAGS := +PLAT_ARM64_LDFLAGS := +PLAT_LINUX_LDFLAGS := #gcc libs -ARM64_LIBS := ../thirdparty/arm64/libev-arm64.so ./libopenrpc-arm64.so ./libconfigmapi-arm64.so -lpthread -lm -LINUX_LIBS := ../thirdparty/x86_64/libev-linux.so ./libopenrpc-linux.so ./libconfigmapi-linux.so -lpthread -lm +ARM64_LIBS := -lopenrpc-arm64 -lconfigmapi-arm64 -lpthread -lm -lev +LINUX_LIBS := -lopenrpc-linux -lconfigmapi-linux -lpthread -lm -lev ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ../thirdparty/arm64/libev-arm64.so ./debug/libopenrpc-arm64.so ./debug/libconfigmapi-arm64.so +DEPEND_LIB += ./debug/libopenrpc-arm64.so ./debug/libconfigmapi-arm64.so USER_CLEAN_ITEMS += ./libconfigmapi-arm64.so endif ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ../thirdparty/x86_64/libev-linux.so ./debug/libopenrpc-linux.so ./debug/libconfigmapi-linux.so +DEPEND_LIB += ./debug/libopenrpc-linux.so ./debug/libconfigmapi-linux.so USER_CLEAN_ITEMS += ./libconfigmapi-linux.so endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.database.Makefile b/Platform/build/user.database.Makefile index e8f0df007..157514a4c 100644 --- a/Platform/build/user.database.Makefile +++ b/Platform/build/user.database.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=libdatabase -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = DLL - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -34,29 +34,29 @@ PLAT_LINUX_SRCS = $(COMMON_DB) PLAT_ARM64_SRCS = $(COMMON_DB) # gcc CFLAGS -PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common/database -I../thirdparty/arm64/usr/local/include/database -I../thirdparty/arm64/usr/local/lib -PLAT_LINUX_CFLAGS := -fPIC -I../../Common -I../common/database -I../thirdparty/x86_64/usr/local/include/database -I../thirdparty/x86_64/usr/local/lib +PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common/database +PLAT_LINUX_CFLAGS := -fPIC -I../../Common -I../common/database -PLAT_ARM64_LDFLAGS := -fPIC -shared +PLAT_ARM64_LDFLAGS := -fPIC -shared PLAT_LINUX_LDFLAGS := -fPIC -shared #gcc libs -ARM64_LIBS := ../thirdparty/arm64/usr/local/lib/libodbc.so -lcjson -LINUX_LIBS := ../thirdparty/x86_64/usr/local/lib/libodbc.so -lcjson +ARM64_LIBS := -lodbc -lcjson +LINUX_LIBS := -lodbc -lcjson ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ../thirdparty/arm64/usr/local/lib/libodbc.so -lcjson -USER_CLEAN_ITEMS += +DEPEND_LIB += +USER_CLEAN_ITEMS += endif ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ../thirdparty/x86_64/usr/local/lib/libodbc.so -lcjson -USER_CLEAN_ITEMS += +DEPEND_LIB += +USER_CLEAN_ITEMS += endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.freeauth.Makefile b/Platform/build/user.freeauth.Makefile index b76d32bc2..ace6d3c8c 100755 --- a/Platform/build/user.freeauth.Makefile +++ b/Platform/build/user.freeauth.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=freeauth -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = EXE - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -26,44 +26,41 @@ VPATH = ../user/configm/config-server # set the source file, don't used .o because of ... -COMMON_SRCS = web_config/auth_parameters.c +COMMON_SRCS = web_config/auth_parameters.c # MRS Board Source Files PLAT_LINUX_SRCS = $(COMMON_SRCS) PLAT_ARM64_SRCS = $(COMMON_SRCS) -COMMOM_CFLAGS = -I../user/configm/config-server/include -I../../Common -I../common/redismq -I../common/database -I../common/configm -I../common/rpc -I../common/rpc/hashtable -I../common/ulog -I../user/configm/config-server/netconfig/ -I../user/configm/config-server/netconfig/bridge/include +COMMOM_CFLAGS = -I../user/configm/config-server/include -I../../Common -I../common/redismq -I../common/database -I../common/configm -I../common/rpc -I../common/rpc/hashtable -I../common/ulog -I../user/configm/config-server/netconfig/ -I../user/configm/config-server/netconfig/bridge/include # gcc CFLAGS -PLAT_ARM64_CFLAGS := $(COMMOM_CFLAGS) -I../thirdparty/arm64/usr/local/include -PLAT_LINUX_CFLAGS := $(COMMOM_CFLAGS) -I../thirdparty/x86_64/usr/local/include +PLAT_ARM64_CFLAGS := $(COMMOM_CFLAGS) +PLAT_LINUX_CFLAGS := $(COMMOM_CFLAGS) -PLAT_ARM64_LDFLAGS := -PLAT_LINUX_LDFLAGS := +PLAT_ARM64_LDFLAGS := +PLAT_LINUX_LDFLAGS := #gcc libs -ARM64_LIBS := ../thirdparty/arm64/libev-arm64.so ./libopenrpc-arm64.so ./libnetlinku-arm64.so ./libredismq-arm64.so ./libdatabase-arm64.so -ARM64_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -ARM64_LIBS += ../thirdparty/arm64/usr/local/lib/libodbc.so +ARM64_LIBS := -lopenrpc-arm64 -lnetlinku-arm64 -lredismq-arm64 -ldatabase-arm64 +LINUX_LIBS := -lopenrpc-linux -lnetlinku-linux -lredismq-linux -ldatabase-linux +ARM64_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lev -lodbc -LINUX_LIBS := ../thirdparty/x86_64/libev-linux.so ./libopenrpc-linux.so ./libnetlinku-linux.so ./libredismq-linux.so ./libdatabase-linux.so -LINUX_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -LINUX_LIBS += ../thirdparty/x86_64/usr/local/lib/libodbc.so + +LINUX_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ../thirdparty/arm64/libev-arm64.so ./debug/libopenrpc-arm64.so ./debug/libnetlinku-arm64.so ./debug/libredismq-arm64.so ./debug/libdatabase-arm64.so -DEPEND_LIB += ../thirdparty/arm64/usr/local/lib/libodbc.so +DEPEND_LIB += ./debug/libopenrpc-arm64.so ./debug/libnetlinku-arm64.so ./debug/libredismq-arm64.so ./debug/libdatabase-arm64.so USER_CLEAN_ITEMS += ./libopenrpc-arm64.so ./libnetlinku-arm64.so ./libredismq-arm64.so ./libdatabase-arm64.so endif ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ../thirdparty/x86_64/libev-linux.so ./debug/libopenrpc-linux.so ./libnetlinku-linux.so ./debug/libredismq-linux.so ./debug/libdatabase-linux.so -DEPEND_LIB += ../thirdparty/x86_64/usr/local/lib/libodbc.so +DEPEND_LIB += ./debug/libopenrpc-linux.so ./libnetlinku-linux.so ./debug/libredismq-linux.so ./debug/libdatabase-linux.so USER_CLEAN_ITEMS += ./libopenrpc-linux.so ./libnetlinku-linux.so ./libredismq-linux.so ./libdatabase-linux.so endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.logging.Makefile b/Platform/build/user.logging.Makefile index b25819c71..08f34320a 100755 --- a/Platform/build/user.logging.Makefile +++ b/Platform/build/user.logging.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=logging -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = EXE - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -38,12 +38,12 @@ PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common -I../common/rpc -I../commo PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) -PLAT_ARM64_LDFLAGS := +PLAT_ARM64_LDFLAGS := PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) #gcc libs -ARM64_LIBS := ./libopenrpc-arm64.so ./libulogapi-arm64.so ../thirdparty/arm64/libev-arm64.so ./libconfigmapi-arm64.so -lpthread -lcjson -LINUX_LIBS := ./libopenrpc-linux.so ./libulogapi-linux.so ../thirdparty/x86_64/libev-linux.so ./libconfigmapi-linux.so -lpthread -lcjson +ARM64_LIBS := -lopenrpc-arm64 -lulogapi-arm64 -lconfigmapi-arm64 -lpthread -lcjson +LINUX_LIBS := -lopenrpc-linux -lulogapi-linux -lconfigmapi-linux -lpthread -lcjson ifeq ($(PLAT_ARM64), TRUE) DEPEND_LIB += ./debug/libopenrpc-arm64.so ./debug/libulogapi-arm64.so @@ -55,7 +55,7 @@ DEPEND_LIB += ./debug/libopenrpc-linux.so ./debug/libulogapi-linux.so USER_CLEAN_ITEMS += ./libopenrpc-linux.so ./libulogapi-linux.so endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.netlink_uapi.Makefile b/Platform/build/user.netlink_uapi.Makefile index f941b0284..08240686d 100755 --- a/Platform/build/user.netlink_uapi.Makefile +++ b/Platform/build/user.netlink_uapi.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=libnetlinku -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = DLL - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -41,7 +41,7 @@ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) PLAT_ARM64_LDFLAGS := -fPIC -shared PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifeq ($(MAKECMDGOALS), ) diff --git a/Platform/build/user.openrpc.Makefile b/Platform/build/user.openrpc.Makefile index cdcb0ec13..8e716e314 100755 --- a/Platform/build/user.openrpc.Makefile +++ b/Platform/build/user.openrpc.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=libopenrpc -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = DLL - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -43,20 +43,20 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) #gcc libs -ARM64_LIBS := ../thirdparty/arm64/libev-arm64.so -lpthread -lm -LINUX_LIBS := ../thirdparty/x86_64/libev-linux.so -lpthread -lm +ARM64_LIBS := -lpthread -lm -lev +LINUX_LIBS := -lpthread -lm -lev ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ../thirdparty/arm64/libev-arm64.so -USER_CLEAN_ITEMS += +DEPEND_LIB += +USER_CLEAN_ITEMS += endif ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ../thirdparty/x86_64/libev-linux.so -USER_CLEAN_ITEMS += +DEPEND_LIB += +USER_CLEAN_ITEMS += endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.pdeliv.rcvtest.Makefile b/Platform/build/user.pdeliv.rcvtest.Makefile index 19f024de2..38e8c0e73 100644 --- a/Platform/build/user.pdeliv.rcvtest.Makefile +++ b/Platform/build/user.pdeliv.rcvtest.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=pdeliv_rcvtest -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = EXE - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -38,11 +38,11 @@ PLAT_ARM64_CFLAGS := -I../../Common -I../user/netlink_uapi PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) -PLAT_ARM64_LDFLAGS := +PLAT_ARM64_LDFLAGS := PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) -ARM64_LIBS := ./libnetlinku-arm64.so -LINUX_LIBS := ./libnetlinku-linux.so +ARM64_LIBS := -lnetlinku-arm64 +LINUX_LIBS := -lnetlinku-linux @@ -57,7 +57,7 @@ USER_CLEAN_ITEMS += ./libnetlinku-linux.so endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.pdeliv_u.Makefile b/Platform/build/user.pdeliv_u.Makefile index 3429df4d4..2ecf3a164 100755 --- a/Platform/build/user.pdeliv_u.Makefile +++ b/Platform/build/user.pdeliv_u.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=pdeliv -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = EXE - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -38,11 +38,11 @@ PLAT_ARM64_CFLAGS := -I../../Common -I../user/netlink_uapi PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) -PLAT_ARM64_LDFLAGS := +PLAT_ARM64_LDFLAGS := PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) -ARM64_LIBS := ./libnetlinku-arm64.so -LINUX_LIBS := ./libnetlinku-linux.so +ARM64_LIBS := -lnetlinku-arm64 +LINUX_LIBS := -lnetlinku-linux @@ -57,7 +57,7 @@ USER_CLEAN_ITEMS += ./libnetlinku-linux.so endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.pdelivrcv.test.Makefile b/Platform/build/user.pdelivrcv.test.Makefile index eae31ead2..29e4128dd 100644 --- a/Platform/build/user.pdelivrcv.test.Makefile +++ b/Platform/build/user.pdelivrcv.test.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=pdeliv -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = EXE - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -38,26 +38,26 @@ PLAT_ARM64_CFLAGS := -I../../Common -I../user/netlink_uapi PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) -PLAT_ARM64_LDFLAGS := +PLAT_ARM64_LDFLAGS := PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) -ARM64_LIBS := ./pdeliv-rcvtest-arm64.so -LINUX_LIBS := ./pdeliv-rcvtest-linux.so +ARM64_LIBS := +LINUX_LIBS := ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ./debug/libnetlinku-arm64.so -USER_CLEAN_ITEMS += ./libnetlinku-arm64.so +DEPEND_LIB += ./debug/libpdeliv-rcvtest.so +USER_CLEAN_ITEMS += endif ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ./debug/libnetlinku-linux.so -USER_CLEAN_ITEMS += ./libnetlinku-linux.so +DEPEND_LIB += ./debug/libpdeliv-rcvtest-linux.so +USER_CLEAN_ITEMS += endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.redismq.Makefile b/Platform/build/user.redismq.Makefile index b25bd4d27..9030f5886 100644 --- a/Platform/build/user.redismq.Makefile +++ b/Platform/build/user.redismq.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=libredismq -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = DLL - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -34,11 +34,11 @@ PLAT_LINUX_SRCS = $(COMMON_SRCS) PLAT_ARM64_SRCS = $(COMMON_SRCS) # gcc CFLAGS -PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common/redismq -I../thirdparty/arm64/usr/local/include -PLAT_LINUX_CFLAGS := -fPIC -I../../Common -I../common/redismq -I../thirdparty/x86_64/usr/local/include +PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common/redismq +PLAT_LINUX_CFLAGS := -fPIC -I../../Common -I../common/redismq -PLAT_ARM64_LDFLAGS := -fPIC -shared -lpthread +PLAT_ARM64_LDFLAGS := -fPIC -shared PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) @@ -47,16 +47,16 @@ ARM64_LIBS := -lhiredis -ljson-c -levent LINUX_LIBS := -lhiredis -ljson-c -levent ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ../thirdparty/arm64/usr/local/lib/libjemalloc.so -USER_CLEAN_ITEMS += +DEPEND_LIB += +USER_CLEAN_ITEMS += endif ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ../thirdparty/x86_64/usr/local/lib/libjemalloc.so -USER_CLEAN_ITEMS += +DEPEND_LIB += +USER_CLEAN_ITEMS += endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.trace.api.Makefile b/Platform/build/user.trace.api.Makefile index 10c1e2209..83de65f77 100755 --- a/Platform/build/user.trace.api.Makefile +++ b/Platform/build/user.trace.api.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=libtraceapi -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = DLL - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -38,13 +38,13 @@ PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common/trace -I../user/netlink_ua PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) -PLAT_ARM64_LDFLAGS := -fPIC -shared +PLAT_ARM64_LDFLAGS := -fPIC -shared PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) #gcc libs -ARM64_LIBS := ./libnetlinku-arm64.so -LINUX_LIBS := ./libnetlinku-linux.so +ARM64_LIBS := -lnetlinku-arm64 +LINUX_LIBS := -lnetlinku-linux ifeq ($(PLAT_ARM64), TRUE) DEPEND_LIB += ./debug/libnetlinku-arm64.so @@ -56,7 +56,7 @@ DEPEND_LIB += ./debug/libnetlinku-linux.so USER_CLEAN_ITEMS += ./libnetlinku-linux.so endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.trace.test.Makefile b/Platform/build/user.trace.test.Makefile index a9f211db5..83b49f7a7 100755 --- a/Platform/build/user.trace.test.Makefile +++ b/Platform/build/user.trace.test.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=test-trace -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = EXE - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -39,24 +39,24 @@ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) PLAT_ARM64_LDFLAGS := -lpthread -PLAT_LINUX_LDFLAGS := +PLAT_LINUX_LDFLAGS := #gcc libs -ARM64_LIBS := ./libtraceapi-arm64.so ./libnetlinku-arm64.so -LINUX_LIBS := ./libtraceapi-linux.so ./libnetlinku-linux.so -lpthread +ARM64_LIBS := -ltraceapi-arm64 -lnetlinku-arm64 +LINUX_LIBS := -ltraceapi-linux -lnetlinku-linux -lpthread ifeq ($(PLAT_ARM64), TRUE) DEPEND_LIB += ./debug/libtraceapi-arm64.so ./debug/libnetlinku-arm64.so -USER_CLEAN_ITEMS += ./libtraceapi-arm64.so +USER_CLEAN_ITEMS += ./libtraceapi-arm64.so ./libnetlinku-arm64.so endif ifeq ($(PLAT_LINUX), TRUE) DEPEND_LIB += ./debug/libtraceapi-linux.so ./debug/libnetlinku-linux.so -USER_CLEAN_ITEMS += ./libtraceapi-linux.so +USER_CLEAN_ITEMS += ./libtraceapi-linux.so ./libnetlinku-linux.so endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.ulog.api.Makefile b/Platform/build/user.ulog.api.Makefile index adbe21463..e0cad6646 100755 --- a/Platform/build/user.ulog.api.Makefile +++ b/Platform/build/user.ulog.api.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=libulogapi -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = DLL - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -45,7 +45,7 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) #gcc libs -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Platform/build/user.ulog.log_sched.Makefile b/Platform/build/user.ulog.log_sched.Makefile index f4645297a..d893fa1b7 100755 --- a/Platform/build/user.ulog.log_sched.Makefile +++ b/Platform/build/user.ulog.log_sched.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=log-sched -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = EXE - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -38,12 +38,12 @@ PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common/rpc -I../common/ulog -I../ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) -PLAT_ARM64_LDFLAGS := +PLAT_ARM64_LDFLAGS := PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) #gcc libs -ARM64_LIBS := ./libopenrpc-arm64.so ./libulogapi-arm64.so ../thirdparty/arm64/libev-arm64.so -lpthread -LINUX_LIBS := ./libopenrpc-linux.so ./libulogapi-linux.so ../thirdparty/x86_64/libev-linux.so -lpthread +ARM64_LIBS := -lopenrpc-arm64 -lulogapi-arm64 -lev -lpthread +LINUX_LIBS := -lopenrpc-linux -lulogapi-linux -lev -lpthread ifeq ($(PLAT_ARM64), TRUE) DEPEND_LIB += ./debug/libopenrpc-arm64.so ./debug/libulogapi-arm64.so @@ -55,7 +55,7 @@ DEPEND_LIB += ./debug/libopenrpc-linux.so ./debug/libulogapi-linux.so USER_CLEAN_ITEMS += ./libopenrpc-linux.so ./libulogapi-linux.so endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Product/build/user.usermanager-auth.Makefile b/Product/build/user.usermanager-auth.Makefile index 11c69e848..7633581db 100644 --- a/Product/build/user.usermanager-auth.Makefile +++ b/Product/build/user.usermanager-auth.Makefile @@ -1,5 +1,5 @@ # target name, the target name must have the same name of c source file -TARGET_NAME=userauthapi +TARGET_NAME=libuserauthapi # target # for linux module driver: KO @@ -41,24 +41,22 @@ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) PLAT_ARM64_LDFLAGS := -fPIC -shared PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) -THIRDLIB_LINUX_DIR := ../../Platform/thirdparty/x86_64/usr/local/lib -THIRDLIB_ARM64_DIR := ../../Platform/thirdparty/arm64/usr/local/lib PLATLIB_DIR := ../../Platform/build/debug #gcc libs -ARM64_LIBS := ./libdatabase-arm64.so +ARM64_LIBS := -ldatabase-arm64 ARM64_LIBS += -lcjson -lpthread -lm -LINUX_LIBS := ./libdatabase-linux.so +LINUX_LIBS := -ldatabase-linux LINUX_LIBS += -lcjson -lpthread -lm ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += $(PLATLIB_DIR)/libdatabase-arm64.so $(THIRDLIB_ARM64_DIR)/libodbc.so +DEPEND_LIB += $(PLATLIB_DIR)/libdatabase-arm64.so USER_CLEAN_ITEMS += ./libdatabase-arm64.so endif ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += $(PLATLIB_DIR)/libdatabase-linux.so $(THIRDLIB_LINUX_DIR)/libodbc.so +DEPEND_LIB += $(PLATLIB_DIR)/libdatabase-linux.so USER_CLEAN_ITEMS += ./libdatabase-linux.so endif diff --git a/Product/build/user.usermanager-test.Makefile b/Product/build/user.usermanager-test.Makefile index 473c9e13c..de7734a62 100644 --- a/Product/build/user.usermanager-test.Makefile +++ b/Product/build/user.usermanager-test.Makefile @@ -1,19 +1,19 @@ # target name, the target name must have the same name of c source file TARGET_NAME=usermanager-test -# target +# target # for linux module driver: KO # for application: EXE # for dynamic library: DLL TARGET_TYPE = EXE - + # target object # for application: APP # for device driver: DRV TARGET_OBJ = APP # custom install dir -TARGET_BOX = +TARGET_BOX = #debug mode or release mode DEBUG = TRUE @@ -38,7 +38,7 @@ PLAT_ARM64_SRCS = $(COMMON_SRCS) PLAT_ARM64_CFLAGS := -I../../Platform/user/configm/config-server/user_manager_config -I../../Platform/user/configm/config-server/user_manager_config/usermanager-server/include -I../../Common -I../common \ -I../../Platform/user/configm/config-server/include -I../../Platform/common/database -I../../Platform/common/redismq -I../../Platform/common/configm -I../../Platform/common/rpc -I../../Platform/common/rpc/hashtable \ -I../user/user_manager/usermanager-auth \ - -I../../Platform/thirdparty/arm64/usr/local/include + -I../../Platform/thirdparty/arm64/usr/local/include PLAT_LINUX_CFLAGS := -I../../Platform/user/configm/config-server/user_manager_config -I../../Platform/user/configm/config-server/user_manager_config/usermanager-server/include -I../../Common -I../common \ -I../../Platform/user/configm/config-server/include -I../../Platform/common/database -I../../Platform/common/redismq -I../../Platform/common/configm -I../../Platform/common/rpc -I../../Platform/common/rpc/hashtable \ @@ -46,30 +46,28 @@ PLAT_LINUX_CFLAGS := -I../../Platform/user/configm/config-server/user_manager_co -I../../Platform/thirdparty/x86_64/usr/local/include -PLAT_ARM64_LDFLAGS := -PLAT_LINUX_LDFLAGS := +PLAT_ARM64_LDFLAGS := +PLAT_LINUX_LDFLAGS := -THIRDLIB_LINUX_DIR := ../../Platform/thirdparty/x86_64/usr/local/lib -THIRDLIB_ARM64_DIR := ../../Platform/thirdparty/arm64/usr/local/lib PLATLIB_DIR := ../../Platform/build/debug #gcc libs -ARM64_LIBS := ./userauthapi-arm64.so ./libredismq-arm64.so ./libdatabase-arm64.so +ARM64_LIBS := -luserauthapi-arm64 -lredismq-arm64 -ldatabase-arm64 ARM64_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc -LINUX_LIBS := ./userauthapi-linux.so ./libredismq-linux.so ./libdatabase-linux.so +LINUX_LIBS := -luserauthapi-linux -lredismq-linux -ldatabase-linux LINUX_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc - + ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ./debug/userauthapi-arm64.so $(PLATLIB_DIR)/libredismq-arm64.so $(PLATLIB_DIR)/libdatabase-arm64.so -USER_CLEAN_ITEMS += ./userauthapi-arm64.so ./libredismq-arm64.so ./libdatabase-arm64.so +DEPEND_LIB += ./debug/libuserauthapi-arm64.so $(PLATLIB_DIR)/libredismq-arm64.so $(PLATLIB_DIR)/libdatabase-arm64.so +USER_CLEAN_ITEMS += ./libuserauthapi-arm64.so ./libredismq-arm64.so ./libdatabase-arm64.so endif ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ./debug/userauthapi-linux.so $(PLATLIB_DIR)/libredismq-linux.so $(PLATLIB_DIR)/libdatabase-linux.so -USER_CLEAN_ITEMS += ./userauthapi-linux.so ./libredismq-linux.so ./libdatabase-linux.so +DEPEND_LIB += ./debug/libuserauthapi-linux.so $(PLATLIB_DIR)/libredismq-linux.so $(PLATLIB_DIR)/libdatabase-linux.so +USER_CLEAN_ITEMS += ./libuserauthapi-linux.so ./libredismq-linux.so ./libdatabase-linux.so endif -# this line must be at below of thus, because of... +# this line must be at below of thus, because of... include ../../Common/common.Makefile ifneq ($(MAKECMDGOALS), clean) diff --git a/Product/build/user.web-auth.Makefile b/Product/build/user.web-auth.Makefile index 30e466f0a..15d1e7e48 100644 --- a/Product/build/user.web-auth.Makefile +++ b/Product/build/user.web-auth.Makefile @@ -43,8 +43,8 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) #gcc libs -ARM64_LIBS := ./userauthapi-arm64.so ./libdatabase-arm64.so -LINUX_LIBS := -lcjson ./userauthapi-linux.so ./libdatabase-linux.so +ARM64_LIBS := -luserauthapi-arm64 -ldatabase-arm64 +LINUX_LIBS := -lcjson -luserauthapi-linux -ldatabase-linux ifeq ($(PLAT_ARM64), TRUE) DEPEND_LIB += ./debug/userauthapi-arm64.so ../../Platform/build/debug/libdatabase-arm64.so