From a62bff032fc1a19cd29b1ca3eadfb2584242ea1d Mon Sep 17 00:00:00 2001 From: zhengshuxin Date: Wed, 17 Aug 2022 15:36:10 +0800 Subject: [PATCH] compile tls module --- lib_tls/Makefile | 8 ++++---- lib_tls/tls/{tlsmgr_daemon.c => tlsmgr_daemon.c.bak} | 0 lib_tls/tlsmgr/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename lib_tls/tls/{tlsmgr_daemon.c => tlsmgr_daemon.c.bak} (100%) diff --git a/lib_tls/Makefile b/lib_tls/Makefile index 1e82fb9e7..b323c66f5 100644 --- a/lib_tls/Makefile +++ b/lib_tls/Makefile @@ -84,7 +84,7 @@ endif OUT_PATH = . OBJ_PATH_DST = $(OUT_PATH)/debug -LIB_PATH_DST = $(OUT_PATH)/lib +LIB_PATH_DST = $(OUT_PATH) #Project's objs TLS_SRC = $(wildcard ./*.c) \ @@ -111,12 +111,12 @@ LIB_NAME = lib_tls.a COMPILE = $(CC) $(CFLAGS) -all: TLSMGR +#all: TLSMGR $(shell mkdir -p $(OBJ_PATH_DST)) -TLSMGR: $(LIB_NAME) - @(cd tlsmgr; make) +#TLSMGR: $(LIB_NAME) +# @(cd tlsmgr; make) $(LIB_NAME): $(TLS_OBJ) $(AR) $(ARFL) $(LIB_PATH_DST)/$(LIB_NAME) $(TLS_OBJ) diff --git a/lib_tls/tls/tlsmgr_daemon.c b/lib_tls/tls/tlsmgr_daemon.c.bak similarity index 100% rename from lib_tls/tls/tlsmgr_daemon.c rename to lib_tls/tls/tlsmgr_daemon.c.bak diff --git a/lib_tls/tlsmgr/Makefile b/lib_tls/tlsmgr/Makefile index 771cfddc3..0fb381d05 100644 --- a/lib_tls/tlsmgr/Makefile +++ b/lib_tls/tlsmgr/Makefile @@ -71,11 +71,11 @@ ACL_LIB = $(ACL_PATH)/lib TLS_PATH = .. TLS_INC = $(TLS_PATH)/include -TLS_LIB = $(TLS_PATH)/lib +TLS_LIB = $(TLS_PATH) DICT_PATH = ../../lib_dict DICT_INC = $(DICT_PATH)/include -DICT_LIB = $(DICT_PATH)/lib +DICT_LIB = $(DICT_PATH) ALL_LIBS = -L$(TLS_LIB) -l_tls -L$(DICT_LIB) -l_dict -L$(ACL_LIB) -l_acl \ -lssl -ldb $(SYSLIB)