Refactor Makefile

2 files changed, 26 insertions, 20 deletions

diff --git a/.gitignore b/.gitignore
index 5e6a1d5..353ff27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 tetris
 *.o
 *.swp
+*.out
 build
 tags
diff --git a/Makefile b/Makefile
index 7277eee..1f7ddfd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,40 +1,45 @@
-CC=gcc
-CFLAGS+=-Wall
-CFLAGS+=-std=c11
-CFLAGS+=-O0
-CFLAGS+=-I$(INCLUDE)
-LIBS+=-lcsfml-graphics
-LIBS+=-lcsfml-window
-LIBS+=-lcsfml-system
-LIBS+=-lyaml
+Q=@
+QQ=@
+
+TARGET:=tetris
 
 BUILD:=build
 SRC:=src
-INCLUDE:=include
 SOURCES:=$(wildcard $(SRC)/*.c)
-OBJECTS:=$(patsubst $(SRC)/%.c,$(BUILD)/%.o,$(SOURCES))
+OBJECTS:=$(patsubst $(SRC)/%.c,$(BUILD)/%.c.o,$(SOURCES))
 
-TARGET:=tetris
+INCLUDE+=include
+INCLUDE:=$(patsubst %,-I%,$(INCLUDE))
+
+CFLAGS+=$(INCLUDE)
+CFLAGS+=-Wall
+CFLAGS+=-std=c11
+CFLAGS+=-g3
+CFLAGS+=-O0
+
+LDFLAGS+=-lcsfml-graphics
+LDFLAGS+=-lcsfml-window
+LDFLAGS+=-lcsfml-system
+LDFLAGS+=-lyaml
 
 #======================================================================
 
 all: $(TARGET)
 
 $(TARGET): $(OBJECTS)
-	@echo "Compiling: $@"
-	@$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
-	@echo "Build successfull"
+	$(QQ) echo "  LD      $@"
+	$(Q) $(CC) -o $@ $^ $(LDFLAGS)
 
 $(OBJECTS): | $(BUILD)
 
 $(BUILD):
-	@mkdir -p $(BUILD)
+	$(Q) mkdir -p $(BUILD)
 
-$(BUILD)/%.o: $(SRC)/%.c
-	@echo "Compiling: $@"
-	@$(CC) -c $(CFLAGS) $(LIBS) -o $@ $<
+$(BUILD)/%.c.o: $(SRC)/%.c
+	$(QQ) echo "  CC      $@"
+	$(Q) $(CC) -c $(CFLAGS) -o $@ $<
 
 clean:
-	@rm -rfv $(TARGET) $(BUILD)
+	$(Q) $(RM) -rfv $(TARGET) $(BUILD)
 
 .PHONY: all clean