Update Makefile. directory structure + .gitignore

2 files changed, 12 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index e097a3f..4ce63ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.bmp
 *.txt
 build/*
+obj/*
diff --git a/Makefile b/Makefile
index 0374be2..69b0c04 100644
--- a/Makefile
+++ b/Makefile
@@ -2,36 +2,40 @@ CC      = clang
 CFLAGS  = -Wall
 LDFLAGS = -lm
 SOURCEDIR = src
-OUTPUT = asciimap
 BUILDDIR = build
+OBJDIR = $(BUILDDIR)/obj
+OUTPUT = asciimap
 PREFIX = /
 
 FILE = 022.bmp
 SRCS = $(wildcard $(SOURCEDIR)/*.c)
-OBJ = $(SRCS:.c=.o)
+OBJT = $(SRCS:.c=.o)
+OBJ  = $(OBJT:$(SOURCEDIR)/%=$(OBJDIR)/%)
 
 .PHONY: build
-build: $(OBJ)
-	@mkdir -p $(BUILDDIR)
+build: dir $(OBJ)
 	@echo [LINK] $(OBJ)
 	@$(CC) $(CFLAGS) -o $(BUILDDIR)/$(OUTPUT) $(OBJ) $(LDFLAGS)
 
+dir:
+	@mkdir -p $(OBJDIR)
+	@mkdir -p $(BUILDDIR)
+
 debug: CFLAGS+= -g -D _DEBUG
 debug: build;
 
 gdb: debug
 	gdb $(BUILDDIR)/$(OUTPUT)
 
-%.o: %.c
+$(OBJDIR)/%.o: $(SOURCEDIR)/%.c
 	@echo [ CC ] $<
 	@$(CC) $(CFLAGS) -c $< -o $@
 
 all: clean build
 
 .PHONY: clean
-
 clean:
-	rm -df  $(OBJ)
+	rm -Rdf  $(OBJDIR)
 	rm -Rdf $(BUILDDIR)
 
 run: build