diff --git a/proxy_c/Makefile b/proxy_c/Makefile
index db0384b..5a89c5f 100644
--- a/proxy_c/Makefile
+++ b/proxy_c/Makefile
@@ -14,26 +14,12 @@ INCDIR += -I $(DIR_LIBEVENT)
 INCDIR += -I $(DIR_JSON)
 INCDIR += -I $(DIR_CURL)
 
-LIBS 	= ./dba/lib/libdba.a ./smcli_client/lib/libclient.a 
-LIBS	+= ./pstn_cli/lib/libpstncli.a ./tcp/lib/libtcp.a 
-LIBS	+= /usr/lib/x86_64-linux-gnu/libidn.a -I/usr/include/mysql -L/usr/local/lib 
-LIBS	+= -L/usr/lib64/mysql -lmysqlclient -lrt -lpthread -lglib-2.0
-LIBS	+= ./third-lib/libevent/.libs/libevent.a ./third-lib/libevent/.libs/libevent_pthreads.a 
-LIBS	+= ./third-lib/libcurl/lib/.libs/libcurl.a ./third-lib/libmjson/src/.libs/libmjson.a
-LIBS	+= -lssl -lcrypto -lzstd -lidn2 -lz
-
-# Determine OS version
-# OS_VERSION=$(shell lsb_release -rs)
-
-# ifeq ($(OS_VERSION),22.04)
-#     LIBS	+= /usr/lib/x86_64-linux-gnu/libevent.a /usr/lib/x86_64-linux-gnu/libevent_pthreads.a 
-# 	LIBS	+= ./third-lib/libcurl/lib/libcurl.a ./third-lib/json-lib/libmjson.a
-# 	LIBS	+= -lssl -lcrypto -lzstd -lidn2 -lz  
-# else ifeq ($(OS_VERSION),12.04)
-#     LIBS	+= ./third-lib/libevent/lib/libevent.a ./third-lib/libevent/lib/libevent_pthreads.a 
-# 	LIBS	+= ./third-lib/libcurl/lib/libcurl.a ./third-lib/json-lib/libmjson.a
-# 	LIBS	+= -lssl -lcrypto -lzstd -lidn2 -lz  
-# endif
+LIBS = ./dba/lib/libdba.a ./smcli_client/lib/libclient.a 
+LIBS += ./pstn_cli/lib/libpstncli.a ./tcp/lib/libtcp.a 
+LIBS += /usr/lib/x86_64-linux-gnu/libidn.a -I/usr/include/mysql -L/usr/lib64/mysql -lmysqlclient 
+LIBS += ./third-lib/libcurl/lib/.libs/libcurl.a -lrt -lcrypto -lssl -lpthread 
+LIBS += ./third-lib/libevent/.libs/libevent.a ./third-lib/libevent/.libs/libevent_pthreads.a 
+LIBS += ./third-lib/libmjson/src/.libs/libmjson.a  -L/usr/local/lib -lglib-2.0 -lz -lidn2
 
 CFLAGS = -Wall -g -DX86_64 -DTEST_RESTPROXY $(LIBS) 
 
@@ -58,10 +44,12 @@ lib_all:
 	$(MAKE) -C ./tcp
 	$(MAKE) -C ./dba
 
-3rdlib_all:
+3rdlib_config:
 	cd ./third-lib/libevent && $(CONFIGURE)
 	cd ./third-lib/libcurl && $(CONFIGURE)
 	cd ./third-lib/libmjson && $(CONFIGURE)
+
+3rdlib_all:
 	$(MAKE) -C ./third-lib/libevent
 	$(MAKE) -C ./third-lib/libcurl
 	$(MAKE) -C ./third-lib/libmjson