Index: benchmark/Makefile.am
===================================================================
--- benchmark/Makefile.am	(revision 7a8f52460fccf48e76692e6611eb8d20e4ea2698)
+++ benchmark/Makefile.am	(revision ffaedcdb2f53c8f96bbbced84a2f7337c7855208)
@@ -21,7 +21,7 @@
 include $(top_srcdir)/src/cfa.make
 
-AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
-AM_CFAFLAGS = -quiet -in-tree -nodebug -std=c++14
-AM_UPPFLAGS = -quiet -nodebug -multi
+AM_CFLAGS = -O2 -Wall -Wextra -Werror -I$(srcdir) -lrt -pthread
+AM_CFAFLAGS = -quiet -nodebug -in-tree
+AM_UPPFLAGS = -quiet -nodebug -multi -std=c++14
 
 BENCH_V_CC = $(__bench_v_CC_$(__quiet))
Index: benchmark/Makefile.in
===================================================================
--- benchmark/Makefile.in	(revision 7a8f52460fccf48e76692e6611eb8d20e4ea2698)
+++ benchmark/Makefile.in	(revision ffaedcdb2f53c8f96bbbced84a2f7337c7855208)
@@ -371,7 +371,7 @@
 
 # applies to both programs
-AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
-AM_CFAFLAGS = -quiet -in-tree -nodebug -std=c++14
-AM_UPPFLAGS = -quiet -nodebug -multi
+AM_CFLAGS = -O2 -Wall -Wextra -Werror -I$(srcdir) -lrt -pthread
+AM_CFAFLAGS = -quiet -nodebug -in-tree
+AM_UPPFLAGS = -quiet -nodebug -multi -std=c++14
 BENCH_V_CC = $(__bench_v_CC_$(__quiet))
 BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))