3 files changed, 3 insertions, 21 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 5ca4159..3589fdf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,12 +12,6 @@ include $(top_srcdir)/bootstrap.am
 include $(top_srcdir)/scintilla.am
 
 AM_CXXFLAGS = -Wall -Wno-char-subscripts
-if CLANG
-AM_CXXFLAGS += -Wno-mismatched-tags
-endif
-if HAVE_SIZED_DEALLOCATION
-AM_CXXFLAGS += -fsized-deallocation
-endif
 
 if STATIC_EXECUTABLES
 # AM_LDFLAGS are libtool flags, NOT compiler/linker flags
diff --git a/src/interface-curses/Makefile.am b/src/interface-curses/Makefile.am
index bd61e14..01e68ae 100644
--- a/src/interface-curses/Makefile.am
+++ b/src/interface-curses/Makefile.am
@@ -1,12 +1,6 @@
 AM_CPPFLAGS += -I$(top_srcdir)/src
 
-AM_CXXFLAGS = -std=c++11 -Wall -Wno-char-subscripts
-if CLANG
-AM_CXXFLAGS += -Wno-mismatched-tags
-endif
-if HAVE_SIZED_DEALLOCATION
-AM_CXXFLAGS += -fsized-deallocation
-endif
+AM_CXXFLAGS = -Wall -Wno-char-subscripts
 
 noinst_LTLIBRARIES = libsciteco-interface.la
 libsciteco_interface_la_SOURCES = interface-curses.cpp interface-curses.h \
diff --git a/src/interface-gtk/Makefile.am b/src/interface-gtk/Makefile.am
index aa42871..825c5d3 100644
--- a/src/interface-gtk/Makefile.am
+++ b/src/interface-gtk/Makefile.am
@@ -1,13 +1,7 @@
 AM_CPPFLAGS += -I$(top_srcdir)/src
 
-AM_CFLAGS = -std=c99 -Wall
-AM_CXXFLAGS = -std=c++11 -Wall -Wno-char-subscripts
-if CLANG
-AM_CXXFLAGS += -Wno-mismatched-tags
-endif
-if HAVE_SIZED_DEALLOCATION
-AM_CXXFLAGS += -fsized-deallocation
-endif
+AM_CFLAGS = -Wall
+AM_CXXFLAGS = -Wall -Wno-char-subscripts
 
 EXTRA_DIST = gtk-info-popup.gob \
              gtk-canonicalized-label.gob