remove -pedantic

diff --git a/Makefile.gtk b/Makefile.gtk
index e6a76d583344e1559393f4bb2f546c5a8708bc44..650a8365a7f639a8a7ffab0a7a7e212f69db4158 100644 (file)
--- a/Makefile.gtk
+++ b/Makefile.gtk
@@ -13,7 +13,7 @@ CC := $(TOOLPATH)$(CC)
 # to 1.2 if it isn't found.
 GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 $$0 2>/dev/null || gtk-config $$0'
 
-CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g -I./ -Iicons/ `$(GTK_CONFIG) \
+CFLAGS := -O2 -Wall -Werror -ansi  -g -I./ -Iicons/ `$(GTK_CONFIG) \
                --cflags` $(CFLAGS)
 XLIBS = `$(GTK_CONFIG) --libs` -lm
 ULIBS = -lm#

diff --git a/configure b/configure
index ff361f3dd9cdc58bcb2ad3bdb1316aa7b89cea8f..a230eaaa7c056fb5f7a3bdb4555bb783092e2116 100755 (executable)
--- a/configure
+++ b/configure
@@ -4299,7 +4299,7 @@ if test "x$GCC" = "xyes"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable gcc warning flags" >&5
 $as_echo_n "checking for usable gcc warning flags... " >&6; }
   gccwarningflags=
-  for flag in -Wall -Werror -std=c89 -pedantic; do
+  for flag in -Wall -Werror -std=c89 ; do
     ac_save_CFLAGS="$CFLAGS"
     ac_save_LIBS="$LIBS"
     CFLAGS="$CFLAGS$gccwarningflags $flag $GTK_CFLAGS"

diff --git a/configure.ac b/configure.ac
index d9b109b2ee724c2db762e54b4a81e14938ab10ec..486beb1a906a9bd2949ce9e62132333cad2b57da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ fi
 if test "x$GCC" = "xyes"; then
   AC_MSG_CHECKING([for usable gcc warning flags])
   gccwarningflags=
-  for flag in -Wall -Werror -std=c89 -pedantic; do
+  for flag in -Wall -Werror -std=c89 ; do
     ac_save_CFLAGS="$CFLAGS"
     ac_save_LIBS="$LIBS"
     CFLAGS="$CFLAGS$gccwarningflags $flag $GTK_CFLAGS"

diff --git a/debian/changelog b/debian/changelog
index bc0e41b2c8269ce82f6aee47d16458e5dd4bca0a..d98626f8b4e676716e080376df0abe5cd5d1cfce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 sgt-puzzles (20170923.ff218728-0+iwj1) unstable; urgency=medium
 
   * merge from upstream
+  * remove -pedantic
 
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 24 Sep 2017 14:15:40 +0100
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 24 Sep 2017 14:42:04 +0100
 
 sgt-puzzles (20161228.7cae89f-1+iwj) unstable; urgency=medium
 

diff --git a/mkfiles.pl b/mkfiles.pl
index c0874ae07e6bfa11ff94286a6d7c81dd1aed3fa1..8772dd762104425e93a62a55edea36a9a8092536 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -1292,7 +1292,7 @@ if (defined $makefiles{'gtk'}) {
     "# to 1.2 if it isn't found.\n".
     "GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 \$\$0 2>/dev/null || gtk-config \$\$0'\n".
     "\n".
-    &splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " .
+    &splitline("CFLAGS := -O2 -Wall -Werror -ansi  -g " .
               (join " ", map {"-I$dirpfx$_"} @srcdirs) .
               " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n".
     "XLIBS = `\$(GTK_CONFIG) --libs` -lm\n".