Move the GNU warnings configuration under config/gnu-warnings/ and trim

the filename prefixes.  Update config/gnu-flags to suit.

I also made changes to config/cmake/HDFCompilerFlags.cmake, but I'm not
sure they're correct.

36 files changed, 38 insertions, 38 deletions

diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index 17b0854..c395193 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -128,7 +128,7 @@ if (NOT MSVC AND CMAKE_COMPILER_IS_GNUCC)
         set (H5_CFLAGS0 "${H5_CFLAGS0} -Wsign-compare -Wtrigraphs -Wwrite-strings")
       endif()
     elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
-      ADD_H5_FLAGS (CMAKE_C_FLAGS_GENERAL "${HDF5_SOURCE_DIR}/config/gnu-warnings-general")
+      ADD_H5_FLAGS (CMAKE_C_FLAGS_GENERAL "${HDF5_SOURCE_DIR}/config/gnu-warnings/general")
       message (STATUS "CMAKE_C_FLAGS_GENERAL=${CMAKE_C_FLAGS_GENERAL}")
       set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_GENERAL}")
       set (H5_CFLAGS0 "${H5_CFLAGS0} -Wbad-function-cast -Wcast-align")
@@ -154,12 +154,12 @@ if (NOT MSVC AND CMAKE_COMPILER_IS_GNUCC)
       if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
         set (H5_CFLAGS0 "${H5_CFLAGS0} -Winline -Wreorder -Wport -Wstrict-aliasing")
       elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
-        ADD_H5_FLAGS (CMAKE_C_FLAGS_DEV_GENERAL "${HDF5_SOURCE_DIR}/config/gnu-warnings-developer-general")
+        ADD_H5_FLAGS (CMAKE_C_FLAGS_DEV_GENERAL "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general")
         set (H5_CFLAGS0 "${H5_CFLAGS0} ${CMAKE_C_FLAGS_DEV_GENERAL}")
       endif ()
     else ()
       if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
-        ADD_H5_FLAGS (CMAKE_C_FLAGS_NO_DEV_GENERAL "${HDF5_SOURCE_DIR}/config/gnu-warnings-no-developer-general")
+        ADD_H5_FLAGS (CMAKE_C_FLAGS_NO_DEV_GENERAL "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general")
         set (H5_CFLAGS0 "${H5_CFLAGS0} ${CMAKE_C_FLAGS_NO_DEV_GENERAL}")
       endif ()
     endif ()
diff --git a/config/gnu-flags b/config/gnu-flags
index 61a1bfd..1310769 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -44,7 +44,7 @@ demote_errors()
 load_gcc_arguments()
 {
     set -- $(for arg; do
-        sed 's,#.*$,,' $srcdir/config/gnu-${arg} | demote_errors
+        sed 's,#.*$,,' $srcdir/config/gnu-warnings/${arg} | demote_errors
     done)
     IFS=' ' echo "$*"
 }
@@ -189,15 +189,15 @@ if test "X-gcc" = "X-$cc_vendor"; then
     # General #
     ###########
 
-    H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-general)"
-    H5_ECFLAGS="$H5_ECFLAGS $(load_gcc_arguments werrors-general)"
+    H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments general)"
+    H5_ECFLAGS="$H5_ECFLAGS $(load_gcc_arguments error-general)"
 
     ######################
     # Developer warnings #
     ######################
 
-    NO_DEVELOPER_WARNING_CFLAGS=$(load_gcc_arguments warnings-no-developer-general)
-    DEVELOPER_WARNING_CFLAGS=$(load_gcc_arguments warnings-developer-general)
+    NO_DEVELOPER_WARNING_CFLAGS=$(load_gcc_arguments no-developer-general)
+    DEVELOPER_WARNING_CFLAGS=$(load_gcc_arguments developer-general)
 
     #######################
     # gcc 4 special cases #
@@ -205,27 +205,27 @@ if test "X-gcc" = "X-$cc_vendor"; then
 
     # GCC 4.2 through 4.6
     if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2 -o $cc_vers_major -eq 4 -a $cc_vers_minor -le 6; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-4.2-4.6)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 4.2-4.6)"
     fi
 
     # GCC 4.2 through 4.3
     if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2 -o $cc_vers_major -eq 4 -a $cc_vers_minor -le 3; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-4.2-4.3)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 4.2-4.3)"
     fi 
 
     # GCC 4.5 through 4.6
     if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -le 6; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-4.5-4.6)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 4.5-4.6)"
     fi
 
     # GCC 4.2 through 4.4
     if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2 -a $cc_vers_major -eq 4 -a $cc_vers_minor -le 4; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-4.2-4.4)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 4.2-4.4)"
     fi
 
     # GCC 4.2 through the end of GCC 4 series
     if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-4.2-4.last)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 4.2-4.last)"
     fi
 
     #############################
@@ -234,75 +234,75 @@ if test "X-gcc" = "X-$cc_vendor"; then
 
     # gcc >= 4.3
     if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 3; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-4.3)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 4.3)"
     fi 
 
     # gcc >= 4.4
     if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 4; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-4.4)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 4.4)"
     fi
 
     # gcc >= 4.5
     if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 5; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-4.5)"
-	DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments warnings-developer-4.5)"
-	NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments warnings-no-developer-4.5)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 4.5)"
+	DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments developer-4.5)"
+	NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments no-developer-4.5)"
     fi
 
     # gcc >= 4.6
     if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 6; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-4.6)"
-	DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments warnings-developer-4.6)"
-	NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments warnings-no-developer-4.6)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 4.6)"
+	DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments developer-4.6)"
+	NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments no-developer-4.6)"
     fi
 
     # gcc >= 4.7
     if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 7; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-4.7)"
-	DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments warnings-developer-4.7)"
-	NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments warnings-no-developer-4.7)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 4.7)"
+	DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments developer-4.7)"
+	NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments no-developer-4.7)"
     fi
 
     # gcc >= 4.8
     if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 8; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-4.8)"
-	DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments warnings-developer-4.8)"
-	NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments warnings-no-developer-4.8)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 4.8)"
+	DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments developer-4.8)"
+	NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments no-developer-4.8)"
     fi
 
     # gcc >= 4.9
     if test $cc_vers_major -ge 5 -o $cc_vers_major -eq 4 -a $cc_vers_minor -ge 9; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-4.9)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 4.9)"
     fi
 
     # gcc >= 5
     if test $cc_vers_major -ge 5; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-5)"
-        H5_ECFLAGS="$H5_ECFLAGS $(load_gcc_arguments werrors-5)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 5)"
+        H5_ECFLAGS="$H5_ECFLAGS $(load_gcc_arguments error-5)"
     fi
 
     # gcc >= 6
     if test $cc_vers_major -ge 6; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-6)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 6)"
     fi
 
     # gcc >= 7
     if test $cc_vers_major -ge 7; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-7)"
-	DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments warnings-developer-7)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 7)"
+	DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments developer-7)"
     fi
 
     # gcc 8
     if test $cc_vers_major -ge 8; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-8)"
-        H5_ECFLAGS="$H5_ECFLAGS $(load_gcc_arguments werrors-8)"
-	DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments warnings-developer-8)"
-	NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments warnings-no-developer-8)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 8)"
+        H5_ECFLAGS="$H5_ECFLAGS $(load_gcc_arguments error-8)"
+	DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments developer-8)"
+	NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gcc_arguments no-developer-8)"
     fi
 
     # gcc 9
     if test $cc_vers_major -ge 9; then
-        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments warnings-9)"
+        H5_CFLAGS="$H5_CFLAGS $(load_gcc_arguments 9)"
     fi
 
     #################
diff --git a/config/gnu-warnings-4.2-4.3 b/config/gnu-warnings/4.2-4.3
index 1881797..1881797 100644
--- a/config/gnu-warnings-4.2-4.3
+++ b/config/gnu-warnings/4.2-4.3
diff --git a/config/gnu-warnings-4.2-4.4 b/config/gnu-warnings/4.2-4.4
index ec4876f..ec4876f 100644
--- a/config/gnu-warnings-4.2-4.4
+++ b/config/gnu-warnings/4.2-4.4
diff --git a/config/gnu-warnings-4.2-4.6 b/config/gnu-warnings/4.2-4.6
index 37df4ab..37df4ab 100644
--- a/config/gnu-warnings-4.2-4.6
+++ b/config/gnu-warnings/4.2-4.6
diff --git a/config/gnu-warnings-4.2-4.last b/config/gnu-warnings/4.2-4.last
index 2db90fb..2db90fb 100644
--- a/config/gnu-warnings-4.2-4.last
+++ b/config/gnu-warnings/4.2-4.last
diff --git a/config/gnu-warnings-4.3 b/config/gnu-warnings/4.3
index 13d8558..13d8558 100644
--- a/config/gnu-warnings-4.3
+++ b/config/gnu-warnings/4.3
diff --git a/config/gnu-warnings-4.4 b/config/gnu-warnings/4.4
index 42929b5..42929b5 100644
--- a/config/gnu-warnings-4.4
+++ b/config/gnu-warnings/4.4
diff --git a/config/gnu-warnings-4.5 b/config/gnu-warnings/4.5
index ddb96df..ddb96df 100644
--- a/config/gnu-warnings-4.5
+++ b/config/gnu-warnings/4.5
diff --git a/config/gnu-warnings-4.5-4.6 b/config/gnu-warnings/4.5-4.6
index d3035fe..d3035fe 100644
--- a/config/gnu-warnings-4.5-4.6
+++ b/config/gnu-warnings/4.5-4.6
diff --git a/config/gnu-warnings-4.6 b/config/gnu-warnings/4.6
index 140a20c..140a20c 100644
--- a/config/gnu-warnings-4.6
+++ b/config/gnu-warnings/4.6
diff --git a/config/gnu-warnings-4.7 b/config/gnu-warnings/4.7
index c47fe4b..c47fe4b 100644
--- a/config/gnu-warnings-4.7
+++ b/config/gnu-warnings/4.7
diff --git a/config/gnu-warnings-4.8 b/config/gnu-warnings/4.8
index 5dc577f..5dc577f 100644
--- a/config/gnu-warnings-4.8
+++ b/config/gnu-warnings/4.8
diff --git a/config/gnu-warnings-4.9 b/config/gnu-warnings/4.9
index 78aa929..78aa929 100644
--- a/config/gnu-warnings-4.9
+++ b/config/gnu-warnings/4.9
diff --git a/config/gnu-warnings-5 b/config/gnu-warnings/5
index 32cb196..32cb196 100644
--- a/config/gnu-warnings-5
+++ b/config/gnu-warnings/5
diff --git a/config/gnu-warnings-6 b/config/gnu-warnings/6
index 736a446..736a446 100644
--- a/config/gnu-warnings-6
+++ b/config/gnu-warnings/6
diff --git a/config/gnu-warnings-7 b/config/gnu-warnings/7
index 266f5c1..266f5c1 100644
--- a/config/gnu-warnings-7
+++ b/config/gnu-warnings/7
diff --git a/config/gnu-warnings-8 b/config/gnu-warnings/8
index 5e7519d..5e7519d 100644
--- a/config/gnu-warnings-8
+++ b/config/gnu-warnings/8
diff --git a/config/gnu-warnings-9 b/config/gnu-warnings/9
index c084350..c084350 100644
--- a/config/gnu-warnings-9
+++ b/config/gnu-warnings/9
diff --git a/config/gnu-warnings-developer-4.5 b/config/gnu-warnings/developer-4.5
index 48df846..48df846 100644
--- a/config/gnu-warnings-developer-4.5
+++ b/config/gnu-warnings/developer-4.5
diff --git a/config/gnu-warnings-developer-4.6 b/config/gnu-warnings/developer-4.6
index 2372fbf..2372fbf 100644
--- a/config/gnu-warnings-developer-4.6
+++ b/config/gnu-warnings/developer-4.6
diff --git a/config/gnu-warnings-developer-4.7 b/config/gnu-warnings/developer-4.7
index a3b0781..a3b0781 100644
--- a/config/gnu-warnings-developer-4.7
+++ b/config/gnu-warnings/developer-4.7
diff --git a/config/gnu-warnings-developer-4.8 b/config/gnu-warnings/developer-4.8
index b0109e2..b0109e2 100644
--- a/config/gnu-warnings-developer-4.8
+++ b/config/gnu-warnings/developer-4.8
diff --git a/config/gnu-warnings-developer-7 b/config/gnu-warnings/developer-7
index 2a3ce7e..2a3ce7e 100644
--- a/config/gnu-warnings-developer-7
+++ b/config/gnu-warnings/developer-7
diff --git a/config/gnu-warnings-developer-8 b/config/gnu-warnings/developer-8
index a2ba7ca..a2ba7ca 100644
--- a/config/gnu-warnings-developer-8
+++ b/config/gnu-warnings/developer-8
diff --git a/config/gnu-warnings-developer-general b/config/gnu-warnings/developer-general
index b34c4b7..b34c4b7 100644
--- a/config/gnu-warnings-developer-general
+++ b/config/gnu-warnings/developer-general
diff --git a/config/gnu-werrors-5 b/config/gnu-warnings/error-5
index f7e1138..f7e1138 100644
--- a/config/gnu-werrors-5
+++ b/config/gnu-warnings/error-5
diff --git a/config/gnu-werrors-8 b/config/gnu-warnings/error-8
index 36c1414..36c1414 100644
--- a/config/gnu-werrors-8
+++ b/config/gnu-warnings/error-8
diff --git a/config/gnu-werrors-general b/config/gnu-warnings/error-general
index d0e272a..d0e272a 100644
--- a/config/gnu-werrors-general
+++ b/config/gnu-warnings/error-general
diff --git a/config/gnu-warnings-general b/config/gnu-warnings/general
index a7a20b7..a7a20b7 100644
--- a/config/gnu-warnings-general
+++ b/config/gnu-warnings/general
diff --git a/config/gnu-warnings-no-developer-4.5 b/config/gnu-warnings/no-developer-4.5
index ef7d38f..ef7d38f 100644
--- a/config/gnu-warnings-no-developer-4.5
+++ b/config/gnu-warnings/no-developer-4.5
diff --git a/config/gnu-warnings-no-developer-4.6 b/config/gnu-warnings/no-developer-4.6
index ea9cc66..ea9cc66 100644
--- a/config/gnu-warnings-no-developer-4.6
+++ b/config/gnu-warnings/no-developer-4.6
diff --git a/config/gnu-warnings-no-developer-4.7 b/config/gnu-warnings/no-developer-4.7
index 5b85e1f..5b85e1f 100644
--- a/config/gnu-warnings-no-developer-4.7
+++ b/config/gnu-warnings/no-developer-4.7
diff --git a/config/gnu-warnings-no-developer-4.8 b/config/gnu-warnings/no-developer-4.8
index e42e09f..e42e09f 100644
--- a/config/gnu-warnings-no-developer-4.8
+++ b/config/gnu-warnings/no-developer-4.8
diff --git a/config/gnu-warnings-no-developer-8 b/config/gnu-warnings/no-developer-8
index 2134bad..2134bad 100644
--- a/config/gnu-warnings-no-developer-8
+++ b/config/gnu-warnings/no-developer-8
diff --git a/config/gnu-warnings-no-developer-general b/config/gnu-warnings/no-developer-general
index 85dc0a3..85dc0a3 100644
--- a/config/gnu-warnings-no-developer-general
+++ b/config/gnu-warnings/no-developer-general