Build

Includes.mk

@@ -1,15 +1,38 @@
 SRCS=\
-		main.cpp\
-		utils.cpp\
-		initValidation.cpp
+	main.cpp\
+	utils.cpp\
+	extCheck.cpp
+
 MODELS=\
-		CommonExceptions.cpp\
-		Server.cpp\
-		BaseBlock.cpp\
-		ServerContainer.cpp\
-		AccessPermission.cpp\
-		LimitExcept.cpp\
-		Location.cpp
+	models/srcs/BaseBlock.cpp\
+	models/srcs/CommonExceptions.cpp\
+	models/srcs/Server.cpp\
+	models/srcs/Container.cpp\
+	models/srcs/LocationConfig.cpp\
+	models/srcs/parser.cpp\
+	models/srcs/lexer.cpp\
+	models/srcs/readFile.cpp\
+	models/srcs/SocketManager.cpp\
+	models/srcs/HttpUtils.cpp\
+	models/srcs/HttpResponse.cpp\
+	models/srcs/HttpRequest.cpp\
+	models/srcs/HttpParser.cpp\
+	models/srcs/requestContext.cpp\
+	models/srcs/ResourceGuards.cpp\
+
 TEMPLATES=\
 
-HEADERS=$(MODELS:.cpp=.hpp)
+HEADERS=\
+	models/headers/BaseBlock.hpp\
+	models/headers/CommonExceptions.hpp\
+	models/headers/Server.hpp\
+	models/headers/Container.hpp\
+	models/headers/LocationConfig.hpp\
+	models/headers/parser.hpp\
+	models/headers/SocketManager.hpp\
+	models/headers/HttpUtils.hpp\
+	models/headers/HttpResponse.hpp\
+	models/headers/HttpRequest.hpp\
+	models/headers/HttpParser.hpp\
+	models/headers/requestContext.hpp\
+	models/headers/ResourceGuards.hpp\

Makefile

@@ -1,32 +1,32 @@
 include Includes.mk
 
-CC = c++
-CFLAGS = -Wall -Werror -Wextra -std=c++98 -g  -I./includes -I./templates -I./models/headers
+CXX = c++
+CXXFLAGS = -Wall -Werror -Wextra -std=c++98 -g3  -I./includes -I./templates -I./src/models/headers
 
-MODELS_DR = models
+MODELS_DR = src
 INCLUDES_DR = includes
 SRCS_DR = src
 TEMPLATES_DIR= templates
 
 TEMPLATES_S= $(addprefix $(TEMPLATES_DIR)/,$(TEMPLATES))
-MODELS_DR_SRC= $(addprefix $(MODELS_DR)/srcs/,$(MODELS))
+MODELS_DR_SRC= $(addprefix $(MODELS_DR)/,$(MODELS))
 SRCS_DR_SRC= $(addprefix $(SRCS_DR)/,$(SRCS))
-HEADERS_SRC= $(addprefix $(MODELS_DR)/headers/,$(HEADERS))
+HEADERS_SRC= $(addprefix $(MODELS_DR)/,$(HEADERS))
 MODELS_OBJS= $(MODELS_DR_SRC:%.cpp=build/%.o)
 SRCS_OBJS= $(SRCS_DR_SRC:%.cpp=build/%.o)
 
 HEADERS_SRC += $(TEMPLATES_S)
 HEADERS_SRC += $(INCLUDES_DR)
 
-NAME = pginx
+NAME = webserv
 all: $(NAME)
 
 $(NAME): $(MODELS_OBJS) $(SRCS_OBJS)
-	$(CC) $(MODELS_OBJS) $(SRCS_OBJS) $(CFLAGS) -o $(NAME)
+	$(CXX) $(MODELS_OBJS) $(SRCS_OBJS) $(CXXFLAGS) -o $(NAME)
 
 build/%.o:%.cpp  $(HEADERS_SRC)
 	@mkdir -p $(dir $@)
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 clean: 
 	rm -f  $(MODELS_OBJS) $(SRCS_OBJS)