cmhi
/
secgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mod aaa-12 修改链接参数，由./libxxxx.so 改为 -L . -lxxxx 

RCA：
SOL：
修改人：huangxin
检视人：huangxin
This commit is contained in:
黄昕 2019-08-14 11:33:47 +08:00
parent 4a819bb041
commit 5aeb82adcd
21 changed files with 177 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/common.Makefile
View File

@ -337,7 +337,7 @@ PLAT_LINUX_TARGET := $(TARGET_PREFIX)$(TARGET_NAME)-linux$(TARGET_EXT)
ifeq ($(PLAT_ARM64), TRUE) ifeq ($(PLAT_ARM64), TRUE)
BUILD_TARGET += $(PLAT_ARM64_TARGET) BUILD_TARGET += $(PLAT_ARM64_TARGET)
PLAT_ARM64_CFLAGS += -DPLATFORM_ARM64 $(ARM64_EXTFLAG) 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_LIBFLAGS := $(ARM64_LIBFLAGS)
PLAT_ARM64_LIBS := $(ARM64_LIBS) PLAT_ARM64_LIBS := $(ARM64_LIBS)
endif endif
@ -346,7 +346,7 @@ endif
ifeq ($(PLAT_LINUX), TRUE) ifeq ($(PLAT_LINUX), TRUE)
BUILD_TARGET += $(PLAT_LINUX_TARGET) BUILD_TARGET += $(PLAT_LINUX_TARGET)
PLAT_LINUX_CFLAGS += -DPLATFORM_LINUX $(LINUX_EXTFLAG) 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_LIBFLAGS := $(LINUX_LIBFLAGS)
PLAT_LINUX_LIBS := $(LINUX_LIBS) PLAT_LINUX_LIBS := $(LINUX_LIBS)
endif endif

4
Platform/build/user.cfg2kernel.Makefile
View File

@ -41,8 +41,8 @@ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)
PLAT_ARM64_LDFLAGS := PLAT_ARM64_LDFLAGS :=
PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
ARM64_LIBS := ./libnetlinku-arm64.so ARM64_LIBS := -lnetlinku-arm64
LINUX_LIBS := ./libnetlinku-linux.so LINUX_LIBS := -lnetlinku-linux

12
Platform/build/user.configm.Makefile
View File

@ -49,19 +49,19 @@ PLAT_ARM64_LDFLAGS :=
PLAT_LINUX_LDFLAGS := PLAT_LINUX_LDFLAGS :=
#gcc libs #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 := -lopenrpc-arm64 -lnetlinku-arm64 -lredismq-arm64 -lulogapi-arm64 -ldatabase-arm64
ARM64_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc 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 := -lopenrpc-linux -lnetlinku-linux -lredismq-linux -lulogapi-linux -ldatabase-linux
LINUX_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc LINUX_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc -lev
ifeq ($(PLAT_ARM64), TRUE) 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 USER_CLEAN_ITEMS += ./libopenrpc-arm64.so ./libnetlinku-arm64.so ./libredismq-arm64.so ./libdatabase-arm64.so
endif endif
ifeq ($(PLAT_LINUX), TRUE) 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 USER_CLEAN_ITEMS += ./libopenrpc-linux.so ./libnetlinku-linux.so ./libredismq-linux.so ./libdatabase-linux.so
endif endif

8
Platform/build/user.configmapi.Makefile
View File

@ -43,16 +43,16 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
#gcc libs #gcc libs
ARM64_LIBS := ../thirdparty/arm64/libev-arm64.so ./libopenrpc-arm64.so -lpthread -lm ARM64_LIBS := -lopenrpc-arm64 -lpthread -lm -lev
LINUX_LIBS := ../thirdparty/x86_64/libev-linux.so ./libopenrpc-linux.so -lpthread -lm LINUX_LIBS := -lopenrpc-linux -lpthread -lm -lev
ifeq ($(PLAT_ARM64), TRUE) 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 USER_CLEAN_ITEMS += ./libopenrpc-arm64.so
endif endif
ifeq ($(PLAT_LINUX), TRUE) 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 USER_CLEAN_ITEMS += ./libopenrpc-linux.so
endif endif

8
Platform/build/user.configmtest.Makefile
View File

@ -42,16 +42,16 @@ PLAT_ARM64_LDFLAGS :=
PLAT_LINUX_LDFLAGS := PLAT_LINUX_LDFLAGS :=
#gcc libs #gcc libs
ARM64_LIBS := ../thirdparty/arm64/libev-arm64.so ./libopenrpc-arm64.so ./libconfigmapi-arm64.so -lpthread -lm ARM64_LIBS := -lopenrpc-arm64 -lconfigmapi-arm64 -lpthread -lm -lev
LINUX_LIBS := ../thirdparty/x86_64/libev-linux.so ./libopenrpc-linux.so ./libconfigmapi-linux.so -lpthread -lm LINUX_LIBS := -lopenrpc-linux -lconfigmapi-linux -lpthread -lm -lev
ifeq ($(PLAT_ARM64), TRUE) 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 USER_CLEAN_ITEMS += ./libconfigmapi-arm64.so
endif endif
ifeq ($(PLAT_LINUX), TRUE) 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 USER_CLEAN_ITEMS += ./libconfigmapi-linux.so
endif endif

12
Platform/build/user.database.Makefile
View File

@ -34,8 +34,8 @@ PLAT_LINUX_SRCS = $(COMMON_DB)
PLAT_ARM64_SRCS = $(COMMON_DB) PLAT_ARM64_SRCS = $(COMMON_DB)
# gcc CFLAGS # 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_ARM64_CFLAGS := -fPIC -I../../Common -I../common/database
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_LINUX_CFLAGS := -fPIC -I../../Common -I../common/database
PLAT_ARM64_LDFLAGS := -fPIC -shared PLAT_ARM64_LDFLAGS := -fPIC -shared
@ -43,16 +43,16 @@ PLAT_LINUX_LDFLAGS := -fPIC -shared
#gcc libs #gcc libs
ARM64_LIBS := ../thirdparty/arm64/usr/local/lib/libodbc.so -lcjson ARM64_LIBS := -lodbc -lcjson
LINUX_LIBS := ../thirdparty/x86_64/usr/local/lib/libodbc.so -lcjson LINUX_LIBS := -lodbc -lcjson
ifeq ($(PLAT_ARM64), TRUE) ifeq ($(PLAT_ARM64), TRUE)
DEPEND_LIB += ../thirdparty/arm64/usr/local/lib/libodbc.so -lcjson DEPEND_LIB +=
USER_CLEAN_ITEMS += USER_CLEAN_ITEMS +=
endif endif
ifeq ($(PLAT_LINUX), TRUE) ifeq ($(PLAT_LINUX), TRUE)
DEPEND_LIB += ../thirdparty/x86_64/usr/local/lib/libodbc.so -lcjson DEPEND_LIB +=
USER_CLEAN_ITEMS += USER_CLEAN_ITEMS +=
endif endif

21
Platform/build/user.freeauth.Makefile
View File

@ -34,30 +34,27 @@ 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 # gcc CFLAGS
PLAT_ARM64_CFLAGS := $(COMMOM_CFLAGS) -I../thirdparty/arm64/usr/local/include PLAT_ARM64_CFLAGS := $(COMMOM_CFLAGS)
PLAT_LINUX_CFLAGS := $(COMMOM_CFLAGS) -I../thirdparty/x86_64/usr/local/include PLAT_LINUX_CFLAGS := $(COMMOM_CFLAGS)
PLAT_ARM64_LDFLAGS := PLAT_ARM64_LDFLAGS :=
PLAT_LINUX_LDFLAGS := PLAT_LINUX_LDFLAGS :=
#gcc libs #gcc libs
ARM64_LIBS := ../thirdparty/arm64/libev-arm64.so ./libopenrpc-arm64.so ./libnetlinku-arm64.so ./libredismq-arm64.so ./libdatabase-arm64.so ARM64_LIBS := -lopenrpc-arm64 -lnetlinku-arm64 -lredismq-arm64 -ldatabase-arm64
ARM64_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis LINUX_LIBS := -lopenrpc-linux -lnetlinku-linux -lredismq-linux -ldatabase-linux
ARM64_LIBS += ../thirdparty/arm64/usr/local/lib/libodbc.so 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 += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc
LINUX_LIBS += ../thirdparty/x86_64/usr/local/lib/libodbc.so
ifeq ($(PLAT_ARM64), TRUE) 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
DEPEND_LIB += ../thirdparty/arm64/usr/local/lib/libodbc.so
USER_CLEAN_ITEMS += ./libopenrpc-arm64.so ./libnetlinku-arm64.so ./libredismq-arm64.so ./libdatabase-arm64.so USER_CLEAN_ITEMS += ./libopenrpc-arm64.so ./libnetlinku-arm64.so ./libredismq-arm64.so ./libdatabase-arm64.so
endif endif
ifeq ($(PLAT_LINUX), TRUE) 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
DEPEND_LIB += ../thirdparty/x86_64/usr/local/lib/libodbc.so
USER_CLEAN_ITEMS += ./libopenrpc-linux.so ./libnetlinku-linux.so ./libredismq-linux.so ./libdatabase-linux.so USER_CLEAN_ITEMS += ./libopenrpc-linux.so ./libnetlinku-linux.so ./libredismq-linux.so ./libdatabase-linux.so
endif endif

4
Platform/build/user.logging.Makefile
View File

@ -42,8 +42,8 @@ PLAT_ARM64_LDFLAGS :=
PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
#gcc libs #gcc libs
ARM64_LIBS := ./libopenrpc-arm64.so ./libulogapi-arm64.so ../thirdparty/arm64/libev-arm64.so ./libconfigmapi-arm64.so -lpthread -lcjson ARM64_LIBS := -lopenrpc-arm64 -lulogapi-arm64 -lconfigmapi-arm64 -lpthread -lcjson
LINUX_LIBS := ./libopenrpc-linux.so ./libulogapi-linux.so ../thirdparty/x86_64/libev-linux.so ./libconfigmapi-linux.so -lpthread -lcjson LINUX_LIBS := -lopenrpc-linux -lulogapi-linux -lconfigmapi-linux -lpthread -lcjson
ifeq ($(PLAT_ARM64), TRUE) ifeq ($(PLAT_ARM64), TRUE)
DEPEND_LIB += ./debug/libopenrpc-arm64.so ./debug/libulogapi-arm64.so DEPEND_LIB += ./debug/libopenrpc-arm64.so ./debug/libulogapi-arm64.so

8
Platform/build/user.openrpc.Makefile
View File

@ -43,16 +43,16 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
#gcc libs #gcc libs
ARM64_LIBS := ../thirdparty/arm64/libev-arm64.so -lpthread -lm ARM64_LIBS := -lpthread -lm -lev
LINUX_LIBS := ../thirdparty/x86_64/libev-linux.so -lpthread -lm LINUX_LIBS := -lpthread -lm -lev
ifeq ($(PLAT_ARM64), TRUE) ifeq ($(PLAT_ARM64), TRUE)
DEPEND_LIB += ../thirdparty/arm64/libev-arm64.so DEPEND_LIB +=
USER_CLEAN_ITEMS += USER_CLEAN_ITEMS +=
endif endif
ifeq ($(PLAT_LINUX), TRUE) ifeq ($(PLAT_LINUX), TRUE)
DEPEND_LIB += ../thirdparty/x86_64/libev-linux.so DEPEND_LIB +=
USER_CLEAN_ITEMS += USER_CLEAN_ITEMS +=
endif endif

4
Platform/build/user.pdeliv.rcvtest.Makefile
View File

@ -41,8 +41,8 @@ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)
PLAT_ARM64_LDFLAGS := PLAT_ARM64_LDFLAGS :=
PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
ARM64_LIBS := ./libnetlinku-arm64.so ARM64_LIBS := -lnetlinku-arm64
LINUX_LIBS := ./libnetlinku-linux.so LINUX_LIBS := -lnetlinku-linux

4
Platform/build/user.pdeliv_u.Makefile
View File

@ -41,8 +41,8 @@ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)
PLAT_ARM64_LDFLAGS := PLAT_ARM64_LDFLAGS :=
PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
ARM64_LIBS := ./libnetlinku-arm64.so ARM64_LIBS := -lnetlinku-arm64
LINUX_LIBS := ./libnetlinku-linux.so LINUX_LIBS := -lnetlinku-linux

12
Platform/build/user.pdelivrcv.test.Makefile
View File

@ -41,19 +41,19 @@ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)
PLAT_ARM64_LDFLAGS := PLAT_ARM64_LDFLAGS :=
PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
ARM64_LIBS := ./pdeliv-rcvtest-arm64.so ARM64_LIBS :=
LINUX_LIBS := ./pdeliv-rcvtest-linux.so LINUX_LIBS :=
ifeq ($(PLAT_ARM64), TRUE) ifeq ($(PLAT_ARM64), TRUE)
DEPEND_LIB += ./debug/libnetlinku-arm64.so DEPEND_LIB += ./debug/libpdeliv-rcvtest.so
USER_CLEAN_ITEMS += ./libnetlinku-arm64.so USER_CLEAN_ITEMS +=
endif endif
ifeq ($(PLAT_LINUX), TRUE) ifeq ($(PLAT_LINUX), TRUE)
DEPEND_LIB += ./debug/libnetlinku-linux.so DEPEND_LIB += ./debug/libpdeliv-rcvtest-linux.so
USER_CLEAN_ITEMS += ./libnetlinku-linux.so USER_CLEAN_ITEMS +=
endif endif

10
Platform/build/user.redismq.Makefile
View File

@ -34,11 +34,11 @@ PLAT_LINUX_SRCS = $(COMMON_SRCS)
PLAT_ARM64_SRCS = $(COMMON_SRCS) PLAT_ARM64_SRCS = $(COMMON_SRCS)
# gcc CFLAGS # gcc CFLAGS
PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common/redismq -I../thirdparty/arm64/usr/local/include PLAT_ARM64_CFLAGS := -fPIC -I../../Common -I../common/redismq
PLAT_LINUX_CFLAGS := -fPIC -I../../Common -I../common/redismq -I../thirdparty/x86_64/usr/local/include 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) PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
@ -47,12 +47,12 @@ ARM64_LIBS := -lhiredis -ljson-c -levent
LINUX_LIBS := -lhiredis -ljson-c -levent LINUX_LIBS := -lhiredis -ljson-c -levent
ifeq ($(PLAT_ARM64), TRUE) ifeq ($(PLAT_ARM64), TRUE)
DEPEND_LIB += ../thirdparty/arm64/usr/local/lib/libjemalloc.so DEPEND_LIB +=
USER_CLEAN_ITEMS += USER_CLEAN_ITEMS +=
endif endif
ifeq ($(PLAT_LINUX), TRUE) ifeq ($(PLAT_LINUX), TRUE)
DEPEND_LIB += ../thirdparty/x86_64/usr/local/lib/libjemalloc.so DEPEND_LIB +=
USER_CLEAN_ITEMS += USER_CLEAN_ITEMS +=
endif endif

4
Platform/build/user.trace.api.Makefile
View File

@ -43,8 +43,8 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
#gcc libs #gcc libs
ARM64_LIBS := ./libnetlinku-arm64.so ARM64_LIBS := -lnetlinku-arm64
LINUX_LIBS := ./libnetlinku-linux.so LINUX_LIBS := -lnetlinku-linux
ifeq ($(PLAT_ARM64), TRUE) ifeq ($(PLAT_ARM64), TRUE)
DEPEND_LIB += ./debug/libnetlinku-arm64.so DEPEND_LIB += ./debug/libnetlinku-arm64.so

8
Platform/build/user.trace.test.Makefile
View File

@ -43,17 +43,17 @@ PLAT_LINUX_LDFLAGS :=
#gcc libs #gcc libs
ARM64_LIBS := ./libtraceapi-arm64.so ./libnetlinku-arm64.so ARM64_LIBS := -ltraceapi-arm64 -lnetlinku-arm64
LINUX_LIBS := ./libtraceapi-linux.so ./libnetlinku-linux.so -lpthread LINUX_LIBS := -ltraceapi-linux -lnetlinku-linux -lpthread
ifeq ($(PLAT_ARM64), TRUE) ifeq ($(PLAT_ARM64), TRUE)
DEPEND_LIB += ./debug/libtraceapi-arm64.so ./debug/libnetlinku-arm64.so 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 endif
ifeq ($(PLAT_LINUX), TRUE) ifeq ($(PLAT_LINUX), TRUE)
DEPEND_LIB += ./debug/libtraceapi-linux.so ./debug/libnetlinku-linux.so 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 endif
# this line must be at below of thus, because of... # this line must be at below of thus, because of...

4
Platform/build/user.ulog.log_sched.Makefile
View File

@ -42,8 +42,8 @@ PLAT_ARM64_LDFLAGS :=
PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
#gcc libs #gcc libs
ARM64_LIBS := ./libopenrpc-arm64.so ./libulogapi-arm64.so ../thirdparty/arm64/libev-arm64.so -lpthread ARM64_LIBS := -lopenrpc-arm64 -lulogapi-arm64 -lev -lpthread
LINUX_LIBS := ./libopenrpc-linux.so ./libulogapi-linux.so ../thirdparty/x86_64/libev-linux.so -lpthread LINUX_LIBS := -lopenrpc-linux -lulogapi-linux -lev -lpthread
ifeq ($(PLAT_ARM64), TRUE) ifeq ($(PLAT_ARM64), TRUE)
DEPEND_LIB += ./debug/libopenrpc-arm64.so ./debug/libulogapi-arm64.so DEPEND_LIB += ./debug/libopenrpc-arm64.so ./debug/libulogapi-arm64.so

12
Product/build/user.usermanager-auth.Makefile
View File

@ -1,5 +1,5 @@
# target name, the target name must have the same name of c source file # target name, the target name must have the same name of c source file
TARGET_NAME=userauthapi TARGET_NAME=libuserauthapi
# target # target
# for linux module driver: KO # for linux module driver: KO
@ -41,24 +41,22 @@ PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)
PLAT_ARM64_LDFLAGS := -fPIC -shared PLAT_ARM64_LDFLAGS := -fPIC -shared
PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) 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 PLATLIB_DIR := ../../Platform/build/debug
#gcc libs #gcc libs
ARM64_LIBS := ./libdatabase-arm64.so ARM64_LIBS := -ldatabase-arm64
ARM64_LIBS += -lcjson -lpthread -lm ARM64_LIBS += -lcjson -lpthread -lm
LINUX_LIBS := ./libdatabase-linux.so LINUX_LIBS := -ldatabase-linux
LINUX_LIBS += -lcjson -lpthread -lm LINUX_LIBS += -lcjson -lpthread -lm
ifeq ($(PLAT_ARM64), TRUE) 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 USER_CLEAN_ITEMS += ./libdatabase-arm64.so
endif endif
ifeq ($(PLAT_LINUX), TRUE) 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 USER_CLEAN_ITEMS += ./libdatabase-linux.so
endif endif

14
Product/build/user.usermanager-test.Makefile
View File

@ -49,24 +49,22 @@ PLAT_LINUX_CFLAGS := -I../../Platform/user/configm/config-server/user_manager_co
PLAT_ARM64_LDFLAGS := PLAT_ARM64_LDFLAGS :=
PLAT_LINUX_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 PLATLIB_DIR := ../../Platform/build/debug
#gcc libs #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 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 LINUX_LIBS += -lpthread -lm -lcjson -levent -ljson-c -lhiredis -lodbc
ifeq ($(PLAT_ARM64), TRUE) ifeq ($(PLAT_ARM64), TRUE)
DEPEND_LIB += ./debug/userauthapi-arm64.so $(PLATLIB_DIR)/libredismq-arm64.so $(PLATLIB_DIR)/libdatabase-arm64.so DEPEND_LIB += ./debug/libuserauthapi-arm64.so $(PLATLIB_DIR)/libredismq-arm64.so $(PLATLIB_DIR)/libdatabase-arm64.so
USER_CLEAN_ITEMS += ./userauthapi-arm64.so ./libredismq-arm64.so ./libdatabase-arm64.so USER_CLEAN_ITEMS += ./libuserauthapi-arm64.so ./libredismq-arm64.so ./libdatabase-arm64.so
endif endif
ifeq ($(PLAT_LINUX), TRUE) ifeq ($(PLAT_LINUX), TRUE)
DEPEND_LIB += ./debug/userauthapi-linux.so $(PLATLIB_DIR)/libredismq-linux.so $(PLATLIB_DIR)/libdatabase-linux.so DEPEND_LIB += ./debug/libuserauthapi-linux.so $(PLATLIB_DIR)/libredismq-linux.so $(PLATLIB_DIR)/libdatabase-linux.so
USER_CLEAN_ITEMS += ./userauthapi-linux.so ./libredismq-linux.so ./libdatabase-linux.so USER_CLEAN_ITEMS += ./libuserauthapi-linux.so ./libredismq-linux.so ./libdatabase-linux.so
endif endif
# this line must be at below of thus, because of... # this line must be at below of thus, because of...

4
Product/build/user.web-auth.Makefile
View File

@ -43,8 +43,8 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
#gcc libs #gcc libs
ARM64_LIBS := ./userauthapi-arm64.so ./libdatabase-arm64.so ARM64_LIBS := -luserauthapi-arm64 -ldatabase-arm64
LINUX_LIBS := -lcjson ./userauthapi-linux.so ./libdatabase-linux.so LINUX_LIBS := -lcjson -luserauthapi-linux -ldatabase-linux
ifeq ($(PLAT_ARM64), TRUE) ifeq ($(PLAT_ARM64), TRUE)
DEPEND_LIB += ./debug/userauthapi-arm64.so ../../Platform/build/debug/libdatabase-arm64.so DEPEND_LIB += ./debug/userauthapi-arm64.so ../../Platform/build/debug/libdatabase-arm64.so