Add server_engine folder.

Changes Makefile structure.
Sepulven · May 22, 2024 · 91042a5 · 91042a5
1 parent ef17894
commit 91042a5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -1,26 +1,31 @@
 NAME		=	webserv
 CXX			=	c++
 CXXFLAGS 	=	-Wall -Werror -Wextra -std=c++98 -g # -fsanitize=address
+INCLUDES	=	-I ./inc
 
-SRCS		=	main.cpp ServerContext.cpp WebServer.cpp HttpError.cpp
 
+## * File folder defintion
 PARSER		=	Parser.cpp ParserUtils.cpp Lexer.cpp
 
 UTILS		=	__raw_data_utils.cpp __file_manager_utils.cpp __webserv_utils.cpp
 
-CONN		=	Req.cpp Res.cpp ConnStream.cpp
+CONN		=	Req.cpp Res.cpp ConnStream.cpp HttpError.cpp
 
-SRC			=	$(addprefix srcs/,$(SRCS)) \
-				$(addprefix srcs/utils/,$(UTILS)) \
-				$(addprefix srcs/parser/,$(PARSER)) \
-				$(addprefix srcs/conn/,$(CONN)) 
+SERVER_ENG	=	ServerContext.cpp WebServer.cpp
 
-INCLUDES	=	-I ./inc
+SRC			=	$(addprefix srcs/__utils/,$(UTILS)) \
+				$(addprefix srcs/server_engine/,$(SERVER_ENG)) \
+				$(addprefix srcs/parser/,$(PARSER)) \
+				$(addprefix srcs/conn/,$(CONN))  \
+				$(addprefix srcs/,main.cpp)  \
 
 OBJ			=	$(SRC:.cpp=.o)
+
+## * Compilation phase
 %.o: %.cpp
 	@${CXX} ${CXXFLAGS} ${INCLUDES} -c $< -o $@
 
+## * Makefile standart rules
 all: $(NAME)
 
 $(NAME): ${OBJ}

diff --git a/srcs/utils/__file_manager_utils.cpp → srcs/__utils/__file_manager_utils.cpp b/srcs/utils/__file_manager_utils.cpp → srcs/__utils/__file_manager_utils.cpp
diff --git a/srcs/utils/__raw_data_utils.cpp → srcs/__utils/__raw_data_utils.cpp b/srcs/utils/__raw_data_utils.cpp → srcs/__utils/__raw_data_utils.cpp
diff --git a/srcs/utils/__webserv_utils.cpp → srcs/__utils/__webserv_utils.cpp b/srcs/utils/__webserv_utils.cpp → srcs/__utils/__webserv_utils.cpp
diff --git a/srcs/HttpError.cpp → srcs/conn/HttpError.cpp b/srcs/HttpError.cpp → srcs/conn/HttpError.cpp
diff --git a/srcs/ServerContext.cpp → srcs/server_engine/ServerContext.cpp b/srcs/ServerContext.cpp → srcs/server_engine/ServerContext.cpp
diff --git a/srcs/WebServer.cpp → srcs/server_engine/WebServer.cpp b/srcs/WebServer.cpp → srcs/server_engine/WebServer.cpp