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.

1 files changed, 35 insertions, 35 deletions

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
 
     #################