diff --git a/Makefile/Makefile b/Makefile/Makefile
index 28a8397..be24bcf 100644
--- a/Makefile/Makefile
+++ b/Makefile/Makefile
@@ -2,13 +2,24 @@
 # -MMD is used to generate .d files for user header dependencies (use -MD for system and user header instead)
 CPPFLAGS = -MMD
 # main compilation
-CFLAGS ?= -Werror -Wall #$(shell pkg-config --cflags sdl)
+CFLAGS ?= -Werror -Wall -Wextra $(shell pkg-config --cflags sdl)
 # C++ flags
 CXXFLAGS =
 #Linker flags
 LDFLAGS =
 #Linker path
-LDLIBS = #$(shell pkg-config --libs sdl)
+LDLIBS = $(shell pkg-config --libs sdl)
+
+# Force shell to an known one
+SHELL := bash
+.SHELLFLAGS := -eu -o -pipefail -c
+
+# each recipe in ran as one single shell session (Rather than one new shell per line)
+.ONESHELL
+
+# delete target on error
+.DELETE_ON_ERROR
+MAKEFLAGS += --warn-undefined-variables
 
 ifneq ($(CROSS_COMPILE),)
 	CC  :=$(CROSS_COMPILE)$(CC)