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

Mod aaa-12 修改-L参数，移除不必要的依赖库拷贝操作 

RCA：
SOL：
修改人：huangxin
检视人：huangxin
This commit is contained in:
黄昕 2019-08-14 16:44:43 +08:00
parent 69aacd5dab
commit ef070529c7
19 changed files with 8 additions and 208 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)
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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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