From 04476fd02d79028d31b7a340bef7e42de3992497 Mon Sep 17 00:00:00 2001
From: Oxore <oxore@protonmail.com>
Date: Mon, 23 Sep 2019 03:24:10 +0300
Subject: Enable verbose on CI, change make to $(MAKE) in Makefile

---
 .travis.yml | 2 +-
 Makefile    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eb30128..78d8696 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ before_script:
     - brew install csfml
 
 script:
-    - make all
+    - make Q=
     - ./test
 
 compiler:
diff --git a/Makefile b/Makefile
index 08e39ab..9056cc5 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ endif
 
 .PHONY: pg
 pg:
-	make -f pg.mk $@ PREFIX=$(PREFIX)
+	$(MAKE) -f pg.mk $@ PREFIX=$(PREFIX)
 
 $(TARGET_TETRIS): $(OBJECTS) $(TARGET)/$(TARGET_TETRIS).c.o $(LIBF8)/libf8.a \
 	$(CJSON)/cJSON.o
@@ -85,7 +85,7 @@ $(OBJECTS): | $(BUILD)/ $(TARGET)/
 	$(Q) mkdir -p $@
 
 $(LIBF8)/libf8.a: $(LIBF8)
-	make -C $< NOTEST=1
+	$(MAKE) -C $< NOTEST=1
 
 $(CJSON)/cJSON.c.o: $(CJSON)/cJSON.c
 	$(QQ) echo "  CC      $@"
@@ -106,12 +106,12 @@ clean:
 		$(TARGET_TETRIS) $(TARGET_TEST) \
 		$(TARGET)/$(TARGET_TETRIS).c.o $(TARGET)/$(TARGET_TETRIS).c.d \
 		$(TARGET)/$(TARGET_TEST).c.o $(TARGET)/$(TARGET_TEST).c.d
-	make -f pg.mk $@
+	$(MAKE) -f pg.mk $@
 
 mrproper: clean
 	$(Q) $(RM) -rfv $(BUILD) \
 		$(MUNIT)/*.d $(MUNIT)/*.o \
 		$(CJSON)/*.d $(CJSON)/*.o
-	make -C $(LIBF8) clean
+	$(MAKE) -C $(LIBF8) clean
 
 .PHONY: all clean mrproper
-- 
cgit v1.2.3