diff --git a/d00/ex00/Makefile b/d00/ex00/Makefile index 7f7b774..0803c5b 100644 --- a/d00/ex00/Makefile +++ b/d00/ex00/Makefile @@ -6,7 +6,7 @@ NAME = megaphone -CC = clang++ +CC = c++ CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 VPATH = $(D_SRCS) diff --git a/d00/ex00/megaphone b/d00/ex00/megaphone deleted file mode 100755 index b2f63e0..0000000 Binary files a/d00/ex00/megaphone and /dev/null differ diff --git a/d00/ex01/Makefile b/d00/ex01/Makefile index 40e09b3..aff6fff 100644 --- a/d00/ex01/Makefile +++ b/d00/ex01/Makefile @@ -6,7 +6,7 @@ NAME = phonebook -CC = clang++ +CC = c++ CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 VPATH = $(D_SRCS) diff --git a/d00/ex01/builds/Contact.class.o b/d00/ex01/builds/Contact.class.o deleted file mode 100644 index 415acba..0000000 Binary files a/d00/ex01/builds/Contact.class.o and /dev/null differ diff --git a/d00/ex01/builds/main.o b/d00/ex01/builds/main.o deleted file mode 100644 index 19b7d28..0000000 Binary files a/d00/ex01/builds/main.o and /dev/null differ diff --git a/d00/ex01/phonebook b/d00/ex01/phonebook deleted file mode 100755 index 0c0a7df..0000000 Binary files a/d00/ex01/phonebook and /dev/null differ diff --git a/d00/ex02/Makefile b/d00/ex02/Makefile index a0fb4c5..5c733e2 100644 --- a/d00/ex02/Makefile +++ b/d00/ex02/Makefile @@ -6,7 +6,7 @@ NAME = account -CC = clang++ +CC = c++ CFLAGS = -Wall -Wextra -Wno-unused -Werror $(INCLUDES) -std=c++98 VPATH = $(D_SRCS) diff --git a/d01/ex00/Makefile b/d01/ex00/Makefile index 3fee7a0..b823351 100644 --- a/d01/ex00/Makefile +++ b/d01/ex00/Makefile @@ -6,7 +6,7 @@ NAME = zombie -CC = clang++ +CC = c++ CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 VPATH = $(D_SRCS) diff --git a/d01/ex00/zombie b/d01/ex00/zombie deleted file mode 100755 index f5f3f12..0000000 Binary files a/d01/ex00/zombie and /dev/null differ diff --git a/d01/ex01/Makefile b/d01/ex01/Makefile index e9fbfcd..be16514 100644 --- a/d01/ex01/Makefile +++ b/d01/ex01/Makefile @@ -6,7 +6,7 @@ NAME = zombie -CC = clang++ +CC = c++ CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 -g3 VPATH = $(D_SRCS) diff --git a/d01/ex02/Makefile b/d01/ex02/Makefile index de53531..305f6b2 100644 --- a/d01/ex02/Makefile +++ b/d01/ex02/Makefile @@ -6,7 +6,7 @@ NAME = brain -CC = clang++ +CC = c++ CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 -g3 VPATH = $(D_SRCS) diff --git a/d01/ex02/brain b/d01/ex02/brain deleted file mode 100755 index 27c03b4..0000000 Binary files a/d01/ex02/brain and /dev/null differ diff --git a/d01/ex03/Makefile b/d01/ex03/Makefile index 82360fa..6283d26 100644 --- a/d01/ex03/Makefile +++ b/d01/ex03/Makefile @@ -6,7 +6,7 @@ NAME = war -CC = clang++ +CC = c++ CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 -g3 VPATH = $(D_SRCS) diff --git a/d01/ex03/war b/d01/ex03/war deleted file mode 100755 index ffae4fd..0000000 Binary files a/d01/ex03/war and /dev/null differ diff --git a/d01/ex04/Makefile b/d01/ex04/Makefile index 495c03c..92644d4 100644 --- a/d01/ex04/Makefile +++ b/d01/ex04/Makefile @@ -6,7 +6,7 @@ NAME = sed -CC = clang++ +CC = c++ CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 -g3 VPATH = $(D_SRCS) diff --git a/d01/ex04/sed b/d01/ex04/sed deleted file mode 100755 index 973c59b..0000000 Binary files a/d01/ex04/sed and /dev/null differ diff --git a/d01/ex05/Makefile b/d01/ex05/Makefile index eedda9d..4c739ba 100644 --- a/d01/ex05/Makefile +++ b/d01/ex05/Makefile @@ -6,7 +6,7 @@ NAME = karen -CC = clang++ +CC = c++ CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 -g3 VPATH = $(D_SRCS) diff --git a/d01/ex05/karen b/d01/ex05/karen deleted file mode 100755 index 04b0e44..0000000 Binary files a/d01/ex05/karen and /dev/null differ diff --git a/d01/ex06/karenFilter b/d01/ex06/karenFilter deleted file mode 100755 index d9ab0c3..0000000 Binary files a/d01/ex06/karenFilter and /dev/null differ diff --git a/d02/ex00/Makefile b/d02/ex00/Makefile index 0712445..c79bfaa 100644 --- a/d02/ex00/Makefile +++ b/d02/ex00/Makefile @@ -6,7 +6,7 @@ NAME = fixed -CC = clang++ +CC = c++ CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 VPATH = $(D_SRCS) diff --git a/d02/ex01/Makefile b/d02/ex01/Makefile index 0712445..c79bfaa 100644 --- a/d02/ex01/Makefile +++ b/d02/ex01/Makefile @@ -6,7 +6,7 @@ NAME = fixed -CC = clang++ +CC = c++ CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 VPATH = $(D_SRCS) diff --git a/d02/ex01/fixed b/d02/ex01/fixed deleted file mode 100755 index ee017d6..0000000 Binary files a/d02/ex01/fixed and /dev/null differ diff --git a/d02/ex02/Makefile b/d02/ex02/Makefile index 5531831..9b9e378 100644 --- a/d02/ex02/Makefile +++ b/d02/ex02/Makefile @@ -6,7 +6,7 @@ NAME = operators -CC = clang++ +CC = c++ CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 VPATH = $(D_SRCS) diff --git a/d02/ex02/operators b/d02/ex02/operators deleted file mode 100755 index 6117e75..0000000 Binary files a/d02/ex02/operators and /dev/null differ diff --git a/d03/ex00/Makefile b/d03/ex00/Makefile new file mode 100644 index 0000000..9708dcd --- /dev/null +++ b/d03/ex00/Makefile @@ -0,0 +1,61 @@ +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # +# . name = value . name is case sensitive # +# VARIABLES . or name = value \ . use VPATH only for .c # +# . value . or .cpp # +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # + +NAME = action + +CC = c++ +CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 + +VPATH = $(D_SRCS) + +LIBS = + +INCLUDES = -I$(D_HEADERS) + +D_SRCS = . +SRCS = main.cpp + +D_HEADERS = . +HEADERS = + +D_OBJS = builds +OBJS = $(SRCS:%.cpp=$(D_OBJS)/%.o) + +RM_D_OBJS = rm -rf $(D_OBJS) +ifeq "$(D_OBJS)" "." +RM_D_OBJS = +endif + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # +# . target: prerequisites . $@ : target # +# RULES . recipe . $< : 1st prerequisite # +# . recipe . $^ : all prerequisites # +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # + +all: $(NAME) + +$(D_OBJS)/%.o: %.cpp | $(D_OBJS) + $(CC) $(CFLAGS) -c $< -o $@ + +$(D_OBJS): + mkdir $@ + +$(OBJS): $(HEADERS:%=$(D_HEADERS)/%) + +$(NAME): $(OBJS) + $(CC) $(OBJS) -o $@ $(LIBS) + +clean: + rm -f $(OBJS) + +fclean: clean + rm -f $(NAME) + $(RM_D_OBJS) + +re: fclean all + +.PHONY : all clean fclean re bonus run valgrind