X-Git-Url: https://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/8d922a2f63801c78bfebc41612cb57839f5367b8..a7cabb5d0f067e78afd029d8ec41d14660d8f9e2:/scripts/fix-gnulib.pl

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index 3af852d..69a7d86 100755
--- a/scripts/fix-gnulib.pl
+++ b/scripts/fix-gnulib.pl
@@ -186,6 +186,16 @@ EOF
 	# useful for non-recursive builds.  Strip them out.
 	drop if (/^(AM_CPPFLAGS|AM_CFLAGS)/);
 
+	# We don't care about upstream warning flags that just result in adding
+	# massive amounts of additional build rules for no reason.
+	if (/_CFLAGS/) {
+		s/ *\$\(GL_CFLAG_GNULIB_WARNINGS\)// if /_CFLAGS\s*=/;
+	}
+
+	# Drop superfluous CFLAGS assignments (which may be created by above
+	# transformation).
+	drop if /_CFLAGS\s*=\s*\$\(AM_CFLAGS\)\s*$/;
+
 	# Library dependencies are added automatically to libgnu.la by
 	# gnulib-tool.  Unfortunately, this means that everything linking
 	# against libgnu.la is forced to pull in the same deps, even if they're