Fix warnings, add more warnings flags, normalize makefiles

1 files changed, 29 insertions, 33 deletions

diff --git a/src/simulator/Makefile b/src/simulator/Makefile
index 6593f73..ba2cc92 100644
--- a/src/simulator/Makefile
+++ b/src/simulator/Makefile
@@ -55,23 +55,23 @@ OBJS = $(patsubst %.c,%.o,$(C_FILES))
 CWARNS += -W
 CWARNS += -Wall
 # CWARNS += -Werror
-# CWARNS += -Wextra
-# CWARNS += -Wformat
-# CWARNS += -Wmissing-braces
-# CWARNS += -Wno-cast-align
-# CWARNS += -Wparentheses
-# CWARNS += -Wshadow
-# CWARNS += -Wno-sign-compare
-# CWARNS += -Wswitch
-# CWARNS += -Wuninitialized
-# CWARNS += -Wunknown-pragmas
-# CWARNS += -Wunused-function
-# CWARNS += -Wunused-label
-# CWARNS += -Wunused-parameter
-# CWARNS += -Wunused-value
-# CWARNS += -Wunused-variable
-# CWARNS += -Wmissing-prototypes
-#
+CWARNS += -Wextra
+CWARNS += -Wformat
+CWARNS += -Wmissing-braces
+CWARNS += -Wno-cast-align
+CWARNS += -Wparentheses
+CWARNS += -Wshadow
+CWARNS += -Wno-sign-compare
+CWARNS += -Wswitch
+CWARNS += -Wuninitialized
+CWARNS += -Wunknown-pragmas
+CWARNS += -Wunused-function
+CWARNS += -Wunused-label
+CWARNS += -Wunused-parameter
+CWARNS += -Wunused-value
+CWARNS += -Wunused-variable
+CWARNS += -Wmissing-prototypes
+
 CFLAGS += -m32
 CFLAGS += -DDEBUG=1
 CFLAGS += -g -DUSE_STDIO=1 -D__GCC_POSIX__=1 -lX11 -lm -lGL -lm -lGLU -lpulse-simple -lpulse
@@ -105,36 +105,32 @@ $(ODIR)/%.o: %.c
 	$(dir_guard)
 # If verbose, print gcc execution, else hide
 ifeq ($(verbose),1)
-	@echo ">> Compiling $<"
+	@echo "[CC] $<"
 	$(CC) $(CFLAGS) -c -o $@ $<
 else
-	@echo ">> Compiling $(notdir $<)"
+	@echo "[CC] $(notdir $<)"
 	@$(CC) $(CFLAGS) -c -o $@ $<
 endif
 
 
 vc.h: ../../.git/logs/HEAD
-	echo "// This file is generated by Makefile." > vc.h
-	echo "// Do not edit this file!" >> vc.h
-	git log -1 --format="format:#define GIT_VERSION \"%h\"" >> vc.h
-	echo >> vc.h
-	echo >> vc.h
+	@echo "// This file is generated by Makefile." > vc.h
+	@echo "// Do not edit this file!" >> vc.h
+	@git log -1 --format="format:#define GIT_VERSION \"%h\"" >> vc.h
+	@echo >> vc.h
+	@echo >> vc.h
+	@echo [EC] vc.h
 
 FreeRTOS-Sim: $(_OBJS)
-	@echo ">> Linking $@..."
+	@echo "[LK] $@"
 ifeq ($(verbose),1)
 	$(CC) $(CFLAGS) $^ $(LINKFLAGS) $(LIBS) -o $@
 else
 	@$(CC) $(CFLAGS) $^ $(LINKFLAGS) $(LIBS) -o $@
 endif
-
-	@echo "-------------------------"
-	@echo "BUILD COMPLETE: $@"
-	@echo "-------------------------"
+	@echo "[:)] Happiness :)"
 
 .PHONY : clean
 clean:
-	@-rm -rf $(ODIR) FreeRTOS-Sim
-	@echo "--------------"
-	@echo "CLEAN COMPLETE"
-	@echo "--------------"
+	@-rm -rf $(ODIR) FreeRTOS-Sim common/
+	@echo "[RM] Cleanuped °o°"