From: Lukas Jiriste <ljiriste@student.42prague.com>
Date: Thu, 25 Apr 2024 10:23:06 +0000 (+0200)
Subject: Refactor project file structure
X-Git-Url: https://git.ljiriste.work/?a=commitdiff_plain;h=711c155b4347f7f5999798b11d8ff9324bcc7711;p=42%2Ffract-ol.git

Refactor project file structure
---

diff --git a/Makefile b/Makefile
index e37b346..d252ab8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,30 @@
 CC := gcc
 
 CFLAGS := -std=c99 -Wall -Wextra -Werror -Wpedantic
-INCGRAPH := -Iminilibx-linux -I/usr/include -ILibft/inc
+INCGRAPH := minilibx-linux /usr/include Libft/inc
 LINKGRAPH := -Lminilibx-linux -lmlx -L/usr/lib -lXext -lX11 -lm -lbsd -LLibft -lft
 
+INCDIR := inc
+
+INC = $(addprefix -I, $(INCDIR) $(INCGRAPH))
+
 NAME := fractol
 MLXDIR := minilibx-linux/
 MLX := $(MLXDIR)libmlx_Linux.a
 LFTDIR := Libft/
 LFT := $(LFTDIR)libft.a
 
-SRCS := main.c complex.c color.c event_handling.c fractals.c pixel.c
+SRCDIR := src
+
+SRCS := main.c				\
+		complex.c			\
+		color.c				\
+		event_handling.c	\
+		fractals.c			\
+		pixel.c				\
+
+SRCS := $(addprefix $(SRCDIR)/, $(SRCS))
+
 OBJS := $(SRCS:%.c=%.o)
 
 all : $(NAME)
@@ -22,7 +36,7 @@ $(NAME) : $(OBJS) $(LFT) $(MLX)
 	$(CC) $(CFLAGS) $(OBJS) -o $@ $(LINKGRAPH)
 
 %.o : %.c | $(LFTDIR)Makefile $(MLXDIR)Makefile
-	$(CC) $(CFLAGS) $(INCGRAPH) -c $< -o $@
+	$(CC) $(CFLAGS) $(INC) -c $< -o $@
 
 $(MLX) : | $(MLXDIR)Makefile
 	$(MAKE) -C $(MLXDIR)
diff --git a/color.h b/inc/color.h
similarity index 100%
rename from color.h
rename to inc/color.h
diff --git a/complex.h b/inc/complex.h
similarity index 100%
rename from complex.h
rename to inc/complex.h
diff --git a/fractals.h b/inc/fractals.h
similarity index 100%
rename from fractals.h
rename to inc/fractals.h
diff --git a/fractol.h b/inc/fractol.h
similarity index 100%
rename from fractol.h
rename to inc/fractol.h
diff --git a/pixel.h b/inc/pixel.h
similarity index 100%
rename from pixel.h
rename to inc/pixel.h
diff --git a/vect2.h b/inc/vect2.h
similarity index 100%
rename from vect2.h
rename to inc/vect2.h
diff --git a/color.c b/src/color.c
similarity index 100%
rename from color.c
rename to src/color.c
diff --git a/complex.c b/src/complex.c
similarity index 100%
rename from complex.c
rename to src/complex.c
diff --git a/event_handling.c b/src/event_handling.c
similarity index 100%
rename from event_handling.c
rename to src/event_handling.c
diff --git a/fractals.c b/src/fractals.c
similarity index 100%
rename from fractals.c
rename to src/fractals.c
diff --git a/main.c b/src/main.c
similarity index 100%
rename from main.c
rename to src/main.c
diff --git a/pixel.c b/src/pixel.c
similarity index 100%
rename from pixel.c
rename to src/pixel.c
diff --git a/vect2.c b/src/vect2.c
similarity index 100%
rename from vect2.c
rename to src/vect2.c