From e9b29a109d0c4323640e61847faade467cd8e569 Mon Sep 17 00:00:00 2001
From: zhangsz <zhangsz@wfc.com>
Date: Mon, 24 Mar 2025 16:11:31 +0800
Subject: [PATCH] fix: third lib make

---
 proxy_c/Makefile             | 21 ++++++++++++++++++---
 proxy_c/third-lib/ReadME.txt | 10 +++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/proxy_c/Makefile b/proxy_c/Makefile
index 5a89c5f..0693ca5 100644
--- a/proxy_c/Makefile
+++ b/proxy_c/Makefile
@@ -27,11 +27,12 @@ CONFIGURE = ./configure
 
 CC = gcc
 
-$(TGT):$(OBJS) lib_all 3rdlib_all
+$(TGT): lib_all 3rdlib_all $(OBJS) 
+	if [ ! -d ../bin ]; then mkdir ../bin; fi
 	$(CC) -o $(TGT) $(CFLAGS) $(SRCS) $(INCDIR) $(LIBS)
 	chmod a+x $(TGT)
 
-$(OBJS):%.o:%.c
+$(OBJS): %.o:%.c
 	$(CC) $(CFLAGS) -c -o $@ $< $(INCDIR)
 
 all: $(TGT)
@@ -44,7 +45,21 @@ lib_all:
 	$(MAKE) -C ./tcp
 	$(MAKE) -C ./dba
 
-3rdlib_config:
+3rdlib_prepare:
+	if [ ! -d ./third-lib/libevent ]; then \
+		tar -xvf ../backup/libevent-2.1.11-stable.tar.gz -C ./third-lib/; \
+		mv ./third-lib/libevent-2.1.11-stable ./third-lib/libevent; \
+	fi
+	if [ ! -d ./third-lib/libcurl ]; then \
+		tar -xvf ../backup/curl-7.52.1.tar.gz -C ./third-lib/; \
+		mv ./third-lib/curl-7.52.1 ./third-lib/libcurl; \
+	fi
+	if [ ! -d ./third-lib/libmjson ]; then \
+		tar -xvf ../backup/mjson-1.7.0.tar.gz -C ./third-lib/; \
+		mv ./third-lib/json-1.7.0 ./third-lib/libmjson; \
+	fi
+
+3rdlib_config: 3rdlib_prepare
 	cd ./third-lib/libevent && $(CONFIGURE)
 	cd ./third-lib/libcurl && $(CONFIGURE)
 	cd ./third-lib/libmjson && $(CONFIGURE)
diff --git a/proxy_c/third-lib/ReadME.txt b/proxy_c/third-lib/ReadME.txt
index 5532a8e..e46e695 100644
--- a/proxy_c/third-lib/ReadME.txt
+++ b/proxy_c/third-lib/ReadME.txt
@@ -1,13 +1,13 @@
 libevent-c
 http://libevent.org
-libevent-2.1.8-stable.tar.gz
+libevent-2.1.11-stable.tar.gz
 mjson-1.7.0
 curl-7.52.1
 
 tar xvfz ../../backup/curl-7.52.1.tar.gz -C .
 mv curl-7.52.1 libcurl
-tar xvfz ../../backup/libevent-2.1.8-stable.tar.gz -C .
-mv libevent-2.1.8-stable libevent
-tar xvfz ../../backup/mjson-1.7.0 -C .
-mv mjson-1.7.0 libmjson
+tar xvfz ../../backup/libevent-2.1.11-stable.tar.gz -C .
+mv libevent-2.1.11-stable libevent
+tar xvfz ../../backup/mjson-1.7.0.tar.gz -C .
+mv json-1.7.0 libmjson