revert cleanups for easy merge

Author: mirostauder

lib/Makefile

@@ -33,8 +33,7 @@ JEMALLOC_PATH := $(DEPS_PATH)/jemalloc/jemalloc
 JEMALLOC_IDIR := $(JEMALLOC_PATH)/include/jemalloc
 
 LIBCONFIG_PATH := $(DEPS_PATH)/libconfig/libconfig
-LIBCONFIG_IDIR := $(LIBCONFIG_PATH)/lib
-LIBCONFIG_LDIR := $(LIBCONFIG_PATH)/out
+LIBCONFIG_IDIR := -I$(LIBCONFIG_PATH)/lib
 
 #INJECTION_PATH := $(DEPS_PATH)/libinjection
 #INJECTION_IDIR := $(INJECTION_PATH)
@@ -49,13 +48,13 @@ SQLITE3_DIR := $(DEPS_PATH)/sqlite3/sqlite3
 CLICKHOUSE_CPP_DIR := $(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp
 
 LIBINJECTION_DIR := $(DEPS_PATH)/libinjection/libinjection
-LIBINJECTION_IDIR := $(LIBINJECTION_DIR)/src
+LIBINJECTION_IDIR := -I$(LIBINJECTION_DIR)/src
 
 LIBHTTPSERVER_DIR := $(DEPS_PATH)/libhttpserver/libhttpserver
-LIBHTTPSERVER_IDIR := $(LIBHTTPSERVER_DIR)/src
+LIBHTTPSERVER_IDIR := -I$(LIBHTTPSERVER_DIR)/src
 
 MICROHTTPD_DIR := $(DEPS_PATH)/libmicrohttpd/libmicrohttpd
-MICROHTTPD_IDIR := $(MICROHTTPD_DIR) -I$(MICROHTTPD_DIR)/src/include
+MICROHTTPD_IDIR := -I$(MICROHTTPD_DIR) -I$(MICROHTTPD_DIR)/src/include
 
 COREDUMPER_DIR := $(DEPS_PATH)/coredumper/coredumper
 COREDUMPER_IDIR := $(COREDUMPER_DIR)/include
@@ -81,48 +80,19 @@ LIBSCRAM_IDIR=$(LIBSCRAM_PATH)/include/
 LIBSCRAM_LDIR=$(LIBSCRAM_PATH)/lib/
 
 POSTGRES_PATH=$(DEPS_PATH)/postgresql/postgresql/src/
-POSTGRES_IFACE=$(POSTGRES_PATH)/interfaces/libpq/
-POSTGRES_IDIR=$(POSTGRES_PATH)/include
+POSTGRES_IFACE=$(POSTGRES_PATH)/interfaces/libpq/ -I$(POSTGRES_PATH)/include
 POSTGRES_LDIR=$(POSTGRES_IFACES)/libpq/
 
 JSON_PATH := $(DEPS_PATH)/json/json
 JSON_IDIR := $(JSON_PATH)/include
 
-SYS_LOC_IDIR := /usr/local/include
-
-
-IDIRS := -I$(SYS_LOC_IDIR) \
-			-I$(PROXYSQL_IDIR) \
-			-I$(JEMALLOC_IDIR) \
-			-I$(MARIADB_IDIR) \
-			-I$(LIBCONFIG_IDIR) \
-			-I$(RE2_IDIR) \
-			-I$(SQLITE3_DIR) \
-			-I$(PCRE_PATH) \
-			-I$(CLICKHOUSE_CPP_DIR) \
-			-I$(CLICKHOUSE_CPP_DIR)/contrib/ \
-			-I$(MICROHTTPD_DIR) \
-			-I$(MICROHTTPD_IDIR) \
-			-I$(LIBHTTPSERVER_IDIR) \
-			-I$(LIBINJECTION_IDIR) \
-			-I$(CURL_IDIR) \
-			-I$(EV_DIR) \
-			-I$(PROMETHEUS_IDIR) \
-			-I$(LIBUSUAL_IDIR) \
-			-I$(LIBSCRAM_IDIR) \
-			-I$(POSTGRES_IFACE) \
-			-I$(POSTGRES_IDIR) \
-			-I$(JSON_IDIR) \
-			-I$(SSL_IDIR)
+IDIR := ../include
 
+IDIRS := -I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(RE2_IDIR) -I$(SQLITE3_DIR) -I$(PCRE_PATH) -I/usr/local/include -I$(CLICKHOUSE_CPP_DIR) -I$(CLICKHOUSE_CPP_DIR)/contrib/ $(MICROHTTPD_IDIR) $(LIBHTTPSERVER_IDIR) $(LIBINJECTION_IDIR) -I$(CURL_IDIR) -I$(EV_DIR) -I$(PROMETHEUS_IDIR) -I$(LIBUSUAL_IDIR) -I$(LIBSCRAM_IDIR) -I$(POSTGRES_IFACE) -I$(JSON_IDIR) -I$(SSL_IDIR)
 ifeq ($(UNAME_S),Linux)
 	IDIRS += -I$(COREDUMPER_IDIR)
 endif
-
-LDIRS := -L$(JEMALLOC_PATH)/lib \
-			-L$(RE2_PATH)/obj \
-			-L$(INJECTION_PATH) \
-			-L$(PROMETHEUS_LDIR)
+LDIRS := -L$(JEMALLOC_PATH)/lib -L$(RE2_PATH)/obj -L$(INJECTION_PATH) -L$(PROMETHEUS_LDIR)
 
 #LIBS := -rdynamic -Wl,-Bstatic -ljemalloc_pic -lre2 -Wl,-Bdynamic -ldl -lpthread -lm -lz -lrt $(EXTRALINK)
 #LIBS := -Wl,--export-dynamic -Wl,-Bstatic -ljemalloc_pic -lre2 -Wl,-Bdynamic -ldl -lpthread -lm -lz -lrt $(EXTRALINK)