Strip unnecessary CFLAGS options

saitoha · Dec 26, 2019 · 0db802c · 0db802c
1 parent 020083b
commit 0db802c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 29 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -930,13 +930,10 @@ valgrind: all
 		grep "indirectly lost: 0 bytes in 0 blocks" valgrind.log
 
 coveralls:
-	coveralls -e sixel_orig -e include -e m4 \
-		-e stb_image.h -e stb_image_write.h
+	coveralls -e config.h -e stb_image.h -e stb_image_write.h -e examples -e include -e perl -e php -e ruby -e wic
 
 coveralls-dryrun: test
-	coveralls -e sixel_orig -e include -e m4 \
-		-e stb_image.h -e stb_image_write.h \
-		--dryrun
+	coveralls -e config.h -e stb_image.h -e stb_image_write.h -e examples -e include -e perl -e php -e ruby -e wic --dryrun
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/configure b/configure
@@ -13436,7 +13436,6 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                      AM_CFLAGS="$AM_CFLAGS -Wsign-conversion"
 
 $as_echo "#define HAVE_DIAGNOSTIC_SIGN_CONVERSION 1" >>confdefs.h
 
@@ -13467,7 +13466,6 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                      AM_CFLAGS="$AM_CFLAGS -Wuninitialized"
 
 $as_echo "#define HAVE_DIAGNOSTIC_UNINITIALIZED 1" >>confdefs.h
 
@@ -13498,7 +13496,6 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                      AM_CFLAGS="$AM_CFLAGS -Wstrict-overflow=1"
 
 $as_echo "#define HAVE_DIAGNOSTIC_STRICT_OVERFLOW 1" >>confdefs.h
 
@@ -13529,7 +13526,6 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                      AM_CFLAGS="$AM_CFLAGS -Wshadow"
 
 $as_echo "#define HAVE_DIAGNOSTIC_SHADOW 1" >>confdefs.h
 
@@ -13560,7 +13556,6 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                      AM_CFLAGS="$AM_CFLAGS -Wdouble-promotion"
 
 $as_echo "#define HAVE_DIAGNOSTIC_DOUBLE_PROMOTION 1" >>confdefs.h
 
@@ -13591,7 +13586,6 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                      AM_CFLAGS="$AM_CFLAGS -Wswitch-default"
 
 $as_echo "#define HAVE_DIAGNOSTIC_SWITCH_DEFAULT 1" >>confdefs.h
 
@@ -13622,7 +13616,6 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                      AM_CFLAGS="$AM_CFLAGS -Wunused-function"
 
 $as_echo "#define HAVE_DIAGNOSTIC_UNUSED_FUNCTION 1" >>confdefs.h
 
@@ -13653,7 +13646,6 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                      AM_CFLAGS="$AM_CFLAGS -Wclobbered"
 
 $as_echo "#define HAVE_DIAGNOSTIC_CLOBBERED 1" >>confdefs.h
 

diff --git a/configure.ac b/configure.ac
@@ -188,29 +188,21 @@ LS_CHECK_CFLAG([-Wall],[AM_CFLAGS="$AM_CFLAGS -Wall"], [])
 LS_CHECK_CFLAG([-Wextra],[AM_CFLAGS="$AM_CFLAGS -Wextra"], [])
 LS_CHECK_CFLAG([-Wformat=2],[AM_CFLAGS="$AM_CFLAGS -Wformat=2"], [])
 LS_CHECK_CFLAG([-Wsign-conversion],
-               [AM_CFLAGS="$AM_CFLAGS -Wsign-conversion"
-                AC_DEFINE(HAVE_DIAGNOSTIC_SIGN_CONVERSION, 1, [define 1 if GCC supports -Wsign-conversion])])
+               [AC_DEFINE(HAVE_DIAGNOSTIC_SIGN_CONVERSION, 1, [define 1 if GCC supports -Wsign-conversion])])
 LS_CHECK_CFLAG([-Wuninitialized],
-               [AM_CFLAGS="$AM_CFLAGS -Wuninitialized"
-                AC_DEFINE(HAVE_DIAGNOSTIC_UNINITIALIZED, 1, [define 1 if GCC supports -Wuninitialized])])
+               [AC_DEFINE(HAVE_DIAGNOSTIC_UNINITIALIZED, 1, [define 1 if GCC supports -Wuninitialized])])
 LS_CHECK_CFLAG([-Wstrict-overflow],
-               [AM_CFLAGS="$AM_CFLAGS -Wstrict-overflow=1"
-                AC_DEFINE(HAVE_DIAGNOSTIC_STRICT_OVERFLOW, 1, [define 1 if GCC supports -Wstrict-overeflow=1])])
+               [AC_DEFINE(HAVE_DIAGNOSTIC_STRICT_OVERFLOW, 1, [define 1 if GCC supports -Wstrict-overeflow=1])])
 LS_CHECK_CFLAG([-Wshadow],
-               [AM_CFLAGS="$AM_CFLAGS -Wshadow"
-                AC_DEFINE(HAVE_DIAGNOSTIC_SHADOW, 1, [define 1 if GCC supports -Wshadow])])
+               [AC_DEFINE(HAVE_DIAGNOSTIC_SHADOW, 1, [define 1 if GCC supports -Wshadow])])
 LS_CHECK_CFLAG([-Wdouble-promotion],
-               [AM_CFLAGS="$AM_CFLAGS -Wdouble-promotion"
-                AC_DEFINE(HAVE_DIAGNOSTIC_DOUBLE_PROMOTION, 1, [define 1 if GCC supports -Wdouble-promotion])])
+               [AC_DEFINE(HAVE_DIAGNOSTIC_DOUBLE_PROMOTION, 1, [define 1 if GCC supports -Wdouble-promotion])])
 LS_CHECK_CFLAG([-Wswitch-default],
-               [AM_CFLAGS="$AM_CFLAGS -Wswitch-default"
-                AC_DEFINE(HAVE_DIAGNOSTIC_SWITCH_DEFAULT, 1, [define 1 if GCC supports -Wswitch-default])])
+               [AC_DEFINE(HAVE_DIAGNOSTIC_SWITCH_DEFAULT, 1, [define 1 if GCC supports -Wswitch-default])])
 LS_CHECK_CFLAG([-Wunused-function],
-               [AM_CFLAGS="$AM_CFLAGS -Wunused-function"
-                AC_DEFINE(HAVE_DIAGNOSTIC_UNUSED_FUNCTION, 1, [define 1 if GCC supports -Wunused-function])])
+               [AC_DEFINE(HAVE_DIAGNOSTIC_UNUSED_FUNCTION, 1, [define 1 if GCC supports -Wunused-function])])
 LS_CHECK_CFLAG([-Wclobbered],
-               [AM_CFLAGS="$AM_CFLAGS -Wclobbered"
-                AC_DEFINE(HAVE_DIAGNOSTIC_CLOBBERED, 1, [define 1 if GCC supports -Wclobbered])])
+               [AC_DEFINE(HAVE_DIAGNOSTIC_CLOBBERED, 1, [define 1 if GCC supports -Wclobbered])])
 LS_CHECK_CFLAG([-Bsymbolic],
                [AM_CFLAGS="$AM_CFLAGS -Bsymbolic"
                 AC_DEFINE(HAVE_BSYMBOLIC, 1, [define 1 if GCC supports -Bsymbolic])])