Skip to content

Commit

Permalink
fix(Makefile): fix compilation error due to directory name change
Browse files Browse the repository at this point in the history
- name change from HTTP to http was causing compilation issues
  • Loading branch information
samih713 committed Feb 25, 2024
1 parent 847df00 commit 3be6571
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ OBJS:= $(SRCS:%.cpp=$(OBJS_DIR)/%.o)

DEP:= $(OBJS:%.o=%.d)

LIBRARY_FLAGS:= -Lserver/ -lserver -Lparser/ -lparser
LIBRARY_FLAGS:= -Lserver/ -lserver -Lparser/ -lparser -Lhttp/ -Lhttp

NAME:= webserv

Expand Down Expand Up @@ -55,6 +55,7 @@ debug: all
tests:
@make tests -sC parser/
@make tests -sC server/
@make tests -sC http/
@echo "$(BLUE)[ TEST ]$(RESET) Ready for testing."

parser:
Expand All @@ -64,7 +65,7 @@ server:
@make -sC server/

http:
@make -sC HTTP/
@make -sC http/

clean:
@$(RM) $(OBJS_DIR) *.o
Expand Down
Binary file added http/libhttp.a
Binary file not shown.
4 changes: 2 additions & 2 deletions server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ endif

RM:= rm -rf

INCLUDES:= -I./ -Isocket/ -I../includes/ -I../HTTP/ -I../HTTP/request/ -I../HTTP/response/
INCLUDES:= -I./ -Isocket/ -I../includes/ -I../http/ -I../http/request/ -I../http/response/

SRCS:= socket/Socket.cpp socket/TCPSocket.cpp Server.cpp

Expand All @@ -31,7 +31,7 @@ TEST_SOCKET:= $(TEST_DIR)/SOCKET_main.cpp
TEST_SERVER:= $(TEST_DIR)/SERVER_main.cpp

# http request/response directory
LIBHTTPDIR:= ../HTTP/
LIBHTTPDIR:= ../http/
LIBHTTP:= -L$(LIBHTTPDIR) -lhttp

DEP:= $(OBJS:%.o=%.d)
Expand Down

0 comments on commit 3be6571

Please sign in to comment.