I think i have successfully merged origin/master into eric_config_parser, seems fine

Makefile

@@ -1,17 +1,18 @@
-NAME = webserv
 
-CXX = c++
+NAME		 =	webserv
+CXX			 =	c++
 
-CXXFLAGS = -Wall -Wextra #-Werror
-CXXFLAGS += -std=c++98
-CXXFLAGS += -I$(HEADERS_D)
-CXXFLAGS += -g
-#CXXFLAGS += -O3
+CXXFLAGS	 =	-Wall -Wextra #-Werror
+CXXFLAGS	+=	$(HEADERS)
+CXXFLAGS	+=	-std=c++98
+CXXFLAGS	+=	-g
+CXXFLAGS	+=	-MMD -MP #header dependencie
+#CXXFLAGS	+=	-O3
 
-#SHELL = /bin/zsh
-VPATH  = $(DIR_SRCS)
-DIR_SRCS =	srcs
+#SHELL		 =	/bin/zsh
+VPATH		 =	$(SRCS_D)
 
+HEADERS		 =	$(HEADERS_D:%=-I%)
 HEADERS_D = ./srcs
 HEADERS =	Webserv.hpp \
 			ConfigParser.hpp \
@@ -22,15 +23,18 @@ HEADERS =	Webserv.hpp \
 			MethodType.hpp \
 			utils.hpp \
 
-DEPENDENCIES =	$(HEADERS:%=$(HEADERS_D)/%)
+SRCS_D		 =	srcs srcs/webserv
+SRCS		 =	main.cpp \
+				ft_itoa.cpp \
+				base.cpp init.cpp close.cpp epoll_update.cpp signal.cpp \
+				accept.cpp request.cpp response.cpp \
+				run_loop.cpp \
+				ConfigParser.cpp \
+				utils.cpp \
 
-SRCS =	main.cpp \
-		Webserv.cpp \
-		ConfigParser.cpp \
-		utils.cpp \
-
-DIR_OBJS = builds
-OBJS = $(SRCS:%.cpp=$(DIR_OBJS)/%.o)
+OBJS_D		 =	builds
+OBJS		 =	$(SRCS:%.cpp=$(OBJS_D)/%.o)
+DEPS		 =	$(OBJS:.o=.d) #header dependencie
 
 # --------------------
 # ------ RULES -------
@@ -38,26 +42,24 @@ OBJS = $(SRCS:%.cpp=$(DIR_OBJS)/%.o)
 
 all: $(NAME)
 
-$(DIR_OBJS)/%.o: %.cpp | $(DIR_OBJS)
+$(OBJS_D)/%.o: %.cpp | $(OBJS_D)
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-$(DIR_OBJS):
+$(OBJS_D):
 	mkdir $@
 
-$(OBJS): $(DEPENDENCIES)
-#$(OBJS): $(DEPENDENCIES) Makefile
-
-$(NAME) : $(OBJS)
-	$(CXX) $(OBJS) -o $(NAME)
+$(NAME): $(OBJS)
+	$(CXX) $^ -o $(NAME)
 
 clean:
-	rm -f $(OBJS)
+	rm -rf $(OBJS_D)
 
 fclean: clean
 	rm -f $(NAME)
 
 re: fclean all
 
-#run: all
+.PHONY : all clean fclean re
+
+-include $(DEPS) # header dependencie
 
-.PHONY : all clean fclean re run