From ef070529c71f1f64b6d182098bc6eed819ea4258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=98=95?= Date: Wed, 14 Aug 2019 16:44:43 +0800 Subject: [PATCH] =?UTF-8?q?Mod=20=20aaa-12=20=E4=BF=AE=E6=94=B9-L=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=E5=BA=93=E6=8B=B7=E8=B4=9D=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=20RCA=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=BA=EF=BC=9Ahuangxin=20=E6=A3=80=E8=A7=86=E4=BA=BA?= =?UTF-8?q?=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 | 13 ------------- Platform/build/user.configm.Makefile | 15 ++------------- Platform/build/user.configmapi.Makefile | 10 ---------- Platform/build/user.configmtest.Makefile | 11 ----------- Platform/build/user.database.Makefile | 10 ---------- Platform/build/user.freeauth.Makefile | 12 ------------ Platform/build/user.logging.Makefile | 10 ---------- Platform/build/user.openrpc.Makefile | 10 ---------- Platform/build/user.pdeliv.rcvtest.Makefile | 13 ------------- Platform/build/user.pdeliv_u.Makefile | 13 ------------- Platform/build/user.pdelivrcv.test.Makefile | 13 ------------- Platform/build/user.redismq.Makefile | 10 ---------- Platform/build/user.trace.api.Makefile | 10 ---------- Platform/build/user.trace.test.Makefile | 12 ------------ Platform/build/user.ulog.log_sched.Makefile | 10 ---------- Product/build/user.usermanager-auth.Makefile | 13 +------------ Product/build/user.usermanager-test.Makefile | 14 ++------------ Product/build/user.web-auth.Makefile | 13 +------------ 19 files changed, 8 insertions(+), 208 deletions(-) diff --git a/Common/common.Makefile b/Common/common.Makefile index 872a30dbf..d91c35726 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) -L . + PLAT_ARM64_LDFLAGS += $(ARM64_DRV_LDFLAGS) -L ./debug 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) -L . + PLAT_LINUX_LDFLAGS += $(LINUX_DRV_LDFLAGS) -L ./debug 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 a35db0f4b..ba686650e 100755 --- a/Platform/build/user.cfg2kernel.Makefile +++ b/Platform/build/user.cfg2kernel.Makefile @@ -44,19 +44,6 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) ARM64_LIBS := -lnetlinku-arm64 LINUX_LIBS := -lnetlinku-linux - - -ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ./debug/libnetlinku-arm64.so -USER_CLEAN_ITEMS += ./libnetlinku-arm64.so -endif - -ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ./debug/libnetlinku-linux.so -USER_CLEAN_ITEMS += ./libnetlinku-linux.so -endif - - # 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 576978ab2..1e119b0d4 100755 --- a/Platform/build/user.configm.Makefile +++ b/Platform/build/user.configm.Makefile @@ -42,8 +42,8 @@ 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 # 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 := @@ -55,17 +55,6 @@ ARM64_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc -lev 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 += ./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 += ./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... include ../../Common/common.Makefile diff --git a/Platform/build/user.configmapi.Makefile b/Platform/build/user.configmapi.Makefile index 09721d752..4088ab60c 100644 --- a/Platform/build/user.configmapi.Makefile +++ b/Platform/build/user.configmapi.Makefile @@ -46,16 +46,6 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) ARM64_LIBS := -lopenrpc-arm64 -lpthread -lm -lev LINUX_LIBS := -lopenrpc-linux -lpthread -lm -lev -ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ./debug/libopenrpc-arm64.so -USER_CLEAN_ITEMS += ./libopenrpc-arm64.so -endif - -ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ./debug/libopenrpc-linux.so -USER_CLEAN_ITEMS += ./libopenrpc-linux.so -endif - # 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 4db2c1a23..869359e99 100644 --- a/Platform/build/user.configmtest.Makefile +++ b/Platform/build/user.configmtest.Makefile @@ -45,17 +45,6 @@ PLAT_LINUX_LDFLAGS := ARM64_LIBS := -lopenrpc-arm64 -lconfigmapi-arm64 -lpthread -lm -lev LINUX_LIBS := -lopenrpc-linux -lconfigmapi-linux -lpthread -lm -lev -ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ./debug/libopenrpc-arm64.so ./debug/libconfigmapi-arm64.so -USER_CLEAN_ITEMS += ./libconfigmapi-arm64.so -endif - -ifeq ($(PLAT_LINUX), TRUE) -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... include ../../Common/common.Makefile diff --git a/Platform/build/user.database.Makefile b/Platform/build/user.database.Makefile index 157514a4c..7397e9a01 100644 --- a/Platform/build/user.database.Makefile +++ b/Platform/build/user.database.Makefile @@ -46,16 +46,6 @@ PLAT_LINUX_LDFLAGS := -fPIC -shared ARM64_LIBS := -lodbc -lcjson LINUX_LIBS := -lodbc -lcjson -ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += -USER_CLEAN_ITEMS += -endif - -ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += -USER_CLEAN_ITEMS += -endif - # 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 ace6d3c8c..1581f1d3d 100755 --- a/Platform/build/user.freeauth.Makefile +++ b/Platform/build/user.freeauth.Makefile @@ -48,18 +48,6 @@ ARM64_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lev -lodbc LINUX_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc -ifeq ($(PLAT_ARM64), TRUE) -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 += ./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... include ../../Common/common.Makefile diff --git a/Platform/build/user.logging.Makefile b/Platform/build/user.logging.Makefile index 08f34320a..c70c42e8b 100755 --- a/Platform/build/user.logging.Makefile +++ b/Platform/build/user.logging.Makefile @@ -45,16 +45,6 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) 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 -USER_CLEAN_ITEMS += ./libopenrpc-arm64.so ./libulogapi-arm64.so -endif - -ifeq ($(PLAT_LINUX), TRUE) -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... include ../../Common/common.Makefile diff --git a/Platform/build/user.openrpc.Makefile b/Platform/build/user.openrpc.Makefile index 8e716e314..e4b1fb3db 100755 --- a/Platform/build/user.openrpc.Makefile +++ b/Platform/build/user.openrpc.Makefile @@ -46,16 +46,6 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) ARM64_LIBS := -lpthread -lm -lev LINUX_LIBS := -lpthread -lm -lev -ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += -USER_CLEAN_ITEMS += -endif - -ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += -USER_CLEAN_ITEMS += -endif - # 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 38e8c0e73..503f60ba0 100644 --- a/Platform/build/user.pdeliv.rcvtest.Makefile +++ b/Platform/build/user.pdeliv.rcvtest.Makefile @@ -44,19 +44,6 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) ARM64_LIBS := -lnetlinku-arm64 LINUX_LIBS := -lnetlinku-linux - - -ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ./debug/libnetlinku-arm64.so -USER_CLEAN_ITEMS += ./libnetlinku-arm64.so -endif - -ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ./debug/libnetlinku-linux.so -USER_CLEAN_ITEMS += ./libnetlinku-linux.so -endif - - # 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 2ecf3a164..f46ead352 100755 --- a/Platform/build/user.pdeliv_u.Makefile +++ b/Platform/build/user.pdeliv_u.Makefile @@ -44,19 +44,6 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) ARM64_LIBS := -lnetlinku-arm64 LINUX_LIBS := -lnetlinku-linux - - -ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ./debug/libnetlinku-arm64.so -USER_CLEAN_ITEMS += ./libnetlinku-arm64.so -endif - -ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ./debug/libnetlinku-linux.so -USER_CLEAN_ITEMS += ./libnetlinku-linux.so -endif - - # 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 29e4128dd..ad63b7564 100644 --- a/Platform/build/user.pdelivrcv.test.Makefile +++ b/Platform/build/user.pdelivrcv.test.Makefile @@ -44,19 +44,6 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) ARM64_LIBS := LINUX_LIBS := - - -ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ./debug/libpdeliv-rcvtest.so -USER_CLEAN_ITEMS += -endif - -ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ./debug/libpdeliv-rcvtest-linux.so -USER_CLEAN_ITEMS += -endif - - # 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 9030f5886..45f888b52 100644 --- a/Platform/build/user.redismq.Makefile +++ b/Platform/build/user.redismq.Makefile @@ -46,16 +46,6 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) ARM64_LIBS := -lhiredis -ljson-c -levent LINUX_LIBS := -lhiredis -ljson-c -levent -ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += -USER_CLEAN_ITEMS += -endif - -ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += -USER_CLEAN_ITEMS += -endif - # 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 83de65f77..e48e37742 100755 --- a/Platform/build/user.trace.api.Makefile +++ b/Platform/build/user.trace.api.Makefile @@ -46,16 +46,6 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) ARM64_LIBS := -lnetlinku-arm64 LINUX_LIBS := -lnetlinku-linux -ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ./debug/libnetlinku-arm64.so -USER_CLEAN_ITEMS += ./libnetlinku-arm64.so -endif - -ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ./debug/libnetlinku-linux.so -USER_CLEAN_ITEMS += ./libnetlinku-linux.so -endif - # 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 83b49f7a7..61e9b97e5 100755 --- a/Platform/build/user.trace.test.Makefile +++ b/Platform/build/user.trace.test.Makefile @@ -37,25 +37,13 @@ PLAT_ARM64_SRCS = $(COMMON_SRCS) PLAT_ARM64_CFLAGS := -I../user/trace/trace-api -I../../Common -I../common/trace PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) - PLAT_ARM64_LDFLAGS := -lpthread PLAT_LINUX_LDFLAGS := - #gcc libs 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 ./libnetlinku-arm64.so -endif - -ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ./debug/libtraceapi-linux.so ./debug/libnetlinku-linux.so -USER_CLEAN_ITEMS += ./libtraceapi-linux.so ./libnetlinku-linux.so -endif - # 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 d893fa1b7..31d79c12e 100755 --- a/Platform/build/user.ulog.log_sched.Makefile +++ b/Platform/build/user.ulog.log_sched.Makefile @@ -45,16 +45,6 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) 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 -USER_CLEAN_ITEMS += ./libopenrpc-arm64.so ./libulogapi-arm64.so -endif - -ifeq ($(PLAT_LINUX), TRUE) -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... include ../../Common/common.Makefile diff --git a/Product/build/user.usermanager-auth.Makefile b/Product/build/user.usermanager-auth.Makefile index 7633581db..9dc8cb321 100644 --- a/Product/build/user.usermanager-auth.Makefile +++ b/Product/build/user.usermanager-auth.Makefile @@ -37,8 +37,7 @@ PLAT_ARM64_SRCS = $(COMMON_SRCS) PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common -I../../Platform/common PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) - -PLAT_ARM64_LDFLAGS := -fPIC -shared +PLAT_ARM64_LDFLAGS := -fPIC -shared -L ../../Platform/build/debug PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) PLATLIB_DIR := ../../Platform/build/debug @@ -50,16 +49,6 @@ ARM64_LIBS += -lcjson -lpthread -lm LINUX_LIBS := -ldatabase-linux LINUX_LIBS += -lcjson -lpthread -lm -ifeq ($(PLAT_ARM64), TRUE) -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 -USER_CLEAN_ITEMS += ./libdatabase-linux.so -endif - # 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 de7734a62..420e3a2c7 100644 --- a/Product/build/user.usermanager-test.Makefile +++ b/Product/build/user.usermanager-test.Makefile @@ -46,8 +46,8 @@ 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 := -L ../../Platform/build/debug +PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) PLATLIB_DIR := ../../Platform/build/debug #gcc libs @@ -57,16 +57,6 @@ ARM64_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc 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/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/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... include ../../Common/common.Makefile diff --git a/Product/build/user.web-auth.Makefile b/Product/build/user.web-auth.Makefile index 15d1e7e48..b33eb9878 100644 --- a/Product/build/user.web-auth.Makefile +++ b/Product/build/user.web-auth.Makefile @@ -38,24 +38,13 @@ PLAT_ARM64_CFLAGS := -I../../Common -I../../Platform/common -I../../Product/user PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) -PLAT_ARM64_LDFLAGS := +PLAT_ARM64_LDFLAGS := -L ../../Platform/build/debug PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) - #gcc libs 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 -USER_CLEAN_ITEMS += ./userauthapi-arm64.so ./libdatabase-arm64.so -endif - -ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ./debug/userauthapi-linux.so ../../Platform/build/debug/libdatabase-linux.so -USER_CLEAN_ITEMS += ./userauthapi-linux.so ./libdatabase-linux.so -endif - # this line must be at below of thus, because of... include ../../Common/common.Makefile