From 73e27161008915bee94c6d368662e235a8f6cd2a Mon Sep 17 00:00:00 2001
From: Andrew Scott <git@andyscott.me>
Date: Sat, 24 Aug 2024 17:34:21 -0400
Subject: [PATCH] Rewrite Makefile for new directory structure

---
 Makefile | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 8137fea..d59d64f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,45 @@
-CC     = gcc
-CFLAGS = -O3 -Wall -Wextra -Wpedantic
+CC       = gcc
+CFLAGS   =
+CPPFLAGS = -Iinclude -MMD -MP
 
-SRCS = main.c vm.c gc.c galloc.c
-OBJS = $(SRCS:.c=.o)
+SRCDIR = src
+
+SRCS = $(wildcard $(SRCDIR)/*.c)
+OBJS = $(patsubst $(SRCDIR)/%.c,%.o,$(SRCS))
 EXE  = gc
 
-DBDIR     = debug
-DBEXE     = $(DBDIR)/$(EXE)
-DBOBJS    = $(addprefix $(DBDIR)/, $(OBJS))
-DBCFLAGS  = -g -O0 -DDEBUG
+DBDIR    = debug
+DBEXE    = $(DBDIR)/$(EXE)
+DBOBJS   = $(addprefix $(DBDIR)/, $(OBJS))
+DBCFLAGS = -g -O0 -DDEBUG
 
-REDIR     = build
-REEXE     = $(REDIR)/$(EXE)
-REOBJS    = $(addprefix $(REDIR)/, $(OBJS))
+REDIR    = bin
+REEXE    = $(REDIR)/$(EXE)
+REOBJS   = $(addprefix $(REDIR)/, $(OBJS))
+RECFLAGS = -O3 -Wall -Wextra -Wpedantic -Werror
 
-.PHONY: all clean debug release prep
+.PHONY: all clean debug prep release
 
-all: debug release gc
-
-gc: $(REEXE)
-	@cp $< $@
+all: debug release
 
 debug: prep $(DBEXE)
 
 $(DBEXE): $(DBOBJS)
-	$(CC) $(CFLAGS) $(DBCFLAGS) -DTEST -o $@ $^
+	$(CC) $(CFLAGS) $(DBCFLAGS) -o $@ $^
 
-$(DBDIR)/%.o: %.c
-	$(CC) -c $(CFLAGS) $(DBCFLAGS) -o $@ $<
+$(DBDIR)/%.o: $(SRCDIR)/%.c
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DBCFLAGS) -o $@ $<
 
 release: prep $(REEXE)
 
 $(REEXE): $(REOBJS)
-	$(CC) $(CFLAGS) -o $@ $^
+	$(CC) $(CFLAGS) $(RECFLAGS) -o $@ $^
 
-$(REDIR)/%.o: %.c
-	$(CC) -c $(CFLAGS) -o $@ $<
+$(REDIR)/%.o: $(SRCDIR)/%.c
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(RECFLAGS) -o $@ $<
 
 prep:
 	@mkdir -p $(DBDIR) $(REDIR)
 
 clean:
-	rm -rf gc $(DBDIR) $(REDIR)
-
-
-
+	rm -rf $(DBDIR) $(REDIR)