diff --git a/.gitignore b/.gitignore index 377da6e..0b71a3e 100644 --- a/.gitignore +++ b/.gitignore @@ -78,12 +78,9 @@ dkms.conf # logs files *.log -# dependencies -.deps -.libs -*.d # third party libraries +.cache third-lib !third-lib/README.txt diff --git a/proxy_c/Makefile b/proxy_c/Makefile index 2f5aa8a..db0384b 100644 --- a/proxy_c/Makefile +++ b/proxy_c/Makefile @@ -37,6 +37,8 @@ LIBS += -lssl -lcrypto -lzstd -lidn2 -lz CFLAGS = -Wall -g -DX86_64 -DTEST_RESTPROXY $(LIBS) +CONFIGURE = ./configure + CC = gcc $(TGT):$(OBJS) lib_all 3rdlib_all @@ -57,6 +59,9 @@ lib_all: $(MAKE) -C ./dba 3rdlib_all: + cd ./third-lib/libevent && $(CONFIGURE) + cd ./third-lib/libcurl && $(CONFIGURE) + cd ./third-lib/libmjson && $(CONFIGURE) $(MAKE) -C ./third-lib/libevent $(MAKE) -C ./third-lib/libcurl $(MAKE) -C ./third-lib/libmjson diff --git a/proxy_c/third-lib/ReadME.txt b/proxy_c/third-lib/ReadME.txt index a1b7a0c..5532a8e 100644 --- a/proxy_c/third-lib/ReadME.txt +++ b/proxy_c/third-lib/ReadME.txt @@ -4,4 +4,10 @@ libevent-2.1.8-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