From 97421b051237fbe8e117436101a9fedec417faa0 Mon Sep 17 00:00:00 2001
From: Teemu Hukkanen <tjhukkan@iki.fi>
Date: Sat, 4 Oct 2014 16:54:50 +0100
Subject: [PATCH] Add verbose option to Makefile (V=1)

---
 Makefile            | 16 +++++++++++-----
 jaguarcore.mak      | 10 ++++++++--
 src/m68000/Makefile | 20 +++++++++++++-------
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 4b30a78..f2949a8 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,12 @@
 
 FIND = find
 
+ifeq ("$(V)","1")
+Q :=
+else
+Q := @
+endif
+
 # Gah
 OSTYPE := $(shell uname -a)
 
@@ -54,23 +60,23 @@ prepare: obj
 
 virtualjaguar: sources libs makefile-qt
 	@echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar GUI...\033[00m"
-	@$(MAKE) -f makefile-qt CROSS=$(CROSS)
+	$(Q)$(MAKE) -f makefile-qt CROSS=$(CROSS) V="$(V)"
 
 makefile-qt: virtualjaguar.pro
 	@echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m"
-	@$(CROSS)qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
+	$(Q)$(CROSS)qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
 
 libs: obj/libm68k.a obj/libjaguarcore.a
 	@echo -e "\033[01;33m***\033[00;32m Libraries successfully made.\033[00m"
 
 obj/libm68k.a: src/m68000/Makefile sources
 	@echo -e "\033[01;33m***\033[00;32m Making Customized UAE 68K Core...\033[00m"
-	@$(MAKE) -C src/m68000 CROSS=$(CROSS) CFLAGS="$(CFLAGS)"
-	@cp src/m68000/obj/libm68k.a obj/
+	$(Q)$(MAKE) -C src/m68000 CROSS=$(CROSS) CFLAGS="$(CFLAGS)" V="$(V)"
+	$(Q)cp src/m68000/obj/libm68k.a obj/
 
 obj/libjaguarcore.a: jaguarcore.mak sources
 	@echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar core...\033[00m"
-	@$(MAKE) -f jaguarcore.mak CROSS=$(CROSS) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+	$(Q)$(MAKE) -f jaguarcore.mak CROSS=$(CROSS) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" V="$(V)"
 
 sources: src/*.h src/*.cpp src/m68000/*.c src/m68000/*.h
 
diff --git a/jaguarcore.mak b/jaguarcore.mak
index 31bd4a8..45d2e43 100644
--- a/jaguarcore.mak
+++ b/jaguarcore.mak
@@ -7,6 +7,12 @@
 # file GPLv3 for details. ;-)
 #
 
+ifeq ("$(V)","1")
+Q :=
+else
+Q := @
+endif
+
 # Cross compilation with MXE
 #CROSS = i686-pc-mingw32-
 
@@ -113,12 +119,12 @@ obj:
 
 # Library rules (might not be cross-platform compatible)
 obj/libjaguarcore.a: $(OBJS) 
-	@$(AR) $(ARFLAGS) obj/libjaguarcore.a $(OBJS)
+	$(Q)$(AR) $(ARFLAGS) obj/libjaguarcore.a $(OBJS)
 
 # Main source compilation (implicit rules)...
 
 obj/%.o: src/%.cpp
 	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-	@$(CC) $(GCC_DEPS) $(CXXFLAGS) $(SDL_CFLAGS) $(DEFINES) $(INCS) -c $< -o $@
+	$(Q)$(CC) $(GCC_DEPS) $(CXXFLAGS) $(SDL_CFLAGS) $(DEFINES) $(INCS) -c $< -o $@
 
 -include obj/*.d
diff --git a/src/m68000/Makefile b/src/m68000/Makefile
index f8e43f6..16ed159 100644
--- a/src/m68000/Makefile
+++ b/src/m68000/Makefile
@@ -7,6 +7,12 @@
 # This makefile is released under the GPLv3 or later
 #
 
+ifeq ("$(V)","1")
+Q :=
+else
+Q := @
+endif
+
 # Cross compilation using MXE
 #CROSS = i686-pc-mingw32-
 
@@ -36,7 +42,7 @@ all: obj obj/libm68k.a
 
 # Library rules (might not be cross-platform compatible)
 obj/libm68k.a: $(OBJS)
-	@$(AR) $(ARFLAGS) obj/libm68k.a $(OBJS)
+	$(Q)$(AR) $(ARFLAGS) obj/libm68k.a $(OBJS)
 
 obj:
 	@mkdir ./obj
@@ -45,11 +51,11 @@ obj:
 
 obj/%.o: %.c
 	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-	@$(CC) $(GCC_DEPS) $(CFLAGS) $(INCS) -c $< -o $@
+	$(Q)$(CC) $(GCC_DEPS) $(CFLAGS) $(INCS) -c $< -o $@
 
 obj/%.o: obj/%.c
 	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-	@$(CC) $(GCC_DEPS) $(CFLAGS) $(INCS) -c $< -o $@
+	$(Q)$(CC) $(GCC_DEPS) $(CFLAGS) $(INCS) -c $< -o $@
 
 # Generated code
 
@@ -60,15 +66,15 @@ obj/cpustbl.c: obj/gencpu
 
 obj/gencpu: obj/cpudefs.c
 	@echo -e "\033[01;33m***\033[00;32m Generating gencpu...\033[00m"
-	@$(HOSTCC) $(GCC_DEPS) $(CFLAGS) gencpu.c readcpu.c obj/cpudefs.c -o obj/gencpu -I. -I./obj
+	$(Q)$(HOSTCC) $(GCC_DEPS) $(CFLAGS) gencpu.c readcpu.c obj/cpudefs.c -o obj/gencpu -I. -I./obj
 
 obj/cpudefs.c: obj/build68k
 	@echo -e "\033[01;33m***\033[00;32m Generating cpudefs.c...\033[00m"
-	@obj/build68k < table68k > obj/cpudefs.c
+	$(Q)obj/build68k < table68k > obj/cpudefs.c
 
 obj/build68k: build68k.c
-	@echo -e "\033[01;33m***\033[00;32m Compiling build68k.c...\033[00m"
-	@$(HOSTCC) $(GCC_DEPS) $(CFLAGS) build68k.c -o obj/build68k
+	@echo -e "\033[01;33m***\033[00;32m Compiling $< ...\033[00m"
+	$(Q)$(HOSTCC) $(GCC_DEPS) $(CFLAGS) build68k.c -o obj/build68k
 
 clean:
 	@echo -ne "\033[01;33m***\033[00;32m Cleaning out the garbage...\033[00m"
-- 
2.37.2