diff --git a/Makefile b/Makefile
index 7faf0c739..eb7525699 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ llmr: config.gypi llmr.gyp
 
 ##### Test cases ###############################################################
 
-build/test/Makefile: config.gypi test/test.gyp
+build/test/Makefile: src common config.gypi test/test.gyp
 	deps/run_gyp test/test.gyp --depth=. -Goutput_dir=.. --generator-output=./build/test -f make
 
 test: build/test/Makefile
@@ -72,4 +72,4 @@ clean:
 distclean: clean
 	-rm -rf ./build
 
-.PHONY: llmr test linux build/test/Makefile
+.PHONY: llmr test linux
diff --git a/common.gypi b/common.gypi
index 8737606c1..b81a361f5 100644
--- a/common.gypi
+++ b/common.gypi
@@ -12,12 +12,15 @@
         'cflags': [ '-g', '-O0' ],
         'defines': [ 'DEBUG' ],
         'xcode_settings': {
-          'OTHER_CPLUSPLUSFLAGS': [ '-g' ]
+          'OTHER_CPLUSPLUSFLAGS': [ '-Wall', '-Wextra', '-pedantic', '-g', '-O0' ]
         }
       },
       'Release': {
         'cflags': [ '-O3' ],
         'defines': [ 'NDEBUG' ],
+        'xcode_settings': {
+          'OTHER_CPLUSPLUSFLAGS': [ '-Wall', '-Wextra', '-pedantic', '-O3' ]
+        }
       }
     }
   }